Fix bug #514502

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

4 files changed, 30 insertions, 32 deletions

diff --git a/app-emulation/free42/ChangeLog b/app-emulation/free42/ChangeLog
index a46bb00214fc..4d58b53a2e86 100644
--- a/app-emulation/free42/ChangeLog
+++ b/app-emulation/free42/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/free42
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.17 2013/02/25 11:39:49 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.18 2014/06/23 21:47:40 nimiux Exp $
+
+  23 Jun 2014; Chema Alonso <nimiux@gentoo.org> free42-1.4.77.ebuild,
+  files/free42-1.4.77-fix-makefile.patch:
+  Fix bug #514502
 
   25 Feb 2013; Agostino Sarubbo <ago@gentoo.org> free42-1.4.77.ebuild:
   Stable for x86, wrt bug #459128
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index f5f7658a3b40..2969228e3f0c 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,29 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX free42-1.4.75-fix-alsa.patch 13100 SHA256 b7ad77392fcdca38454a5ce78a92dee82ab2a0d4e0c1f0c4d300e973b8f7b297 SHA512 2a3bfdbceaa571880430d8c2682dbda22e9f0fd0acc6bc46cdac985ba0417be149afc8bd5aec0d0cd7d67d8db0e1449ac8429f31ba659f33dff2c6a5b981b5e0 WHIRLPOOL a1e7f12c586b775e9f2de4951b5f36d4cb3a5590bc3b0e5621d0f47940421d256b2f583521c51af29776668b8ba5d6f588fcd19db1d67a5a268b754c5d529fe9
 AUX free42-1.4.77-fix-alsa.patch 12854 SHA256 d67a3a158db61dac3b6c3d9505f73eee2aeb8ebf8f2b3e7ad11611bf7eb39cd5 SHA512 af56b6bc0609f46814c57bf6e7eece2eca27a553efd30677c4a4220cae5106a535ff3043f6832d141ba4dc7ba26ce3484e169bffba1f9dccce3b148f7cd25857 WHIRLPOOL 0982edfbd52a72b2ab28346e228935567fe17581cace05dec69ec55cfa946e8e3f334488e6f40605d4f066796b28e1d5bdfc5b18e5a36b55ce58fa66e4ad8738
-AUX free42-1.4.77-fix-makefile.patch 1108 SHA256 3be0e051d28718cf209e7c0eb3660cd62e1817e16c39d27d6ae4e30108fe04ba SHA512 293b236bb8e9325f28564c1b4cd23882ab211c58e88cfc2574d7f9d885033e2acf1e15a7d789434435270fef6826c7f198667ddd3572d2edce81fdcb2f4bdd8a WHIRLPOOL 466d8eafc00622b178cef0f27855b6ecc9e8567becda35997c8b82b48c7777e8ff2378160ea1f4e21e130ca50d17f9d6b71dbe0dd20b971505d2597b36d801ee
+AUX free42-1.4.77-fix-makefile.patch 1122 SHA256 6af946956c01f659bedfe1cda8d4f39fd920825b058c84d31c34db154a88ad46 SHA512 5de42ca34e255aff7179b34bd545b2bf5d32c9d62489cd652573488897990778a89608a831e994e9a552d14ba2498870331e5e06345ab4c3863de7fd416dba8b WHIRLPOOL c8a142ae068a299c470f7041e501ecae63a520267e4dec68f8a97e1c1e5aeba7c5f2cdcf244e3cde3cd79b93ae09c958bc27e1893281049dc03a48535d64e978
 DIST free42-1.4.75.tgz 6535975 SHA256 a7df69c83ef26bbacdc2c9f912639b9f84f181fea5626a5f12efdefa58185675 SHA512 c075057b6c10b3091845c0448a4ec7fa591b81471b636accad82e662d0706c922496acc54048b781ed748e998c9f1138b614ddef477a78fab778ff01addf89b9 WHIRLPOOL cde04bbbb2ea467a3819729782c5df0580dc48fa7557f2a5f23233df6e38814008f05abef89a3afe336ea60c208de923edaa30bfb41717f213e2eb264464ec2b
 DIST free42-1.4.77.tgz 1096936 SHA256 b500b90eeee486af297a0b04a4ee611d36a41f99f5a5b71ed2d98ce9831addc5 SHA512 ab2ed1703ce5210c904bd5eda8c416a30588a80b18648fadb16c01ef7c5487a71851cf238e0130402d2536a3068d6ee3eb585e60d99479ca0e1ca5a8ea968651 WHIRLPOOL 2bfd040c82d59a5af0b2391d81756332d9f606d7200239d3d4e06d4e2e8b09b1480b1f76facdafb26056151ac0c654d93068c60071760fc69f72efea03f58659
 EBUILD free42-1.4.75.ebuild 1250 SHA256 5f1032e47856339309e6e8173567b1c97a6548ccad588d3cd7c19401a5b350fb SHA512 24b1f1cad22d9b7c87313c39ce028f292adfa48a65eeef11cdf5e986cd8825186317e912ffdfe5a0d0c65034fbf9bee4bc32582cc10046af9eb64ea0b80c9c1d WHIRLPOOL af19f9365a6767c0d7dfd610c81e8bb0add1f822e22210ba04190d3f5705ac7342cbb180956a61001fa57b5c81daa10b85455626db8e85a18149db0c874f3509
-EBUILD free42-1.4.77.ebuild 1078 SHA256 5f156c4856bbffa0fddbb35e74090debb8d25f48887c59861bcf4f7f7bddc2de SHA512 d2c56470f18fa70c7c80453a587a0faf36d215d327f04efeaf06fe02768d90ae317f62f1818393c00b1c8b1a8a10cae096f771891f3ae1a79f7eadb1d5c6587c WHIRLPOOL 4df656205f34a699676c8f32176db5dd5e978195e80ccf04cadd2f96e3149290d8f244e29124b47e8a979c1abc75a34f55aa8127e13692a48b21f81fd73d04bf
-MISC ChangeLog 2485 SHA256 37ff51c1337d99988bc5d30ee6c61699107faab639e77e19689e10f7be1eb65b SHA512 1ba0c3131863ed9b8f0da5515520f075a3732a6fcfa753eb91140cad578947e2c7f89c1fd9b252d1e5506e1c950b7afd44333c47210b4a8dc229831816f5a239 WHIRLPOOL b64d35551d19ac6fe02147fba715802f6a4e0be7617e86eb9d388d9e5ff0d6028db89f0c46c710d2cec8cf3ada93a7506a427effdbddc05b6e3250412ca57846
+EBUILD free42-1.4.77.ebuild 1081 SHA256 17a03739d1e2f57d840041350bc5855cd3367d81fbcfc9c63e3527537ca901c2 SHA512 db3316cb5914598433ffedcf20ff954a7b0217a30e2636cfc837aa650e7a1201806802b56992a7e5d2bb5f920afa0b6c50d742581eb47aafe900823c91fabc4f WHIRLPOOL a1320c17f230086d0f0a501417a14a351071667401221575c0a941456017869d8675b474ed0a8bfae52a010110972059d53a39294586314478be777ce41c5bbb
+MISC ChangeLog 2619 SHA256 8fbcd8b5fa91ea3270f3ba100b327462e5a9a39a9adaed8ca5210b783f53d382 SHA512 93ae3482d742f3b782b831059283616847bf27794cfd615965309a3bf9b72f680728f051c5a97aede14498c8a10f0d30890879e512709356ed8557e2094e2bf8 WHIRLPOOL 547d948390a90165909a06f54d33f017cc19c6fb13081110dad28b8a7556f8df0ecea973b782547c4ff8c7f2a4f61c010a89d45c350594f429de7a62da53c5cf
 MISC metadata.xml 540 SHA256 1dfb1cbb7947a8e42c92ccfed144fd5bf71d34d31bed4cc7de3b7b940f0b7192 SHA512 e6b1c3521732649216949ee826b69abc66a9b7b87242e4a908211678dd5828e84f92f4a4af2ecbe4b75ecd7e483da18bea484fd555215c8a37c11ef04df8236c WHIRLPOOL f8bd8cc0dbbb19b13e62217c513509771b3245c6b49d592d6cf26da1f25b71cdb62f8a0563c94d365f83aa79c80e1de306b1e18f19c5c603de389a20ffe7a802
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRK02EAAoJELp701BxlEWfIeMP/2lO3aBNEysF9aBPz4zA/APG
-O0Hl5Zm75SkNv2m70MmpXmW9tWDb+Ffc84e6KBqJ/7tNBWlf9Ah0gV9doyedK/Mo
-Bu0Op8MV/9JjjR4o0U5ZbBOghUAvOtZtMG2ivvjSojFxjCpLioWCfRcS8Vw+Izzg
-dV+j4o+po2amEC9Wcw3vqI50B2XS61zvlChAZLCuMRBmUS650yQxE+zHsUeOU6/4
-cqiPALBBUhmWx8TVX+fWPBdb+cplLXjLd8XFO7dl9mYM8vzGXa0FyoS9f9Tv7kB+
-Y2z/A6vTFblo03lYheS1zHiegZXlvgLIs+N61XRWnNO/vn/B/g5ZoD2b5rHSklAo
-6pefS1//V7QgBGOnMjSoMH5sxOFpnXiSAT1eUS7XMQkApxMAJAz1fqD09uXT0wJg
-S0Ij7q9GaaNZsxnAGAZYegwlP3S84L9fVNW5H5xVcz/Q2woRuOkdf3n447vFMkL1
-VALnV1q1MnJiViXB+zRhuFFFaTt0x81aeUT/qko0wKURMc+IN2S+dPoWxZmRe756
-jKSEQk0MY15ati9p3SHOeGw8UrdsysEYrKuqu1Eog4HgOPq+ou/vbL5Qd/jevvlH
-rtEF8Dlks8X4UfZfaay4ZGNjmTt4LxH4iVKAWwD3MUj9+CBrUc/HcmqWEU0xewz1
-5cjmfV0GhnfIf/GXnXyL
-=5o8I
+iQEcBAEBCAAGBQJTqKC8AAoJEA2sAkrWKOU26Y4H/2n4dorwZbMWxJZ4eC/regM0
+i+3EWY318uvC4ua0ZyLQAe19Uy599eyOdnFXqO7CBtT0qAdJc0T59diEiPJwi1LM
+PEQWOp6TM9vWSjv7Vt+E58xtIKXf+zJWpsPQnXCfD3z67XwJyEo0NIahgm4tmuyW
+qHrpV9WIbC4JIgYs52WayL4z41Nepm/ISWt4GbILacwqz+O9bDl8ZywPRskqJijK
+8QkpVL3THByJvgaygJ6xe3gQ1zrFTFMDrDb/QQWQ5mH49nV8GDIY4GyhUARPZ9Cw
+hXFLEic8uBKe+GVUH8N0OAkLLBWcGdcNoxj7qd0cDbOIE1P/PFruiLeoyYRky3c=
+=JDGT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch b/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
index c6fc731c7469..04785a96b9ea 100644
--- a/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
@@ -1,20 +1,20 @@
-diff -Nur a/gtk/Makefile b/gtk/Makefile
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
 --- a/gtk/Makefile	2013-01-06 07:27:27.000000000 +0100
-+++ b/gtk/Makefile	2013-01-21 19:37:26.051512802 +0100
-@@ -15,14 +15,10 @@
++++ b/gtk/Makefile	2014-06-23 23:41:29.669913497 +0200
+@@ -15,13 +15,9 @@
  # along with this program; if not, see http://www.gnu.org/licenses/.
  ###############################################################################
  
 -CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -g -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\""
 -LDFLAGS = -L/usr/X11R6/lib
-+CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\"" ${CXXFLAGS}
-+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
- LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
+-LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
+-
 -ifeq "$(shell uname -s)" "Linux"
 -LDFLAGS += -Wl,--hash-style=both
 -endif
--
++CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\"" ${CXXFLAGS}
++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
++LIBS := -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0)
+ 
  SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
  	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
- 	core_commands3.cc core_commands4.cc core_commands5.cc \
diff --git a/app-emulation/free42/free42-1.4.77.ebuild b/app-emulation/free42/free42-1.4.77.ebuild
index f53fb33cae5f..8cc6cdbb664a 100644
--- a/app-emulation/free42/free42-1.4.77.ebuild
+++ b/app-emulation/free42/free42-1.4.77.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.77.ebuild,v 1.4 2013/02/25 11:39:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.77.ebuild,v 1.5 2014/06/23 21:47:40 nimiux Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs