[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/

[Ryan Hill]

commit:     268cc759a217c912551369dc6189982b4afa008d
Author:     Ryan Hill <rhill <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 23:38:03 2015 +0000
Commit:     Ryan Hill <rhill <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 23:38:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268cc759

app-editors/wxhexeditor: Remove old.

Package-Manager: portage-2.2.26
Signed-off-by: Ryan Hill <rhill <AT> gentoo.org>

 app-editors/wxhexeditor/Manifest                   |   2 -
 .../files/wxhexeditor-0.20-makefile.patch          | 108 ---------------------
 .../wxhexeditor-0.21-desktop-validation.patch      |  17 ----
 .../files/wxhexeditor-0.21-makefile.patch          | 107 --------------------
 app-editors/wxhexeditor/wxhexeditor-0.20.ebuild    |  35 -------
 app-editors/wxhexeditor/wxhexeditor-0.21.ebuild    |  38 --------
 6 files changed, 307 deletions(-)

diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index a757244..692e74d 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,4 +1,2 @@
-DIST wxHexEditor-v0.20-src.tar.bz2 1194554 SHA256 a3dda32eb62e3ec1c9760519302bcef688253d48b3d2c566f9629c4e4246ae55 SHA512 f8138fb892528fd7d131b0931f52cb6b19dc984aa831882d7f60f557527e6bb559429a11b5a1307cf51d1a8974123627d15ccee87561970784a75910929f85a3 WHIRLPOOL 9d3343060f815fae7b2512b098c3a1c4853c062040cb2b180bf7402231295d27e96a3996aca041ce2f694f2cc84bb6dfbc419797079713afb254900187d100e0
-DIST wxHexEditor-v0.21-src.tar.bz2 1760192 SHA256 076111ebcf1472e80ec9a16223ca60bdf4598689cc5aa076a4f9760bba51f17f SHA512 bea80a139bb76e47ed5d3644f923b4b042d8842bb3522e88e2c84947eadc7f49f2599438f583ea8a1fde05356886d8fb20f679398e1519c13acd8e4dd49ad729 WHIRLPOOL fd5ebc1609183b8879254461c7eb1a22355a2f71ca45452a6dd21ca8164c5b8b96474d9d1c01b2aea962d4d47c291e3b43d8bf1d337c7bcff6c1c109c3fe29b9
 DIST wxHexEditor-v0.22-src.tar.bz2 2329754 SHA256 3c04725d218d21807ee78ccdd4bc78d302b92139c92bbd0a0edc53f2d0003996 SHA512 d846b30110bf2c864ec8dc45d1a4e9e333ec79379e335d7ecf5c8eed18a22bf2af26de1bcdca1977c94f2789a82c6eaf5fd2c2a91389f4c20f219a974c5e18ac WHIRLPOOL 44988f4349bc78ce7dd975ce7332a72dc5176e3308a9837e0634cce55e029a758488ed1ff07fdcd1f8c64638b0bf86ea8b73cc4c8f7b7400384487eb6bbfea1d
 DIST wxHexEditor-v0.23-src.tar.bz2 2534659 SHA256 24a5a8b8df3abfbc3836d07b379003b45ea0ab0d2d45cb9611c797c595f8972b SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4 WHIRLPOOL 808bc8694a89f1eadb1b2c772cd69c76c7e3aba82d793f94f75a6392de5009546c2ada78bd8513f551edfd878251056ace367d9bbfdb21cd5f0bea4899c30c9f

diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch
deleted file mode 100644
index b4d97b2..0000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -1,8 +1,8 @@
- WXCONFIG = wx-config
- CC = `$(WXCONFIG) --cc`
- CPP = `$(WXCONFIG) --cxx`
--CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
--LDFLAGS = `$(WXCONFIG) --libs`
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS} -fopenmp ${CXXFLAGS}
-+WXLDFLAGS = `$(WXCONFIG) --libs` -fopenmp ${LDFLAGS}
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
- RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
-@@ -19,7 +19,7 @@ SOURCES= src/HexEditorGui.cpp \
- 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
- 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
- 			src/HexEditorFrame.cpp
--LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
-+LIBS = -lmhash -ludis86
- OBJECTS=$(SOURCES:.cpp=.o)
- DEPENDS=$(OBJECTS:.o=.d)
- RESOURCES= resources/resource.rc
-@@ -28,43 +28,35 @@ EXECUTABLE=wxHexEditor
- EXECUTABLE_WIN=$(EXECUTABLE).exe
- EXECUTABLE_DIR_MAC=$(EXECUTABLE).app
- 
--PREFIX      = /usr/local
-+DESTDIR     =
-+PREFIX      = $(DESTDIR)/usr
- BINDIR      = $(PREFIX)/bin
- DATADIR     = $(PREFIX)/share
- LOCALEDIR   = $(DATADIR)/locale
- 
--VERSION = 0.12 Beta
-+VERSION = 0.20
- 
- all: $(EXECUTABLE)
- 
--$(OBJECTS): $(LIBS) $(SOURCES)
-+$(OBJECTS): $(SOURCES)
- 
- $(EXECUTABLE): $(OBJECTS)
--	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@
-+	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) ${CXXFLAGS} -o $@
- 
--.cpp.o: $(LIBS)
--	$(CPP) $(CXXFLAGS) $< -o $@
-+.cpp.o:
-+	$(CPP) $(WXCXXFLAGS) $< -o $@
- 
- %.o : %.rc
- 	$(RC) $(RCFLAGS) $< -o $@
- 
--udis86/libudis86/.libs/libudis86.a:
--	cd udis86;./autogen.sh
--	cd udis86;./configure --host=$(HOST)
--	cd udis86/libudis86; $(MAKE) $(MFLAGS)
--
--mhash/lib/.libs/libmhash.a:
--	cd mhash; ./configure --host=$(HOST)
--	cd mhash; $(MAKE) $(MFLAGS)
--
- win: $(RESOURCES) $(EXECUTABLE_WIN)
- 
- #Stack override required for file comparison function...
- $(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
--	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
-+	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
- 
- maclink: $(OBJECTS)
--	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
-+	$(CPP) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
- 
- mac: maclink
- 	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents
---- a/src/HexDialogs.cpp
-+++ b/src/HexDialogs.cpp
-@@ -24,7 +24,7 @@
- #define NANINT 0xFFFFFFFFFFFFFFFFLL
- #include "HexDialogs.h"
- #include <wx/progdlg.h>
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #ifdef _OPENMP
-    #include <omp.h>
---- a/src/HexEditor.h
-+++ b/src/HexEditor.h
-@@ -25,7 +25,7 @@
- #ifndef _wxHexEditor_h_
- #define _wxHexEditor_h_
- 
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #include <wx/ffile.h>
- #include <wx/clipbrd.h>
---- a/src/HexPanels.h
-+++ b/src/HexPanels.h
-@@ -27,7 +27,7 @@
- #include "HexEditorFrame.h"
- #include "HexEditorCtrl/HexEditorCtrl.h"
- #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
--#include "../udis86/udis86.h"
-+#include <udis86.h>
- 
- #ifdef WX_GCH
- #include <wx_pch.h>

diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch
deleted file mode 100644
index aa2bb39..0000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/resources/wxHexEditor.desktop
-+++ b/resources/wxHexEditor.desktop
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Version=v1.0
-+Version=1.0
- Encoding=UTF-8
- Name=wxHexEditor
- GenericName=wxHexEditor
- Comment=A hex editor for huge files and devices
- Exec=wxHexEditor
--Icon=wxHexEditor.png
-+Icon=wxHexEditor
- Terminal=false
- Type=Application
--MimeType=*
- Categories=Utility;TextEditor;

diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch
deleted file mode 100644
index 34efd65..0000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-- respect CXXFLAGS/LDFLAGS
-- install into /usr
-- use system mhash and udis86
-
---- a/makefile
-+++ b/makefile
-@@ -1,8 +1,8 @@
- WXCONFIG = wx-config
- CC = `$(WXCONFIG) --cc`
- CXX = `$(WXCONFIG) --cxx`
--CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
--LDFLAGS = `$(WXCONFIG) --libs`
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS}
-+WXLDFLAGS = `$(WXCONFIG) --libs`
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
- RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
-@@ -21,7 +21,7 @@ SOURCES= src/HexEditorGui.cpp \
- 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
- 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
- 			src/HexEditorFrame.cpp
--LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
-+LIBS = -ludis86 -lmhash
- OBJECTS=$(SOURCES:.cpp=.o)
- DEPENDS=$(OBJECTS:.o=.d)
- LANGUAGEDIRS=tr
-@@ -32,7 +32,7 @@ EXECUTABLE=wxHexEditor
- EXECUTABLE_WIN=$(EXECUTABLE).exe
- EXECUTABLE_DIR_MAC=$(EXECUTABLE).app
- 
--PREFIX      = /usr/local
-+PREFIX      = /usr
- BINDIR      = $(PREFIX)/bin
- DATADIR     = $(PREFIX)/share
- LOCALEDIR   = $(DATADIR)/locale
-@@ -46,10 +46,10 @@ $(OBJECTS): $(LIBS) $(SOURCES)
- MOBJECTS=$(LANGUAGES:.po=.mo)
- 
- $(EXECUTABLE): $(OBJECTS)
--	$(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@
-+	$(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -o $@
- 
- .cpp.o: $(LIBS)
--	$(CXX) $(CXXFLAGS) $< -o $@
-+	$(CXX) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
- 
- %.o : %.rc
- 	$(RC) $(RCFLAGS) $< -o $@
-@@ -59,23 +59,14 @@ langs: $(MOBJECTS)
- %.mo : %.po
- 	$(MSGFMT) $< -o $@
- 
--udis86/libudis86/.libs/libudis86.a:
--	cd udis86;./autogen.sh
--	cd udis86;./configure --host=$(HOST)
--	cd udis86/libudis86; $(MAKE) $(MFLAGS)
--
--mhash/lib/.libs/libmhash.a:
--	cd mhash; ./configure --host=$(HOST)
--	cd mhash; $(MAKE) $(MFLAGS)
--
- win: $(RESOURCES) $(EXECUTABLE_WIN)
- 
- #Stack override required for file comparison function...
- $(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
--	$(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
-+	$(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
- 
- maclink: $(OBJECTS)
--	$(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
-+	$(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
- 
- mac: maclink langs
- 	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents
---- a/src/HexDialogs.cpp
-+++ b/src/HexDialogs.cpp
-@@ -24,7 +24,7 @@
- #define NANINT 0xFFFFFFFFFFFFFFFFLL
- #include "HexDialogs.h"
- #include <wx/progdlg.h>
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #ifdef _OPENMP
-    #include <omp.h>
---- a/src/HexEditor.h
-+++ b/src/HexEditor.h
-@@ -25,7 +25,7 @@
- #ifndef _wxHexEditor_h_
- #define _wxHexEditor_h_
- 
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #include <wx/ffile.h>
- #include <wx/clipbrd.h>
---- a/src/HexPanels.h
-+++ b/src/HexPanels.h
-@@ -27,7 +27,7 @@
- #include "HexEditorFrame.h"
- #include "HexEditorCtrl/HexEditorCtrl.h"
- #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
--#include "../udis86/udis86.h"
-+#include <udis86.h>
- 
- #ifdef WX_GCH
- #include <wx_pch.h>

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.20.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.20.ebuild
deleted file mode 100644
index 606be30..0000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.20.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WX_GTK_VER="2.8"
-
-inherit eutils toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://wxhexeditor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/mhash
-	dev-libs/udis86
-	x11-libs/wxGTK:2.8[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_pretend() {
-	tc-has-openmp \
-		|| die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild
deleted file mode 100644
index 62b8a31..0000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WX_GTK_VER="2.8"
-
-inherit eutils toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://wxhexeditor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/mhash
-	dev-libs/udis86
-	x11-libs/wxGTK:2.8[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_pretend() {
-	tc-has-openmp \
-		|| die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
-}
-
-src_prepare() {
-	# parts sent upstream : https://sourceforge.net/p/wxhexeditor/patches/8/
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	# sent upstream : https://sourceforge.net/p/wxhexeditor/patches/9/
-	epatch "${FILESDIR}"/${P}-desktop-validation.patch
-}