add underlink patch to build with newer binutils from zimous via bug #489188

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 45 insertions, 9 deletions

diff --git a/games-arcade/smc/ChangeLog b/games-arcade/smc/ChangeLog
index 0c0f82cf58b7..9f18a389cf74 100644
--- a/games-arcade/smc/ChangeLog
+++ b/games-arcade/smc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/smc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/ChangeLog,v 1.29 2012/11/19 22:19:52 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/ChangeLog,v 1.30 2013/10/23 22:08:17 mr_bones_ Exp $
+
+  23 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/smc-1.9-underlink.patch, smc-1.9.ebuild:
+  add underlink patch to build with newer binutils from zimous via bug #489188
 
   19 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> smc-1.9.ebuild:
   looks like cegui-0.6 is still needed
diff --git a/games-arcade/smc/Manifest b/games-arcade/smc/Manifest
index d911693f958c..616dc7c5f130 100644
--- a/games-arcade/smc/Manifest
+++ b/games-arcade/smc/Manifest
@@ -1,6 +1,7 @@
 AUX smc-1.9-boost150.patch 3624 SHA256 d56114d4acaf9ba9e742047a635985fe42aecaf6e31405337685c14217d82f64 SHA512 5e840d82b8d3ccb6251d07c4cd52c9024a1b2a0ca2c4c81612ecd67a5cf5a7377ce75fe47cf972b0edd1caea1d739a358c930ad488180b3397a83e809704db4f WHIRLPOOL fcd8bf2b8a748428151a2715d5fdf270dedf569c461e5881b8bdbfa14f4c42fa052cdd306012c82fe631e09aad2fbb65ef65851df40a31e91b0115d5eadeccae
+AUX smc-1.9-underlink.patch 809 SHA256 e2c2dda1ce1b6da478dfc14ce81132adcf5c8a5efb81d78cc6d97d0b0df534c8 SHA512 72d71ea000277134d1bc35a175a9a18f800eabc9619a9b6e5497c7273f286f104d1f2fc48a8d915003a742b6e0887c1409dd82575374ce20a0ce4f0af5406972 WHIRLPOOL 66beb93ef28ac93f29c2cb10bff699631eba9669798f173aaa2aadb126d26f6a874bc9f9c98c8b842f3ad3759f1bbd4315b4170f784f52609542b6a5996b11d3
 DIST SMC_Music_4.1_high.zip 36605212 SHA256 0ab0e232bbdcde5c5e2391518593c5b3b2d152481946dd29d2ba7f6e22d83034 SHA512 e82e514fd2bcb0dad8973f91a40d13445498a8a0af237c83739da6b9f85d6829d9a68739677842519484cdb45e969d221cd9bb53042d0cf1981e2e5765a0da08 WHIRLPOOL c355b3440ba991f45dbda93f485282a665d8262aee00cca901807356d8cebab1deb64f6e7f79a603f8b70386a9bfa50ed41db8c9d49d995a1526db92b7c8b75a
 DIST smc-1.9.tar.bz2 49568474 SHA256 b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d SHA512 f7fdb3dd48e2c4503158e5237911906d1de23b9c8ac0f494affa6e79eb57620c61cc757e4ba6e83fdd556fc5ee061b42be0b27055deb96e9d6e5b3ea8199124e WHIRLPOOL 9bf6ea2a7db552200e57b10968ffa13ae524b91c868fc3c5d45f7ab2ee7c547563b5f337f536183538369bde86530b272befb1601b551739b62acc71305fc697
-EBUILD smc-1.9.ebuild 1200 SHA256 9bce7cb000266e3be78fbd7153e9f0f94d9f594bb12f8b60f1bb15426d08067e SHA512 0e7a7ac4bb669ed51aa8df26f70a720cbfc153e7cbbb235e20d33cc6fbbc75c9a418f667370ffdc235a0355628c016cc663ae1719106e6ecd2f03bbf74f589de WHIRLPOOL 1ab138c71397db294506c6bf9cc9c98fb5b6effdc9989bdb9674b20de6679787cb316c9b0b6af0dfacef91316e14150c6ab8009c0f0a75b0a55f131e2b7bba21
-MISC ChangeLog 6805 SHA256 d002d930457da268dfbbacac98d254afb44243c7328fb06fc184d67ef76eb889 SHA512 ed7b7a94dcc55a05d9f18120d7a2807a8d2b3d2e4b6a596213351b02d5301ed204f97424cf1f24ab8c3a7a905039f29780e5e9a81e050a8e78e08a86fa444789 WHIRLPOOL aa0b31898501796576bfad285f938e58ab422dd7f15a6c36118c4e37a0c235b84600b3a50e362c46ef19b128068ee92f6241af95b4fecef44b80b31c4c081113
+EBUILD smc-1.9.ebuild 1298 SHA256 25cee4c24b19831691db48b765a8fa8a37b729fae4bbf65190aeebb15adbdafd SHA512 bacfe7c4f251b6bbb59712d09e1af9cb242891efb9fcb7b94543de0dc6a5cec752066d47dff4060d14225b7a840296d8e648d1ebf2a6dade9252bde0369682ac WHIRLPOOL 6314d4c2ce198ca078a2f2c532d688437b266508b81a2bdd860d6f140567dd8ea9ab26488f0e3dc0796a338d7b9028a5d0e76a161ac331c964cb8a77023aafbd
+MISC ChangeLog 6990 SHA256 ad262c3ce3c99bc89169d1d4f9642189b89eea990ce0236b774f16f76980041b SHA512 d29a4e88942336816c1a0d62b118fa701b66c6114a2179f28aa8e2f2971c9043f038e43ee1daaeeac57caa10966b9c8723e5dfcb9a2b6e0931e0ff5740db12a5 WHIRLPOOL 3bce24a13c054e07b0af09cf838acc79194b5b154803c4296cb518131c8c862a585255e1811eddead3ada894ec210b2f16bcd5606874d6e10cf720ab5288c666
 MISC metadata.xml 239 SHA256 6b895868af60d56f4562164f82d0752bbc1e1da17f083e477790bfb22b5a96a2 SHA512 1e0b8ae0bd8e92f4b0acd9dc8af904a2ccb19724c7b6821ebbc3e4463e761c6642fab77ca6d4888312a18a5199ae905bd2cc5d5f32e4ea6275af6cb4e68babc4 WHIRLPOOL aad3c83dd4a6fd21510664baffc975b036a97712e52dc0bcab58bd0327821f3c85b99502cf37924dd28c368ff7f9857214525a7767fc86fa65ad447a8215f1a3
diff --git a/games-arcade/smc/files/smc-1.9-underlink.patch b/games-arcade/smc/files/smc-1.9-underlink.patch
new file mode 100644
index 000000000000..6e076027c472
--- /dev/null
+++ b/games-arcade/smc/files/smc-1.9-underlink.patch
@@ -0,0 +1,25 @@
+diff -burN smc-1.9.orig/configure.ac smc-1.9/configure.ac
+--- smc-1.9.orig/configure.ac	2013-10-23 19:11:08.635054067 +0200
++++ smc-1.9/configure.ac	2013-10-23 19:42:29.820272295 +0200
+@@ -12,6 +12,10 @@
+ ### Check for libraries ###
+ 
+ # Check for the Boost Filesystem library
++AC_CHECK_LIB(boost_system, main, ,
++	AC_MSG_ERROR([Unable to find Boost System library]))
++
++# Check for the Boost Filesystem library
+ AC_CHECK_LIB(boost_filesystem, main, ,
+ 	AC_MSG_ERROR([Unable to find Boost Filesystem library]))
+ 
+@@ -36,6 +40,10 @@
+ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+ 
++# Check for the X11 library
++AC_CHECK_LIB(X11, XOpenDisplay, ,
++	AC_MSG_ERROR([X11 library not found]))
++
+ # Check for the libpng library
+ AC_CHECK_LIB(png, png_init_io, ,
+ 	AC_MSG_ERROR([libpng library not found]))
diff --git a/games-arcade/smc/smc-1.9.ebuild b/games-arcade/smc/smc-1.9.ebuild
index 9d2bd07a9e14..5923fcb8c199 100644
--- a/games-arcade/smc/smc-1.9.ebuild
+++ b/games-arcade/smc/smc-1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/smc-1.9.ebuild,v 1.9 2012/11/19 22:19:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/smc-1.9.ebuild,v 1.10 2013/10/23 22:08:17 mr_bones_ Exp $
 
 EAPI=4
-inherit eutils flag-o-matic games
+inherit autotools eutils flag-o-matic games
 
 MUSIC_P=SMC_Music_4.1_high
 DESCRIPTION="Secret Maryo Chronicles"
@@ -20,6 +20,7 @@ RDEPEND="<dev-games/cegui-0.7[opengl,devil]
 	dev-libs/boost
 	virtual/opengl
 	virtual/glu
+	x11-libs/libX11
 	dev-libs/libpcre[unicode]
 	media-libs/libpng
 	media-libs/libsdl[X,joystick,opengl]
@@ -30,14 +31,19 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	music? ( app-arch/unzip )"
 
-PATCHES=( "${FILESDIR}"/${P}-boost150.patch )
-
 src_unpack() {
 	unpack ${P}.tar.bz2
 	cd "${S}"
 	use music && unpack ${MUSIC_P}.zip
 }
 
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-boost150.patch \
+		"${FILESDIR}"/${P}-underlink.patch
+	eautoreconf
+}
+
 src_install() {
 	default
 	newicon data/icon/window_32.png smc.png