dev-util/eresi: updated to address problems in bug #253436

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

10 files changed, 116 insertions, 261 deletions

diff --git a/dev-util/eresi/ChangeLog b/dev-util/eresi/ChangeLog
index 0b465da..a1daa1b 100644
--- a/dev-util/eresi/ChangeLog
+++ b/dev-util/eresi/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for dev-util/eresi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 May 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  +files/0.82_beta2-direct-ld.patch, +files/0.82_beta2-gentoo-autodetect.patch,
+  +files/0.82_beta2-sed-in-Makefile.patch, eresi-0.82_beta2.ebuild:
+  * Change to EAPI=4. Prevent readline and server USE flags
+    from being enabled at the same time.
+  * Remove sed call at the top level of the Makefile.
+  * Prevent direct call to ld, call gcc instead.
+  * Avoid automatic autodetection of gentoo via uname.
+
   05 Oct 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
   eresi-0.82_beta2.ebuild:
   Fix build issues with glibc 2.12 where __USE_GNU gets unset unless
diff --git a/dev-util/eresi/Manifest b/dev-util/eresi/Manifest
index f0704a5..754e1c6 100644
--- a/dev-util/eresi/Manifest
+++ b/dev-util/eresi/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.82_beta2-as-needed.patch 1508 RMD160 7f452532bd231fb6bd1a2aed574c50fd3969442c SHA1 053f33cc40e600185fd779e751f1f447359a9a3e SHA256 0c0fc1ba336d9d2bfd22d53a7856fe1ec79e94bb7f86785e4b8b8cca66bd665d
+AUX 0.82_beta2-direct-ld.patch 1158 RMD160 00dce5560d4727acdba4a65260dffa40b6d4f18e SHA1 333dd65f712c27016bf18c07c0a8707278d3fe9d SHA256 5d749601907ed594418688bd42ab40e21cb8f841b61e26c84dc2d58377c92df8
 AUX 0.82_beta2-drop-dprintf.patch 1113 RMD160 f4f42ef7559704dd82c2700d105bc675fc805d9e SHA1 a43671d5dd40df6997c70761775f58318362340f SHA256 2d1c9b56ac33217242c50000388114e178ea359a328e33f6557cbac4332b81ea
+AUX 0.82_beta2-gentoo-autodetect.patch 465 RMD160 9de927f0b6d7ebb6ff21cef8cd2ee8a521417ee1 SHA1 1d9353b8bbccfd8592b02b341a33862879bd747c SHA256 0cc9f3e71db33ff8aa7b35a806059cc894cc3914fe68fef3ccdf59676f8180c1
 AUX 0.82_beta2-parallel-make.patch 1970 RMD160 6b7bd0515188264a8ad8c799c6873d15b43f4332 SHA1 6e67edb49670c3c67e9df46abf5d89229ef41459 SHA256 564b6e46e10797b096d75f50691f9bf2244271fe04e4234a908dcd4f7dfade13
+AUX 0.82_beta2-sed-in-Makefile.patch 653 RMD160 ecfb98ce7ac3a2e42b0948d88e71794c3ff5fef0 SHA1 a267524a5908b767e86ceb87f58821df2cdbf760 SHA256 5b6e9b72a887afaf213b5dcf8984a3355f95eb974457f6305bc2ba0b42a5ce16
 DIST eresi-0.82_beta2.tar.bz2 1132566 RMD160 a52cb8ae6da30dc9f2dd024e064a8da3c3666d02 SHA1 41d28e4bfc486c8f48cf15fb57e4b3f35f21a3aa SHA256 93daa8e392d33897d2fe3a9b27b198671941a53803fdb9bc08dea8a3f9b13a44
-EBUILD eresi-0.82_beta2.ebuild 2149 RMD160 4f2ba002075a6df7dbdbf47817cf78359962f13b SHA1 63f07a5bd345072a315a600e99b3815631b83411 SHA256 d7395341346caa385b55a9d44d1cbe08f2a75060934bf15658693ba7171f1edb
-MISC ChangeLog 1030 RMD160 b788dfb906ad09d43dfbfadfee9661826dc4d50c SHA1 752dc9be9e2cb84bf9979b52180ce05124957f93 SHA256 ec49edae45b512557a24edd72f252db488fd74176d2a328681648ac83819c526
+EBUILD eresi-0.82_beta2.ebuild 2436 RMD160 a394cdcf05347f99db73739a0299fa4c94df30dd SHA1 2e9efe98a10cc32703e35659aac59e56f2feb86d SHA256 226a9579c8f21f5c5a76739aab27a8e5693a2b6ccea84e84d0c85079642837e4
+MISC ChangeLog 1502 RMD160 5bea30a28d0c66eca43724ce719149141db50735 SHA1 b68c93e9962e74e48dfe078bd9ea3aec96942f24 SHA256 20e0acaa0514a12fdeddea7d3c1171cf886ef7a8811cf05ab3add44a51b04387
 MISC metadata.xml 570 RMD160 6312363ecd3a4bdac7184da62c67ec94fcb35413 SHA1 872d25ec6be82f2c9fb7230cde7bc8eb2ce3146f SHA256 dd3ca3559f7ae8d6cc251f91d934116e31e94fec715abbf98689a9cbe1da3d2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk3a2EAACgkQl5yvQNBFVTVtMgCfcn+DsRRHAJaN3fKtPCmLNoVL
+/VwAn3l5CavVDYJjPbosyRZ7fEFQSWqP
+=rR4b
+-----END PGP SIGNATURE-----
diff --git a/dev-util/eresi/eresi-0.82_beta2.ebuild b/dev-util/eresi/eresi-0.82_beta2.ebuild
index 212f5d1..e4f1ac6 100644
--- a/dev-util/eresi/eresi-0.82_beta2.ebuild
+++ b/dev-util/eresi/eresi-0.82_beta2.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils toolchain-funcs
+EAPI=4
+
+inherit base eutils toolchain-funcs
 
 DESCRIPTION="The ERESI Reverse Engineering Software Interface: elfsh and friends"
 HOMEPAGE="http://www.eresi-project.org/"
@@ -19,6 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="readline server doc"
+REQUIRED_USE="server? ( !readline )"
 
 DEPEND="readline? ( sys-libs/readline )"
 RDEPEND="${DEPEND}
@@ -26,20 +29,29 @@ RDEPEND="${DEPEND}
 # dev-util/elfsh-0.75 should be used as a transition package,
 # depending on eresi but not installing any files of its own.
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/0.82_beta2-parallel-make.patch
-	epatch "${FILESDIR}"/0.82_beta2-drop-dprintf.patch
-	epatch "${FILESDIR}"/0.82_beta2-as-needed.patch
+PATCHES=(
+	"${FILESDIR}"/0.82_beta2-parallel-make.patch
+	"${FILESDIR}"/0.82_beta2-drop-dprintf.patch
+	"${FILESDIR}"/0.82_beta2-as-needed.patch
+	"${FILESDIR}"/0.82_beta2-sed-in-Makefile.patch
+	"${FILESDIR}"/0.82_beta2-direct-ld.patch
+	"${FILESDIR}"/0.82_beta2-gentoo-autodetect.patch
+)
+
+src_prepare() {
+	base_src_prepare
 	sed -i \
 		-e 's: -O2 : :g' \
 		-e "s: -g3 : ${CFLAGS} -D_GNU_SOURCE :" \
 		-e "/^LDFLAGS/s:=:=${LDFLAGS} :" \
 		$(find -name Makefile) || die
+	sed -i \
+		-e "s:/usr/local:${EPREFIX%/}/usr:" \
+		configure eresi-config libasm/tools/libasm-config.template \
+		$(find -name \*.esh)
 }
 
-src_compile() {
+src_configure() {
 	# non-standard configure script
 	# doesn't understand --disable-*, so don't use use_enable
 	local conf="--prefix /usr"
@@ -49,7 +61,6 @@ src_compile() {
 	use server && conf="${conf} --enable-network"
 	echo "./configure ${conf}"
 	./configure  ${conf} || die "configure failed"
-	emake || die "make failed"
 }
 
 src_install() {
diff --git a/dev-util/eresi/files/.svn/entries b/dev-util/eresi/files/.svn/entries
deleted file mode 100644
index 4c5746e..0000000
--- a/dev-util/eresi/files/.svn/entries
+++ /dev/null
@@ -1,130 +0,0 @@
-10
-
-dir
-12077
-svn://overlays.gentoo.org/proj/sunrise/reviewed/dev-util/eresi/files
-svn://overlays.gentoo.org/proj/sunrise
-
-
-
-2010-07-06T23:04:34.054576Z
-10938
-chithead
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12608f7e-a915-0410-b2f3-ce240db1b126
-
-0.82_beta2-as-needed.patch
-file
-
-
-
-
-2011-05-22T21:02:59.000000Z
-41ce8f8ed56a4bbad717c90480b191ae
-2010-07-06T23:04:34.054576Z
-10938
-chithead
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1508
-
-0.82_beta2-parallel-make.patch
-file
-
-
-
-
-2011-05-22T21:02:59.000000Z
-f3a46f7ff0d3b90df934359b65257b48
-2009-04-07T17:12:53.320963Z
-8211
-tommy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1970
-
-0.82_beta2-drop-dprintf.patch
-file
-
-
-
-
-2011-05-22T21:02:59.000000Z
-f5a3ccc0b46395f8b9b4ff69a651cf53
-2010-07-06T23:04:34.054576Z
-10938
-chithead
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1113
-
diff --git a/dev-util/eresi/files/.svn/text-base/0.82_beta2-as-needed.patch.svn-base b/dev-util/eresi/files/.svn/text-base/0.82_beta2-as-needed.patch.svn-base
deleted file mode 100644
index 978bf95..0000000
--- a/dev-util/eresi/files/.svn/text-base/0.82_beta2-as-needed.patch.svn-base
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: eresi-0.82_beta2/e2dbg/Makefile
-===================================================================
---- eresi-0.82_beta2.orig/e2dbg/Makefile
-+++ eresi-0.82_beta2/e2dbg/Makefile
-@@ -38,9 +38,10 @@ CFLAGS64		+= -fPIC -g3 -Wall -Iinclude $
- 			-DERESI64
- 
- LDFLAGS32		+= -L../liballocproxy -lallocproxy -L../libelfsh/ -lelfsh32 \
--			-L../libetrace/ -letrace32 -L../libstderesi -lstderesi32    \
-+			-L../libetrace/ -letrace32                                  \
- 			-L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasm32          \
- 			-L../libaspect/ -laspect32 -L../librevm/ -lrevm32           \
-+			-L../libstderesi -lstderesi32                               \
- 			-L../libmjollnir -lmjollnir32 -g3 \
- 			-L../libui/ -lui32 -L../libedfmt -ledfmt32  	    \
- 			$(LDREADLNOPT) $(DLOPT) -L/usr/freeware/lib32/ $(DYNOPT)    \
-@@ -48,9 +49,10 @@ LDFLAGS32		+= -L../liballocproxy -lalloc
- 			$(LDMJOLLNIR) $(KERNSHLIB32) $(NCURSESLNOPT) $(READLNOPT)
- 
- LDFLAGS64		+= -L../liballocproxy -lallocproxy -L../libelfsh/ -lelfsh64 \
--			-L../libetrace/ -letrace64 -L../libstderesi -lstderesi64    \
-+			-L../libetrace/ -letrace64                                  \
- 			-L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasm64          \
- 			-L../libaspect/ -laspect64 -L../librevm/ -lrevm64           \
-+			-L../libstderesi -lstderesi64                               \
- 			-L../libmjollnir -lmjollnir64 -g3 \
- 			-L../libui/ -lui64 -L../libedfmt -ledfmt64 \
- 			$(LDREADLNOPT) $(DLOPT) -L/usr/freeware/lib32/ $(DYNOPT)    \
diff --git a/dev-util/eresi/files/.svn/text-base/0.82_beta2-drop-dprintf.patch.svn-base b/dev-util/eresi/files/.svn/text-base/0.82_beta2-drop-dprintf.patch.svn-base
deleted file mode 100644
index bde1a95..0000000
--- a/dev-util/eresi/files/.svn/text-base/0.82_beta2-drop-dprintf.patch.svn-base
+++ /dev/null
@@ -1,25 +0,0 @@
-Drop conflicting dprintf declaration.
-
-ERESI does declare a prototype for dprintf, which conflicts with the
-declaration in stdio.h, leading to the following compiler error:
-
-../librevm/include/revm.h:604: error: conflicting types for ‘dprintf’
-/usr/include/stdio.h:397: note: previous declaration of ‘dprintf’ was here
-
-As the whole ERESI source code doesn't even mention dprintf in any
-other place, dropping the declaration shouldn't cause any harm at all.
-
-2010-04-07 Martin von Gagern
-
-Index: eresi-0.82_beta2/librevm/include/revm.h
-===================================================================
---- eresi-0.82_beta2.orig/librevm/include/revm.h
-+++ eresi-0.82_beta2/librevm/include/revm.h
-@@ -601,7 +601,6 @@ int		revm_isnbr(char *string);
- void		revm_workfiles_load();
- int		revm_implicit(revmcmd_t *actual);
- int	        revm_workfiles_unload();
--int		dprintf(int fd, char *format, ...);
- void	        revm_pht_print(elfsh_Phdr *phdr, uint16_t num, eresi_Addr base);
- char		*revm_fetch_sht_typedesc(elfsh_Word typenum);
- int             revm_sht_print(elfsh_Shdr *shdr, u_int num, char rtflag);
diff --git a/dev-util/eresi/files/.svn/text-base/0.82_beta2-parallel-make.patch.svn-base b/dev-util/eresi/files/.svn/text-base/0.82_beta2-parallel-make.patch.svn-base
deleted file mode 100644
index c14d21a..0000000
--- a/dev-util/eresi/files/.svn/text-base/0.82_beta2-parallel-make.patch.svn-base
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: librevm/Makefile
-===================================================================
---- librevm/Makefile	(revision 1284)
-+++ librevm/Makefile	(working copy)
-@@ -42,7 +42,7 @@
- 			$(MAKE) -C io   all32
- 			$(MAKE) -C api  all32
- 
--$(NAME32).so			:
-+$(NAME32).so			: mod32
- 			$(CC) -shared $(OBJ32) -o $(NAME32).so $(LDFLAGS32) \
- 			$(STATOPT) $(NCURSESLNOPT) $(READLNOPT)
- 			ar rc ${NAME32}.a ${OBJ32} 
-@@ -57,7 +57,7 @@
- 			$(MAKE) -C io   all64
- 			$(MAKE) -C api  all64
- 
--lib64			:
-+lib64			: mod64
- 			$(CC) -shared $(OBJ64) -o $(NAME64).so $(LDFLAGS64) \
- 			$(STATOPT) $(NCURSESLNOPT) $(READLNOPT)
- 			ar rc ${NAME64}.a ${OBJ64} 
-Index: libstderesi/Makefile
-===================================================================
---- libstderesi/Makefile	(revision 1284)
-+++ libstderesi/Makefile	(working copy)
-@@ -47,7 +47,7 @@
- 			$(MAKE) -C analysis all32
- 			$(MAKE) -C files all32
- 
--$(NAME32).so		:
-+$(NAME32).so		: mod32
- 			$(CC) -shared $(OBJ32) -o $(NAME32).so $(LDFLAGS32) \
- 			$(NCURSESLNOPT) $(READLNOPT)
- 			ar rc ${NAME32}.a ${OBJ32} 
-@@ -66,7 +66,7 @@
- 			$(MAKE) -C analysis all64
- 			$(MAKE) -C files all64
- 
--$(NAME64).so			:
-+$(NAME64).so			: mod64
- 			$(CC) -shared $(OBJ64) -o $(NAME64).so $(LDFLAGS64) \
- 			$(STATOPT) $(NCURSESLNOPT) $(READLNOPT)
- 			ar rc ${NAME64}.a ${OBJ64} 
-Index: libe2dbg/Makefile
-===================================================================
---- libe2dbg/Makefile	(revision 1284)
-+++ libe2dbg/Makefile	(working copy)
-@@ -52,7 +52,7 @@
- 			$(MAKE) -C kernel 
- endif
- 
--$(DBGNAME32O):
-+$(DBGNAME32O): mod32
- 			@$(CC) -shared $(COBJ32) $(EXTRAOBJ32) $(UOBJ32) $(LDFLAGS32) \
- 			-o $(DBGNAME32).so
- 			@$(AR) $(DBGNAME32).a $(COBJ32) $(UOBJ32) $(EXTRAOBJ32)
-@@ -70,7 +70,7 @@
- 			$(MAKE) -C common all64
- 			$(MAKE) -C user   all64
- 
--$(DBGNAME64O)			:
-+$(DBGNAME64O)			: mod64
- 			@$(CC) -shared $(COBJ64) $(EXTRAOBJ64) $(UOBJ64) $(LDFLAGS64) \
- 			-o $(DBGNAME64).so
- 			@$(AR) $(DBGNAME64).a $(OBJ64)
diff --git a/dev-util/eresi/files/0.82_beta2-direct-ld.patch b/dev-util/eresi/files/0.82_beta2-direct-ld.patch
new file mode 100644
index 0000000..f3bb19c
--- /dev/null
+++ b/dev-util/eresi/files/0.82_beta2-direct-ld.patch
@@ -0,0 +1,32 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Don't call LD when linking, use CC instead.
+
+--- a/libdump/Makefile
++++ b/libdump/Makefile
+@@ -26,12 +26,12 @@
+ all32:	$(OBJ32)
+ 	$(AR) $(NAME32).a $(OBJ32)
+ 	$(RANLIB) $(NAME32).a
+-	$(LD) -r $(OBJ32) -o $(NAME32).o $(LDFLAGS32)
++	$(CC) -Wl,-r -nostdlib $(OBJ32) -o $(NAME32).o $(LDFLAGS32)
+ 
+ all64:	$(OBJ64)
+ 	$(AR) $(NAME64).a $(OBJ64)
+ 	$(RANLIB) $(NAME64).a
+-	$(LD) -r $(OBJ64) -o $(NAME64).o $(LDFLAGS64)
++	$(CC) -Wl,-r -nostdlib $(OBJ64) -o $(NAME64).o $(LDFLAGS64)
+ 
+ clean	:
+ 	@rm -f $(OBJ32) $(OBJ64) *~ *\# \#* .\#* dump_main.o
+
+--- a/elfsh/Makefile
++++ b/elfsh/Makefile
+@@ -36,7 +36,7 @@
+ 			 -I../libedfmt/include/  $(STATOPT2)                        \
+ 			 $(ASMOPT) -DERESI64 $(NCURSESLNOPT) $(READLNOPT)
+ 
+-LDFLAGS32		+= -L../libedfmt/ -ledfmt32 -L../libelfsh/ -lelfsh32        \
++LDFLAGS32		+= -L../libedfmt/ -ledfmt32 -L../libdump/ -L../libelfsh/ -lelfsh32        \
+ 			-L../libetrace/ -letrace32 -L../libstderesi/ -lstderesi32   \
+ 			-L/usr/pkg/lib/ -L../libmjollnir/ -lmjollnir32              \
+                         -L../libetrace -letrace32 $(LPTHREAD) -L../libasm/ -lasm32  \
diff --git a/dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch b/dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch
new file mode 100644
index 0000000..d90fccd
--- /dev/null
+++ b/dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch
@@ -0,0 +1,17 @@
+Avoid autodetecting Gentoo using any kind of black magic.
+
+2011-05-23 Martin von Gagern
+
+Index: eresi-0.82_beta2/configure
+===================================================================
+--- eresi-0.82_beta2.orig/configure
++++ eresi-0.82_beta2/configure
+@@ -20,7 +20,7 @@ VARSFILE="librevm/include/revm-vars.h"
+ LIBVARSFILE="libelfsh/include/libvars.h"
+ LPTHREAD="-lpthread"
+ SHELL=`which bash`
+-GENTOO=` uname -a | grep gentoo` 
++GENTOO=yes
+ 
+ printHelp() 
+ {
diff --git a/dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch b/dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch
new file mode 100644
index 0000000..321e710
--- /dev/null
+++ b/dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch
@@ -0,0 +1,22 @@
+Having a sed command at the top of the Makefile will break with
+current (3.82) GNU make.
+
+2011-05-23 Martin von Gagern
+
+Index: eresi-0.82_beta2/configure
+===================================================================
+--- eresi-0.82_beta2.orig/configure
++++ eresi-0.82_beta2/configure
+@@ -618,10 +618,10 @@ echo "RM      = rm -f "
+ echo ""								>> Makefile
+ echo "all     : world modules testsuite tags"			>> Makefile
+ 
++sed -ie "s%TESTING_ROOT=.*%TESTING_ROOT=`pwd`/%" eresi-config
++
+ cat >> Makefile <<EOF
+ 
+-sed -ie "s%TESTING_ROOT=.*%TESTING_ROOT=`pwd`/%" eresi-config
+-
+ ifdef NAME
+ include  build/defs/dep-rules.def
+ component:	dep-\$(NAME)