Version bump (bug #373665 by Gary Hunt). Also respect compiler flags, fix

parallel build, and use system version of udis86.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 143 insertions, 7 deletions

diff --git a/app-editors/wxhexeditor/ChangeLog b/app-editors/wxhexeditor/ChangeLog
index 9010cb22ccdb..008d49481364 100644
--- a/app-editors/wxhexeditor/ChangeLog
+++ b/app-editors/wxhexeditor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/wxhexeditor
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/ChangeLog,v 1.1 2010/08/31 04:16:58 dirtyepic Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/ChangeLog,v 1.2 2011/08/19 04:44:27 dirtyepic Exp $
+
+*wxhexeditor-0.11 (19 Aug 2011)
+
+  19 Aug 2011; Ryan Hill <dirtyepic@gentoo.org> +wxhexeditor-0.11.ebuild,
+  +files/wxhexeditor-0.11-makefile.patch:
+  Version bump (bug #373665 by Gary Hunt). Also respect compiler flags, fix
+  parallel build, and use system version of udis86.
 
 *wxhexeditor-0.09 (31 Aug 2010)
 
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 953e562d6c3c..b81e759d604c 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX wxhexeditor-0.09-gcc45.patch 1463 RMD160 4e770ddde0c13d8e01545a7a534fdfd7fefbc4f3 SHA1 ffafb87a0dbc7964b08216f6eaf20be91c1a4487 SHA256 8ade73245bec12590606533cd5a430fa2b444dae02e5d993d48227b3039972a6
+AUX wxhexeditor-0.11-makefile.patch 3250 RMD160 6bd3046f5d6b079ac0b99458e614fcefec112986 SHA1 1809cb2672c9b254b59f9f2023d0f2f14a8646a2 SHA256 84af7674a1eb350149288914b1af6e6c8f2f9252a8ed6ec4f8a74d16fcc131c7
 DIST wxHexEditor-v0.09-src.tar.bz2 419074 RMD160 589337f706363386119e71f7f8986c97ee57f522 SHA1 feaee5766219bc4b34fef60c5cdeb4ebb585ef33 SHA256 2d2b0cc257f1f5eccc4031422863de91d1eec2b15d031041878646835e1f8cc7
+DIST wxHexEditor-v0.11-src.tar.bz2 507012 RMD160 de675b74e802dd3fe07db8035dc3106248f69696 SHA1 a1802da0570448635367f54643765dcf24b4064f SHA256 85c866c7f09c53c90af2fd12f1978125caa1b7d0ee20719915e45220d31f1ee5
 EBUILD wxhexeditor-0.09.ebuild 741 RMD160 c3ff8d06144190713788d9f861e4df2a7dc5226c SHA1 c64d9c313a83f0de1bca49953923d89a6a16dbd0 SHA256 90b65540f0b5017a7b1d0e200ee551045b695167785bfe733ea678a0fe05cdac
-MISC ChangeLog 475 RMD160 8eda413d8fd68e9cf2f3851cbf234d5107c8a5e0 SHA1 0b7f85e06a5c8c7f2a3c050278ce68c8ac3bc561 SHA256 d63363f931b5769d5a46d9d9b5670804b52dc30e1253edaa6d810d67f1b7c643
+EBUILD wxhexeditor-0.11.ebuild 740 RMD160 31f80b300cf6ef799edcc51da4039b55f89dd576 SHA1 b13eef70f8ae6aaa1ae44c8b5055aca1175d70b8 SHA256 e0b379e2eb4d77e2489bbb413c251be02f27835f9f52c64d8ad91a0b7eaeb656
+MISC ChangeLog 753 RMD160 0c0ab47240a9685a5992df25e11b73b6ccdf7ca8 SHA1 34037a2ed8e6743792eb693941e5a526e86f57e8 SHA256 ef6156922d02c7a1c8b13d4bb36a168f6a10233d48f4fd9b4bdd00d2973066ae
 MISC metadata.xml 230 RMD160 0508220ff99c080f905c3c05272047d1e36e0f1f SHA1 0481ec39da10930aa576f61d45041c3b189697c8 SHA256 59b9beec10bb60f8533f070be1dfeef7834a2865f0e905f9afa7edb8e164de9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkx8gz0ACgkQiqiDRvmkBmJXxACdG2H2axBhOW/bOM3x7HPF+nYM
-g3UAoJyYP2Fa8pm0QbUxWfEV7xya3rX2
-=N9P0
+iEYEARECAAYFAk5N7E4ACgkQiqiDRvmkBmJ6eACg2zovhVDRYDeNyzATeuBL5eSN
+W0sAoODfJVai8s7jLGysQxesgWtQ8bZR
+=iOzZ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.11-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.11-makefile.patch
new file mode 100644
index 000000000000..10180c9b2877
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.11-makefile.patch
@@ -0,0 +1,96 @@
+https://bugs.gentoo.org/373665
+
+  use system udis86
+  respect flags
+  fix parallel build
+
+--- a/hashlibpp/src/Makefile
++++ b/hashlibpp/src/Makefile
+@@ -50,7 +50,7 @@ INCLUDE_PATH = /usr/include/hashlib++
+ LIB_PATH = /usr/local/lib/
+ 
+ # Compiler to use
+-COMPILER = g++
++COMPILER = ${CXX}
+ 
+ # Global options for the compiler
+ COPTIONS = -ansi -Wall -Wextra
+@@ -62,7 +62,7 @@ COPTIONS = -ansi -Wall -Wextra
+ ifdef DEBUG
+ 	COPTIONS += -g
+ else
+-	COPTIONS += -O3 -fomit-frame-pointer
++	COPTIONS += ${CXXFLAGS}
+ endif
+ 
+ GCC = $(COMPILER) $(COPTIONS)
+@@ -149,7 +149,7 @@ hl_sha512wrapper.o:	hl_sha512wrapper.cpp hl_sha512wrapper.h
+ #----------------------------------------------------------------------- 
+ # Creating a static lib using ar
+ 
+-LIB:		MD5 SHA1 SHA256			
++LIB:		MD5 SHA1 SHA256 SHA2EXT
+ 		ar rs libhl++.a $(MD5) $(SHA1) $(SHA256) $(SHA2EXT)
+ 
+ #----------------------------------------------------------------------- 
+--- a/makefile
++++ b/makefile
+@@ -1,7 +1,7 @@
+ WXCONFIG = wx-config
+ CPP = `$(WXCONFIG) --cxx`
+-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -c ${OPTFLAGS}
+-LDFLAGS = `$(WXCONFIG) --libs`
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS}
++WXLDFLAGS = `$(WXCONFIG) --libs` ${LDFLAGS}
+ RC = `$(WXCONFIG) --rescomp`
+ #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
+ RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
+@@ -17,7 +17,7 @@ SOURCES= src/HexEditorGui.cpp \
+ 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
+ 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
+ 			src/HexEditorFrame.cpp
+-LIBS = udis86/libudis86/.libs/libudis86.a hashlibpp/src/libhl++.a
++LIBS = hashlibpp/src/libhl++.a
+ OBJECTS=$(SOURCES:.cpp=.o)
+ DEPENDS=$(OBJECTS:.o=.d)
+ RESOURCES= resources/resource.rc
+@@ -39,19 +39,19 @@ all: prepare $(EXECUTABLE)
+ prepare: $(LIBS) $(SOURCES)
+ 
+ $(EXECUTABLE): $(OBJECTS) $(LIBS)
+-	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@
++	$(CPP) $(OBJECTS) $(LIBS) -ludis86 $(WXLDFLAGS) ${LDFLAGS} -o $@
+ 
+ .cpp.o:
+-	$(CPP) $(CXXFLAGS) $< -o $@
++	$(CPP) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
+ 
+ %.o : %.rc
+ 	$(RC) $(RCFLAGS) $< -o $@
+ 
+-udis86/libudis86/.libs/libudis86.a:
+-	echo Please make sure if libudis86 build for your host to avoid link time errors!
+-	cd udis86;./autogen.sh
+-	cd udis86;./configure
+-	cd udis86/libudis86; $(MAKE) $(MFLAGS)
++#udis86/libudis86/.libs/libudis86.a:
++#	echo Please make sure if libudis86 build for your host to avoid link time errors!
++#	cd udis86;./autogen.sh
++#	cd udis86;./configure
++#	cd udis86/libudis86; $(MAKE) $(MFLAGS)
+ 
+ hashlibpp/src/libhl++.a:
+ 	echo "Please make sure if libudis86 build for your host to avoid link time errors!"
+@@ -61,10 +61,10 @@ win: prepare $(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,5242880 -o $@
++	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 ${LDFLAGS} -o $@
+ 
+ maclink: $(OBJECTS)
+-	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -o $(EXECUTABLE)
++	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -lexpat ${LDFLAGS} -o $(EXECUTABLE)
+ 
+ mac: prepare maclink
+ 	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild
new file mode 100644
index 000000000000..4a966d4aef3d
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild,v 1.1 2011/08/19 04:44:27 dirtyepic Exp $
+
+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="dev-libs/udis86
+	x11-libs/wxGTK:2.8[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	tc-export CXX
+}