Fix underlinking (bug #369049).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 75 insertions, 49 deletions

diff --git a/x11-misc/xscreensaver-app/ChangeLog b/x11-misc/xscreensaver-app/ChangeLog
index a1a50bc27067..bc1fc7ba497e 100644
--- a/x11-misc/xscreensaver-app/ChangeLog
+++ b/x11-misc/xscreensaver-app/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver-app
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/ChangeLog,v 1.10 2010/08/27 17:21:28 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/ChangeLog,v 1.11 2013/07/18 21:23:33 jer Exp $
+
+*xscreensaver-app-2.3-r2 (18 Jul 2013)
+
+  18 Jul 2013; Jeroen Roovers <jer@gentoo.org> -xscreensaver-app-2.3-r1.ebuild,
+  +xscreensaver-app-2.3-r2.ebuild,
+  +files/xscreensaver-app-2.3-underlinking.patch:
+  Fix underlinking (bug #369049).
 
 *xscreensaver-app-2.3-r1 (27 Aug 2010)
 
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index 95c138c3382e..d2f1fadb3950 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST XScreenSaver.App-2.3.tar.gz 47566 RMD160 4e681be9a631e9e4043a66972dcb77f2bf483c51 SHA1 5fc59252d6831a1d46047a852db4898da042198a SHA256 f5ee06a00f57153f1f8e3dac480a6eb3ab93e74406c23ff6bf1dbc67d39138e1
-EBUILD xscreensaver-app-2.3-r1.ebuild 843 RMD160 1202e92899a37d5292e5de518b8ae5b35731801d SHA1 71286af55c14a77db0dc82b3b671a503fd468fbc SHA256 77c6e8e282423d0c9d58bcc92083528ee8f537b254121a860b9fea10e7f908c4
-EBUILD xscreensaver-app-2.3.ebuild 812 RMD160 6f83a10c64f3d651b5501af8144473f71721608a SHA1 f4bfbc2d7ed78cfd81015d92a6af41cd74752275 SHA256 dc674c5134e697c66b57fbf543227810400eaad501f2b492e0e8ccd62f271b4e
-MISC ChangeLog 1446 RMD160 661d72b9258dc96acc3607658790ad9172884ba3 SHA1 063633d8832d7cb0958aefbe086f4d24021e4922 SHA256 0bebe87e6b5f1adad6ec845f1135dbd9a0749bf3e474356229ebb611962d206f
-MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
+AUX xscreensaver-app-2.3-underlinking.patch 253 SHA256 3f95bb06bcddd6210fe1a073247a87f1b409e32c8f68617231ea949f92daa200 SHA512 02b73e67150661971105d062871b1d2f832c6c422689d5a1a53f68c6f77014aa19497d85aaf86d1c017a8302e36d567e73b0bd3f351133b6240c786c0ee6de97 WHIRLPOOL daf5e39dd221aa86c606a2b965ef80790bebe8110d6dd696cdc7785916f92693ebb60fb3ed10b3ff7e207a3bb90b708a9499a27f8e427d8e5e77d70380552cd1
+DIST XScreenSaver.App-2.3.tar.gz 47566 SHA256 f5ee06a00f57153f1f8e3dac480a6eb3ab93e74406c23ff6bf1dbc67d39138e1 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290 WHIRLPOOL 0dfdee9bcb57ec2deecd8889b1e74c88d95be1aa791fe16398b716b59fefde8f6ab0e6a2a5a4f3518d5881fda9c1ba153086c27dc26b2c5d8e24f1957c9c3fcb
+EBUILD xscreensaver-app-2.3-r2.ebuild 939 SHA256 682840b9ab0dbc6db6b7a9edb47bd02236d516858550d66c9f391f78b1ba26e0 SHA512 5233c59220641ad69cab8a5f8b8fcecef679437e156fc2546eba22215ced38d28c043ebdaf49cbff37b21ba99d8edf85f6edd8bedc2b139c46aa7045e30224b7 WHIRLPOOL 9106de2aa2cd8eb4bf8a36f3a1ddce3814ff792be5911cb603f6fb27220c2624fd7c17ad60830b224968b4bb99a09041a87b47f819a91858230fc2369fb4f6ec
+EBUILD xscreensaver-app-2.3.ebuild 812 SHA256 dc674c5134e697c66b57fbf543227810400eaad501f2b492e0e8ccd62f271b4e SHA512 9f7ddc6af7947d6e4e70fa0e7996ef244770dbbdf3389755e64321aa82169be280f454355bb7176d9b4b30ba8db5d2104023b3fd0f23e8e7e849b0022e2791fc WHIRLPOOL 9824cea42dac96663165204d3ab3fb716e53b988a0b1b372c957c68cb9488143f58e0c47e253146f240b41b7e57d50526f7abca7e37d1f9f219ddbab3d924ea8
+MISC ChangeLog 1679 SHA256 2b68e9e72337725d8a602ea0e911426501c9632d12c8b0e628a106635da98604 SHA512 018e1bcd8ea238f979703ef961d5a51264a74ae1e2945266dabb9499a36633544cb09917ad34853d07750426e55f4bed7ee0fefbcfd427b3c84364446d361bb5 WHIRLPOOL e36e0addcf79a4a9ae70ce0cbaa6b779d4d5caee43ce38bf070a3f2739266fb160dcf0b986385bf6af108cc59874411f821a2cde98071a1adde76abfb658286c
+MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iJwEAQECAAYFAkx39CMACgkQIiMqcbOVdxQlNwP9Fg4oCM5ykWW8VDkgtS6lkxI0
-jL8gYr5/mLRaOQcJdBMQQqa2fL9+c2sWTwQw0JpiVyK1Jvhi3UWmwf1X9VWxUrl0
-OT5SgHAe4Tl4NVMjv1mAAJpd5O51pCLVAT2jXwd0fngen9bwYu8OkoYimUdkCJ/5
-G2iHV0dFdPq9NqYPayQ=
-=qnAA
+iEYEAREIAAYFAlHoXNYACgkQVWmRsqeSphOEoQCeKfoRDW0nP7tGCV11vbWk3AnG
+BAAAnj2ILFaRSYm2cokBbVL0HM4Ay99z
+=Q87+
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-underlinking.patch b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-underlinking.patch
new file mode 100644
index 000000000000..5707e4fc7206
--- /dev/null
+++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -14,7 +14,6 @@
+ 	echo
+ 	exit 1)
+ 
+-LDFLAGS=`gtk-config --cflags`
++PKG_CHECK_MODULES(LIBX11, x11,[LIBS="$LIBS $LIBX11_LIBS";INCLUDES="$INCLUDES $LIBX11_CFLAGS"],[exit 1])
+ 
+-AC_SUBST(LDFLAGS)
+ AC_OUTPUT(Makefile)
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r1.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r1.ebuild
deleted file mode 100644
index 48a5315858ae..000000000000
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r1.ebuild,v 1.1 2010/08/27 17:21:28 xarthisius Exp $
-
-EAPI=2
-
-inherit toolchain-funcs
-
-MY_PN=${PN/-a/.A}
-MY_PN=${MY_PN/xs/XS}
-MY_PN=${MY_PN/s/S}
-
-DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager."
-SRC_URI=" http://www.asleep.net/download/${MY_PN}-${PV}.tar.gz"
-HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libdockapp"
-RDEPEND="${DEPEND}
-	x11-misc/xscreensaver"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin ${MY_PN} || die
-	dodoc README NEWS ChangeLog TODO AUTHORS || die
-}
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild
new file mode 100644
index 000000000000..710e068f5657
--- /dev/null
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild,v 1.1 2013/07/18 21:23:33 jer Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+MY_PN=${PN/-a/.A}
+MY_PN=${MY_PN/xs/XS}
+MY_PN=${MY_PN/s/S}
+
+DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager."
+HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	x11-libs/libdockapp
+	x11-libs/libX11
+"
+DEPEND="
+	${CDEPEND}
+	x11-proto/xproto
+"
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xscreensaver
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin ${MY_PN}
+	dodoc README NEWS ChangeLog TODO AUTHORS
+}