Fix underlinking (link against -t -lX11 -lm) wrt #492764 by Ted Tanberry

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

4 files changed, 49 insertions, 22 deletions

diff --git a/media-sound/gqradio/ChangeLog b/media-sound/gqradio/ChangeLog
index 10fe653a74ec..72df5518ce81 100644
--- a/media-sound/gqradio/ChangeLog
+++ b/media-sound/gqradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gqradio
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/ChangeLog,v 1.18 2012/09/07 22:19:40 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/ChangeLog,v 1.19 2014/02/02 09:37:17 ssuominen Exp $
+
+  02 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/gqradio-1.9.2-underlinking.patch, gqradio-1.9.2.ebuild:
+  Fix underlinking (link against -t -lX11 -lm) wrt #492764 by Ted Tanberry
 
   07 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest
index c7e1de1b2aea..e47352284043 100644
--- a/media-sound/gqradio/Manifest
+++ b/media-sound/gqradio/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gqradio-1.9.2.tar.gz 444114 SHA256 8c00b589c2faab3fdb5053f8d47abc883ee9fc44702a34bd049ebde8a1adcfef
-EBUILD gqradio-1.9.2.ebuild 702 SHA256 e02d7d13d847e108aca149d26e32f8714d88262598b8fcd6033ac164938c615a SHA512 56e4cf113ebfc10e6f44573cd16f2cc580afb1a4f21c372c95f31f1c0a176f09ca3fa8c4d0e6d07d2871e618048de53f8e9067973ff9673afd5e49ce77177975 WHIRLPOOL be3898d00c87258344e5417b67bd5672f30eed5963b8116bdffa4d566c501040f4b8dac05d2ab7702a0f20a89c7cebf05c9934593f6d93f5725bc7539c3904de
-MISC ChangeLog 2114 SHA256 7a3d7ae137edfe96ec2750167ca906b69b0dbd35e0c3efcaba3d9b59413a61f1 SHA512 5559a35c391dc64116a1235fdbf30b0371a877da451212649d673a0f053405732333953dcb0ef41e9f74d0b52d00220adfb8e57caedcde11bd47a73e1fdc7cb3 WHIRLPOOL 504f3ad8493a210b79696673d59777b443468fef770e3fde258db1c96dbf3ba9874514e9c6c1e49faf8c4ea7f9d36bc764d3dcd5af58580d9cd5f29d209d5a79
+AUX gqradio-1.9.2-underlinking.patch 642 SHA256 007a89279db3e907c33e8bc54bdf9929bb75236d196066ad46d77ce9f2bd403d SHA512 596dd4109ec4c1e356af0403e6195d3331102a96a14e6525874ed4044d9cae90e9a70942097fd57b70bccbcc3f3befc81e50324e8389df14bc3a6e6f093f468a WHIRLPOOL 73969be8148f7da3e2fd555ce1240c9ca8e78e7306dfef91401147ca6036ed4836b6d8a8e5fb72fe5ff3abf2974de41e1f60446e81490e6262847108ade3a5ce
+DIST gqradio-1.9.2.tar.gz 444114 SHA256 8c00b589c2faab3fdb5053f8d47abc883ee9fc44702a34bd049ebde8a1adcfef SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a WHIRLPOOL 4589bec806e43290eb0efda1038afec69b27d9c71f517bd8c0fdae0d99477f335282b017deccac023e63f0adf46b4a12ceb11f38477983b115e179c20f351ac7
+EBUILD gqradio-1.9.2.ebuild 724 SHA256 0389d92aa601b789979575c728cc9d9c49edc3ef2d3f2a868d864e1e13e74256 SHA512 f8970abe5c31bd9855e28955d661939d39719c0691dcf4046d0ab48f08366ac98e519d9a8264db26502f41bee67d9fe3a9eedfcd894adc2c6e0db19aa4777bff WHIRLPOOL 0c4bbc2580b1968f28974bf7512ce8d32e502ebac022be25030bc3078832efe1e1141abfbc91b2d0ac6376ecdfa11ae7f29f59f611aed7068f5daae2546769b0
+MISC ChangeLog 2309 SHA256 ced8a5a80db8d61e2c60ce4623458d3c2f44942cc28891b164895355ca4b60d4 SHA512 6864816edda9da86a0a7766f4aa38764e21644f36176d559a4fb82c493fef00a6892310697fbf094293a6337ac2638aa56d24e7cd63c53e5e1383dcad5a2eaad WHIRLPOOL 849434005814c345e1a745f8cd894039549273fe29f534ad18668b1aa810b9a36953783dc729f2eaf5bca1d7157e3c9be6b53060b5dd42bac949a45aa1c04b52
 MISC metadata.xml 486 SHA256 6b458972af9d4e584715943d39ee54515b381128d1e4dfe37017fd7c81f46edc SHA512 1963c0f8f0058f384782fb69919b3c4052d7e7563311289f87b84157be7bdc945b121e4fd8a217a4167f574ac6a5a9c2a21beefad73e2b5a7098ed16224bba48 WHIRLPOOL 081218d3bf42ce9d158ee6cd8c523f6c506f7e2b8e9d1853201c3b7f278ede0777f5d85d8e5090f43f5f4e6b2d6d672a110ece8b9d36819f9012b487a60189dd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQSnMCAAoJEEqz6FtPBkyj3roIAIN7o1rZOkpA/uE4AAAUmiGB
-3JgfnpfFiFi7LsaSQJCy7jNSQ8WxfiS+tuRfg9R8UGs9gP1qO6Zg8q4867aZq84P
-JixlP0/AzKK2uuxwq3Hx2T/xiqK+psIIiIQxx1e7gLBbNo8dOGVI3GSPJl/VmPym
-ffGuF9TLUat9CLz+GF+G0CV3nHJrINUTp4wFwPZZU7ItRfPwbsNoYdS6pIlzAGsw
-jp0VrPcRHQm8lngeis3YxBkBeEBARovjmAGe2r4mEgCxephK72mxokTE0NUTIIWF
-i51anHgRuKpGLr7pGxXvHdiZX0+oxD3lNe9X/6ioZoMfrHViR5Ps5PTy6Obz6Qs=
-=vPTd
+iQEcBAEBCAAGBQJS7hGvAAoJEEdUh39IaPFNJU4H/0TNx4zkaAIiolpoFDRYecG9
+6glk7mN9SkGtunhuSWmEhtvWBM4BK9ZDjzfT/KM+8qugUI/IBL63gyz5QcUXL2t7
+DkItWdz2ksBJQJAB0vTBJKUtVHpWITDHpaOZY/hcglsMoKHBIF+kodE+iQRqOePA
+74npt6jcUhjjH9naCsovRnGlGdql1MFSckbebHXGBb3iOIpCU9w1eNxnfkmXf+Mw
+iKGPbyZCsGzMuSCX8eFPGr5cPmdTDORtAa3Rsp+gHLILfsuAAJ27D2LFZSSR3vwJ
+nvLu79O52ZVmtZQiDJal8fC3Bb0Di8Hrs9ah0m3QH4QoJwUX0HYOb1ijUgefjvA=
+=9XQW
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
new file mode 100644
index 000000000000..bcedc3e40f10
--- /dev/null
+++ b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
@@ -0,0 +1,19 @@
+--- configure.in
++++ configure.in
+@@ -30,6 +30,16 @@
+ AC_DEFINE_UNQUOTED(GQRADIO_SKINDIR, "$prefix/share/gqradio/skins", [Location of skins])
+ AC_DEFINE_UNQUOTED(GQRADIO_HELPDIR, "$prefix/share/doc/gqradio-$VERSION", [Location of documentation files])
+ 
++dnl Check for XInternAtom() in libX11 in order to prevent underlinking #492764
++AC_SEARCH_LIBS([XInternAtom], [X11], [], [
++	AC_MSG_ERROR([unable to find the XInternAtom() function])
++])
++
++dnl Check for rintf() in libm
++AC_SEARCH_LIBS([rintf], [m], [], [
++	AC_MSG_ERROR([unable to find the rintf() function])
++])
++
+ ALL_LINGUAS="fr"
+ GETTEXT_PACKAGE=$PACKAGE
+ AC_SUBST(GETTEXT_PACKAGE)
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
index 3edffefb22f5..5be7306dec47 100644
--- a/media-sound/gqradio/gqradio-1.9.2.ebuild
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/gqradio-1.9.2.ebuild,v 1.5 2012/05/05 08:27:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqradio/gqradio-1.9.2.ebuild,v 1.6 2014/02/02 09:37:17 ssuominen Exp $
 
-EAPI=2
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="An FM radio tuner app from the people who brought you GQmpeg."
 HOMEPAGE="http://gqmpeg.sourceforge.net/radio.html"
@@ -10,15 +11,17 @@ SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README SKIN-SPECS TODO
+DOCS="AUTHORS ChangeLog README SKIN-SPECS TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
 }