From b99ff07ace23bd5667dc10e2e3c9b5d01aef97c4 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 24 May 2016 20:47:32 +0200 Subject: app-editors/wxhexeditor: Drop old version relying on obsolete wxGTK Package-Manager: portage-2.3.0_rc1 --- app-editors/wxhexeditor/Manifest | 1 - .../files/wxhexeditor-0.22-makefile.patch | 96 ---------------------- app-editors/wxhexeditor/wxhexeditor-0.22.ebuild | 38 --------- 3 files changed, 135 deletions(-) delete mode 100644 app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch delete mode 100644 app-editors/wxhexeditor/wxhexeditor-0.22.ebuild diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest index 692e74d76738..401331d01b94 100644 --- a/app-editors/wxhexeditor/Manifest +++ b/app-editors/wxhexeditor/Manifest @@ -1,2 +1 @@ -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.22-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch deleted file mode 100644 index 5e40694487f4..000000000000 --- a/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch +++ /dev/null @@ -1,96 +0,0 @@ - Makefile | 19 +++++-------------- - src/HexDialogs.cpp | 2 +- - src/HexEditor.h | 2 +- - src/HexPanels.h | 2 +- - 4 files changed, 8 insertions(+), 17 deletions(-) - -diff --git a/Makefile b/Makefile -index ead0702..cb80ddf 100755 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,9 @@ - WXCONFIG = wx-config - CC = `$(WXCONFIG) --cc` - CXX = `$(WXCONFIG) --cxx` --CFLAGS = -O2 --CXXFLAGS = -O2 --WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS} -+CFLAGS ?= -O2 -+CXXFLAGS ?= -O2 -+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS} - WXLDFLAGS = `$(WXCONFIG) --libs` - RC = `$(WXCONFIG) --rescomp` - #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 -@@ -23,7 +23,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 ru -@@ -34,7 +34,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 -@@ -61,15 +61,6 @@ langs: $(MOBJECTS) - %.mo : %.po - $(MSGFMT) $< -o $@ - --udis86/libudis86/.libs/libudis86.a: -- cd udis86;./autogen.sh -- cd udis86;./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -- cd udis86/libudis86; $(MAKE) $(MFLAGS) -- --mhash/lib/.libs/libmhash.a: -- cd mhash; ./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -- cd mhash; $(MAKE) $(MFLAGS) -- - win: $(RESOURCES) $(EXECUTABLE_WIN) - - #Stack override required for file comparison function... -diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp -index 133830e..6ea0cc0 100644 ---- a/src/HexDialogs.cpp -+++ b/src/HexDialogs.cpp -@@ -24,7 +24,7 @@ - #define NANINT 0xFFFFFFFFFFFFFFFFLL - #include "HexDialogs.h" - #include --#include "../mhash/include/mhash.h" -+#include - - #ifdef _OPENMP - #include -diff --git a/src/HexEditor.h b/src/HexEditor.h -index 7946d05..d4e1eb8 100644 ---- a/src/HexEditor.h -+++ b/src/HexEditor.h -@@ -25,7 +25,7 @@ - #ifndef _wxHexEditor_h_ - #define _wxHexEditor_h_ - --#include "../mhash/include/mhash.h" -+#include - - #include - #include -diff --git a/src/HexPanels.h b/src/HexPanels.h -index d498fa9..9f2ad5d 100644 ---- 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 - - #ifdef WX_GCH - #include diff --git a/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild deleted file mode 100644 index 30902ad7a7cc..000000000000 --- a/app-editors/wxhexeditor/wxhexeditor-0.22.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 -} -- cgit v1.2.3-65-gdbad