Fix AMD64 compile bug; thanks to Kenneth Prugh for patch. (bug #186504)

Package-Manager: portage-2.1.3.3

4 files changed, 60 insertions, 13 deletions

diff --git a/x11-misc/peksystray/ChangeLog b/x11-misc/peksystray/ChangeLog
index d955334f4c01..f260557f85ec 100644
--- a/x11-misc/peksystray/ChangeLog
+++ b/x11-misc/peksystray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/peksystray
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.17 2007/07/24 00:46:55 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.18 2007/08/08 10:08:17 omp Exp $
+
+  08 Aug 2007; David Shakaryan <omp@gentoo.org>
+  +files/peksystray-0.4.0-ldadd.patch, peksystray-0.4.0.ebuild:
+  Fix AMD64 compile bug; thanks to Kenneth Prugh for patch. (bug #186504)
 
 *peksystray-0.4.0 (24 Jul 2007)
 
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 053d8e3d447d..2237a599a045 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX peksystray-0.4.0-ldadd.patch 1133 RMD160 aed32513480cf2dbe91df1dcd08d901f2bd796dd SHA1 5efa02304f457618a96c761b252d689ccaf923a3 SHA256 4da272398f6e1276a296b216aa092c68a589f94fdcbbdb8443fd5c373f964fe3
+MD5 137411ab8bf701d18dbead0fd64a7df2 files/peksystray-0.4.0-ldadd.patch 1133
+RMD160 aed32513480cf2dbe91df1dcd08d901f2bd796dd files/peksystray-0.4.0-ldadd.patch 1133
+SHA256 4da272398f6e1276a296b216aa092c68a589f94fdcbbdb8443fd5c373f964fe3 files/peksystray-0.4.0-ldadd.patch 1133
 DIST peksystray-0.2.1.tar.gz 70261 RMD160 938ac6b50b28a2f9a85d620093dbef2c7fcbe38d SHA1 df681afc484ed7e00cedfa57a3d989af9010967d SHA256 1642322c50c893467c0e48ed0ced258e17e0df5c2f0415d6dcf4fe906f530793
 DIST peksystray-0.3.0.tar.gz 71344 RMD160 3293cacb5f2e901892556710064ac808b9c72ab6 SHA1 976ae9e7331fe203eb3d2f1744f93f6c52899d65 SHA256 89a1fdabee7ae9fdc079b0aee79ecade2d41438d2f41a321f1df5492d6e22ee5
 DIST peksystray-0.4.0.tar.bz2 73810 RMD160 da5184ae963ece837545cb2e37352902890adda6 SHA1 560ed191a37c89ca2f1eab6859f159ee38acc4e7 SHA256 30733b349bc7919171a6fa31023c8704eaae9158084a5210d49aa3210123a778
@@ -12,14 +16,14 @@ EBUILD peksystray-0.3.0.ebuild 744 RMD160 089dae5fe44c23502118b23f8867f698925810
 MD5 6cc4d3464522a54c88e2abb74cc4e2ed peksystray-0.3.0.ebuild 744
 RMD160 089dae5fe44c23502118b23f8867f69892581002 peksystray-0.3.0.ebuild 744
 SHA256 b9548d9f5074208ab341f42b8ce2851762081f3ccc30d77c07bdd9c087402070 peksystray-0.3.0.ebuild 744
-EBUILD peksystray-0.4.0.ebuild 621 RMD160 cff2c88d2c83a69954582c3d8ed2a8f5826e9bc1 SHA1 344d4e4b6254f84535dc040d9a7815403e435a63 SHA256 e4d25904a1d245f9027bd50acb288adf877acbb8b778b7aed7206b3b57ca4640
-MD5 cceabdd55ae3582bf891e8559b4a131b peksystray-0.4.0.ebuild 621
-RMD160 cff2c88d2c83a69954582c3d8ed2a8f5826e9bc1 peksystray-0.4.0.ebuild 621
-SHA256 e4d25904a1d245f9027bd50acb288adf877acbb8b778b7aed7206b3b57ca4640 peksystray-0.4.0.ebuild 621
-MISC ChangeLog 2300 RMD160 039ade05b7fd73d63d18cd3ee629a438831bae0f SHA1 1eb5cbbbf0a18f846bb2726feeda0a89976f9e54 SHA256 4591282f9f211b7c317a7f1570d97156199b0d46db429ee924a04f7e34e2658a
-MD5 ceacbe463ba976f3f2b240c53ee27a66 ChangeLog 2300
-RMD160 039ade05b7fd73d63d18cd3ee629a438831bae0f ChangeLog 2300
-SHA256 4591282f9f211b7c317a7f1570d97156199b0d46db429ee924a04f7e34e2658a ChangeLog 2300
+EBUILD peksystray-0.4.0.ebuild 719 RMD160 2dd873b3368b4716495312aa01eed4b85a31fd58 SHA1 72cd402ec91f9b72cd4acf5b4a84947f6bb1122b SHA256 6b7ce77a9a98df20b514a2a182a9a8b9a6514920626aacf0c0d33937ae7e0008
+MD5 2712a92db4acb115235bde6b70a7aa4b peksystray-0.4.0.ebuild 719
+RMD160 2dd873b3368b4716495312aa01eed4b85a31fd58 peksystray-0.4.0.ebuild 719
+SHA256 6b7ce77a9a98df20b514a2a182a9a8b9a6514920626aacf0c0d33937ae7e0008 peksystray-0.4.0.ebuild 719
+MISC ChangeLog 2487 RMD160 693a74f275a7988307885169a7b88949b16fe935 SHA1 9c1d437b89d5065f9b94f0f7e134c02edf749c14 SHA256 e68ca44882ae79800133fda966cc6e41c4dd0c71be6acb7b382769e20e04f59a
+MD5 8ddebe6a10ba01bbc754a7905469f1c2 ChangeLog 2487
+RMD160 693a74f275a7988307885169a7b88949b16fe935 ChangeLog 2487
+SHA256 e68ca44882ae79800133fda966cc6e41c4dd0c71be6acb7b382769e20e04f59a ChangeLog 2487
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 metadata.xml 163
@@ -36,7 +40,7 @@ SHA256 9e679f67aa9d500338f387f037fb8f8380213fa0042e6d61b9b7bd270b3d8ce0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGpUwQvSApE0uP4UsRAgC4AJ9LWJvzCdNf+vLdcCIE4XtyAV1LwgCeOGc+
-SkdnWS6eDmD/QvrMeRURRcM=
-=u+UM
+iD8DBQFGuZYbvSApE0uP4UsRAsEZAJ4qWV63JqZmYswvXhMwiujuyV9M8ACeKZtx
+KVVERBqpifKkGaw4os8tYyM=
+=TTaa
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch b/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch
new file mode 100644
index 000000000000..4f867d36fe1d
--- /dev/null
+++ b/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch
@@ -0,0 +1,30 @@
+diff -u -Nr peksystray-0.4.0.orig/src/Makefile.am peksystray-0.4.0/src/Makefile.am
+--- peksystray-0.4.0.orig/src/Makefile.am	2003-06-13 22:06:23.000000000 -0400
++++ peksystray-0.4.0/src/Makefile.am	2007-08-05 15:06:47.000000000 -0400
+@@ -2,6 +2,4 @@
+ 
+ INCLUDES = @x_includes@
+ 
+-peksystray_LDADD = @x_libraries@
+-
+ peksystray_SOURCES = peksystray.c
+diff -u -Nr peksystray-0.4.0.orig/src/Makefile.in peksystray-0.4.0/src/Makefile.in
+--- peksystray-0.4.0.orig/src/Makefile.in	2007-01-05 18:16:38.000000000 -0500
++++ peksystray-0.4.0/src/Makefile.in	2007-08-05 15:07:02.000000000 -0400
+@@ -146,7 +146,6 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ INCLUDES = @x_includes@
+-peksystray_LDADD = @x_libraries@
+ peksystray_SOURCES = peksystray.c
+ all: all-am
+ 
+@@ -206,7 +205,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ peksystray$(EXEEXT): $(peksystray_OBJECTS) $(peksystray_DEPENDENCIES) 
+ 	@rm -f peksystray$(EXEEXT)
+-	$(LINK) $(peksystray_LDFLAGS) $(peksystray_OBJECTS) $(peksystray_LDADD) $(LIBS)
++	$(LINK) $(peksystray_LDFLAGS) $(peksystray_OBJECTS) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index 7b5b58c08b6d..d40454f787a4 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.4.0.ebuild,v 1.1 2007/07/24 00:46:55 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.4.0.ebuild,v 1.2 2007/08/08 10:08:17 omp Exp $
+
+inherit eutils
 
 DESCRIPTION="A system tray dockapp for window managers supporting docking"
 HOMEPAGE="http://peksystray.sourceforge.net/"
@@ -15,6 +17,13 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-ldadd.patch"
+}
+
 src_install() {
 	dobin src/peksystray
 	dodoc AUTHORS ChangeLog NEWS README REFS THANKS TODO