Fixed compilation on amd64, thanks to Torgny Nyblom

Package-Manager: portage-2.1.3_rc5

4 files changed, 85 insertions, 15 deletions

diff --git a/app-misc/endeavour/ChangeLog b/app-misc/endeavour/ChangeLog
index 99edf89cc6a2..0bc09f7d3438 100644
--- a/app-misc/endeavour/ChangeLog
+++ b/app-misc/endeavour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/endeavour
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.25 2007/01/06 00:23:32 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.26 2007/06/24 14:42:05 angelos Exp $
+
+  24 Jun 2007; Christoph Mende <angelos@gentoo.org>
+  +files/endeavour-2.7.3-amd64-gtk-flags.patch, endeavour-2.7.3.ebuild:
+  Fixed compilation on amd64, thanks to Torgny Nyblom
 
   06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -endeavour-2.3.6.ebuild:
   QA: Removed unused versions.
diff --git a/app-misc/endeavour/Manifest b/app-misc/endeavour/Manifest
index b66408eb63b0..7f7d860bd5fa 100644
--- a/app-misc/endeavour/Manifest
+++ b/app-misc/endeavour/Manifest
@@ -9,6 +9,10 @@ AUX endeavour-2.4.6-gcc41.patch 528 RMD160 e582861d24c9d0d17ae27b5983dbc4998e2c9
 MD5 ac3378a093527e3f987a690b9cb412c2 files/endeavour-2.4.6-gcc41.patch 528
 RMD160 e582861d24c9d0d17ae27b5983dbc4998e2c9574 files/endeavour-2.4.6-gcc41.patch 528
 SHA256 24268f7da303337be51732baca1aff22f3aa89061de8e8353f68951bac87214a files/endeavour-2.4.6-gcc41.patch 528
+AUX endeavour-2.7.3-amd64-gtk-flags.patch 1755 RMD160 30e7fd08caf9680b7e02edde6cca4e0e16604a14 SHA1 f89bf2793c08ebe4fe374822f49d578c25026a63 SHA256 a8a38c737e2bc2d7e544d78e41ac102eb9762dd6ac80a255bef1e4f9ba06751b
+MD5 aacc98138f48b67e7301633077d41c17 files/endeavour-2.7.3-amd64-gtk-flags.patch 1755
+RMD160 30e7fd08caf9680b7e02edde6cca4e0e16604a14 files/endeavour-2.7.3-amd64-gtk-flags.patch 1755
+SHA256 a8a38c737e2bc2d7e544d78e41ac102eb9762dd6ac80a255bef1e4f9ba06751b files/endeavour-2.7.3-amd64-gtk-flags.patch 1755
 DIST endeavour-2.4.6.tar.bz2 2215534 RMD160 2448fc5e6d507ae4e8ce4ac3c15bea1249f53729 SHA1 db4ca89d473081bcefbf08966990dd79aac117c6 SHA256 96e71ffc7789bef75fbac2ddb3bbfbdc0586bc97572fb691de405ef2c6396ed2
 DIST endeavour-2.7.3.tar.bz2 2734314 RMD160 59ee352a7f390085d2f082ba2891ada83a3489c5 SHA1 9371b325ed57d2b04f3cfecaa57f11d65134bbe7 SHA256 41d030b543273cb9b5902fbdb1de34bcce6e6b5c0f2b0fca84432b98e507d6f6
 DIST endeavour2-mimetypes.tgz 1423 RMD160 45a8c0a04a6b58c377605ee1446c792d32d69939 SHA1 530b86ca1395e08b92971b69dfe2c0bc968f14e4 SHA256 5b341f23635c35fa50758b216e8e8d86f39a05c82da7d152b3f916e995f49a8c
@@ -16,14 +20,14 @@ EBUILD endeavour-2.4.6.ebuild 1445 RMD160 2dd496ae2ae83acc31ae9435ad716c7ed6ae38
 MD5 64851c48907e61fe61ad5726dacd1066 endeavour-2.4.6.ebuild 1445
 RMD160 2dd496ae2ae83acc31ae9435ad716c7ed6ae3866 endeavour-2.4.6.ebuild 1445
 SHA256 23061c4a0ec8b3128ea10a0aec8b3d01631f635ed95e0f7a55b5a6f333feef9d endeavour-2.4.6.ebuild 1445
-EBUILD endeavour-2.7.3.ebuild 1412 RMD160 ce31dc43cacd4048cb8e54bd84f683efdc58f627 SHA1 ae909f188b0f229abdf484feffaa083e67e1a6e7 SHA256 12b189fd4204bdb2a4230f10a29066a511f5671c4926f1c0d00c3583ef2416fe
-MD5 9935eb3a03d9e30d7f62ef6f4adcaf8b endeavour-2.7.3.ebuild 1412
-RMD160 ce31dc43cacd4048cb8e54bd84f683efdc58f627 endeavour-2.7.3.ebuild 1412
-SHA256 12b189fd4204bdb2a4230f10a29066a511f5671c4926f1c0d00c3583ef2416fe endeavour-2.7.3.ebuild 1412
-MISC ChangeLog 3959 RMD160 845efadf6a6bf7b3999d5c2bb01ec193bee8c1c9 SHA1 85f67aada15936a5ed6df8c75a80ac0ed9dbe8b8 SHA256 5e9bec73488250b6de86e79066c47e5c4020805ca6eb0f0d3caa43969bdd0e8c
-MD5 0aebaf9016d6ef2560df9de38f7aa30b ChangeLog 3959
-RMD160 845efadf6a6bf7b3999d5c2bb01ec193bee8c1c9 ChangeLog 3959
-SHA256 5e9bec73488250b6de86e79066c47e5c4020805ca6eb0f0d3caa43969bdd0e8c ChangeLog 3959
+EBUILD endeavour-2.7.3.ebuild 1498 RMD160 13bc2552e55077d838c2604c1066ef799596d443 SHA1 6d3bca7770c9c8642dee4a4d1b3af2555e7d5963 SHA256 ad2f6141c0fa48be88499b0bebb35324830ef044f1f3c41efc454093c9a0f7ec
+MD5 565d9490e41b6d487eaf12bb16ac0e6d endeavour-2.7.3.ebuild 1498
+RMD160 13bc2552e55077d838c2604c1066ef799596d443 endeavour-2.7.3.ebuild 1498
+SHA256 ad2f6141c0fa48be88499b0bebb35324830ef044f1f3c41efc454093c9a0f7ec endeavour-2.7.3.ebuild 1498
+MISC ChangeLog 4136 RMD160 96eb8d9109caf7cf4f78a86336ca87f94d7ccb39 SHA1 06419ee6fcd60cde943336743a30418584a1922e SHA256 9a3e26ccb46a4d058d0d721065c8f911a8558677cc7b3c591815c23c9bc64464
+MD5 cae86082d1d898e049bf54747e5402c7 ChangeLog 4136
+RMD160 96eb8d9109caf7cf4f78a86336ca87f94d7ccb39 ChangeLog 4136
+SHA256 9a3e26ccb46a4d058d0d721065c8f911a8558677cc7b3c591815c23c9bc64464 ChangeLog 4136
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
@@ -35,9 +39,9 @@ MD5 50fa87913b83995b90ea3321d1a3ae72 files/digest-endeavour-2.7.3 500
 RMD160 1c1b4a5144ed4851fe424c2f41e28d685b234a6f files/digest-endeavour-2.7.3 500
 SHA256 7b72145d42e8f7d10d334a857b23fbc4c9db9f507420994a6c2d87bc82a4a9f4 files/digest-endeavour-2.7.3 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFnuwQ5mJXAu5GbtIRAhKiAJ9baEPt3hXf+mblWTuCrB1QCPWSNACfakvC
-+HcS1e+uQ816wCB/tDalQsU=
-=ku5f
+iD8DBQFGfoKzKhnDs22gwa8RAsi+AKCCupbenWpgWQC+3NJZJO1ryx76RwCg6RFZ
+M0uTeP1XhOCFWOh3dbb719I=
+=WShT
 -----END PGP SIGNATURE-----
diff --git a/app-misc/endeavour/endeavour-2.7.3.ebuild b/app-misc/endeavour/endeavour-2.7.3.ebuild
index 9a23f3dbc6a5..f4ba2a28966f 100644
--- a/app-misc/endeavour/endeavour-2.7.3.ebuild
+++ b/app-misc/endeavour/endeavour-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.1 2006/12/04 21:56:35 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.2 2007/06/24 14:42:05 angelos Exp $
 
 inherit eutils
 
@@ -22,6 +22,13 @@ DEPEND="app-arch/bzip2
 	virtual/opengl
 	joystick? ( media-libs/libjsw )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-amd64-gtk-flags.patch"
+}
+
 src_compile() {
 	./configure Linux --prefix=/usr $(use_enable joystick libjsw) || die
 	emake || die "Parallel make failed"
diff --git a/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch b/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch
new file mode 100644
index 000000000000..9a31276e1cd3
--- /dev/null
+++ b/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch
@@ -0,0 +1,55 @@
+--- endeavour2/lib/Makefile.old	2006-11-06 09:00:00.000000000 +0100
++++ endeavour2/lib/Makefile	2007-06-04 17:34:50.040582389 +0200
+@@ -4,7 +4,7 @@
+ # Compiler flags
+ #
+ CFLAGS   = -Wall -O2 -g -fPIC \
+-           `glib-config --cflags`
++           `glib-config --cflags` `gtk-config --cflags`
+ CPPFLAGS = -D__cplusplus -Dc_plusplus
+ 
+ 
+@@ -42,14 +42,14 @@
+ LIB_CFG_BIN = endeavour2-config
+ LIB_CFG_MAN = endeavour2-config.1.bz2
+ LIB         = libendeavour2.so
+-OBJ_C   = $(SRC_C:.c=.o)
+-OBJ_CPP = $(SRC_CPP:.cpp=.o)
++OBJ_C   = $(SRC_C:.c=.o) $(SRC_C_P:.c=.o)
++OBJ_CPP = $(SRC_CPP:.cpp=.o) $(SRC_CPP_P:.cpp=.o)
+ .c.o:
+ 	@echo "Compiling module $*.o"
+-	@+$(CC) -c $*.c $(CFLAGS)
++	@+$(CC) -c $*.c $(CFLAGS) -o $*.o
+ .cpp.o:
+ 	@echo "Compiling module $*.o"
+-	@+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS)
++	@+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS) -o $*.o
+ 
+ 
+ # Programs and their flags
+@@ -104,6 +104,8 @@
+ 	@-$(LS) $(LSFLAGS) $(LIB)
+ 
+ prebuild:
++	@echo "Removing $(SRC_C_P:.c=.o) $(SRC_CPP_P:.C=.o) (force recompile with -fPIC)"
++	@${RM} ${RMFLAGS} $(SRC_C_P:.c=.o) $(SRC_CPP_P:.cpp=.o)
+ 	@echo "Building library \"$(LIB)\"..."
+ 
+ postbuild:
+--- endeavour2/lib/Makefile.srclist.old	2006-11-06 09:00:00.000000000 +0100
++++ endeavour2/lib/Makefile.srclist	2007-06-04 17:30:13.000000000 +0200
+@@ -22,11 +22,11 @@
+         edv_recycle.c edv_window.c
+ 
+ # Add source C files from Endeavour 2
+-SRC_C += ../cfg.c ../cfg_fio.c ../edv_interps.c			\
++SRC_C_P = ../cfg.c ../cfg_fio.c ../edv_interps.c			\
+          ../edv_recbin_index.c ../edv_recbin_stat.c		\
+          ../edv_recycled_obj.c ../edv_utils.c
+ 
+ 
+ # Source C++ files
+-SRC_CPP = ../disk.cpp ../fio.cpp ../prochandle.cpp		\
++SRC_CPP_P = ../disk.cpp ../fio.cpp ../prochandle.cpp		\
+           ../string.cpp