Link against libXext (bug #515910).

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

4 files changed, 47 insertions, 11 deletions

diff --git a/x11-misc/xteddy/ChangeLog b/x11-misc/xteddy/ChangeLog
index 28437eb349ef..d279eca4e3e1 100644
--- a/x11-misc/xteddy/ChangeLog
+++ b/x11-misc/xteddy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xteddy
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/ChangeLog,v 1.14 2012/10/13 08:05:54 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/ChangeLog,v 1.15 2014/07/01 12:57:22 jer Exp $
+
+  01 Jul 2014; Jeroen Roovers <jer@gentoo.org> xteddy-2.2.ebuild,
+  +files/xteddy-2.2-linking.patch:
+  Link against libXext (bug #515910).
 
   13 Oct 2012; Agostino Sarubbo <ago@gentoo.org> xteddy-2.2.ebuild:
   Stable for amd64, wrt bug #404899
diff --git a/x11-misc/xteddy/Manifest b/x11-misc/xteddy/Manifest
index ee98eb34ac38..9607653f9636 100644
--- a/x11-misc/xteddy/Manifest
+++ b/x11-misc/xteddy/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xteddy-2.2-linking.patch 477 SHA256 3dcad417934a17a7d2cb1fdf217b37b13c16f58d29f4ddd42d585c5360561f13 SHA512 dbfa4207f6e77435b2bef95ae426107c5f397a31e8236a87b05bca86ecd39ce3797a380f4150fa5da3e2016c8ab78b44c6d8e34d69fb8e7619821c285f6c0704 WHIRLPOOL 5a7cbce0498757d94ebe7f8e6f72b93b7a66eb3137c7c3a13a5ba1a7c4e0659bf6ff0f53b75c5c307d87cfb684cba99cc77c4dbca5da6de1ec7fd47ee2eda1d1
 DIST xteddy-2.2.tar.gz 867005 SHA256 d8885a1e2e08787cb469857a9404619cadab9bddcae7fa398a565d53633291e2 SHA512 e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b WHIRLPOOL 3c479fa2ea3bc1f097a32c33bc15ea57c1cdb11fb830488865020a79c277a9d668c8e38ce6bc77da5398e7fcd92f91ce936bb88decce7fe0e94e8aa7755352fc
-EBUILD xteddy-2.2.ebuild 868 SHA256 297671f0c6e16a975c71f658f31d976dd27a868c4304b83ef0b9e3a94bb5fa9c SHA512 9360c75fdb9c30929f0ff911c1bae84fd31137acea967b05953371c1dffa7e1e5ca14b507cdaab6f923268c94b9462411f06b064610483bb3d870972014bd5cf WHIRLPOOL a6b8c43d6fb80716dadee10149a0ef9b91dce181e387a1f15b74f8661fd123685ffe53b006fddf1421956e9a8c5262bf5d418616aecf30010c73d8ba9fe4dcd8
-MISC ChangeLog 1847 SHA256 c95f004d9bd36ceda08268052166b776c1bb2ff2f95813f7b1cf80d7fa76eb75 SHA512 7ad969956363567e4578ca74175c252f902a432cf24865d562a7180d915e7267d850a980408f31f29e728b8a34d2661f56ae306771c9b2cc78f0ac6876f013f8 WHIRLPOOL 78516fbe6278f6d5ed448d21bc8d1795ae12f1422379d98ab1e04c0f3ec0dfa3e845f83ae1d8308b710267a426aa10f83a95496fd3fd92eca7bce39a97c30e25
+EBUILD xteddy-2.2.ebuild 818 SHA256 9c2eb3714288e480e8401cde6913f7e051dac28a048036f5f823e2308a7a4bb8 SHA512 6cfcb2d526e08eed8343d9f0436034bef520749052c2ccdd56908db446a09b1230134fc7626b887ecf7ec98c37c5a8d7d53344909e0580142483f3e903e29328 WHIRLPOOL bfedb897fb513c650e038d839666441c5421aa4088c13308e596b9481f5af91a6eed58afd9b24ae3391c14862fbd10189856319f5cf84b41259d5df2a88b925c
+MISC ChangeLog 1987 SHA256 5a9cc57fc3b5fc57272bdd9880d85a99af72ee054ac5ab21606aae9aae71672c SHA512 987d58a1a1b3acb5e0170c26114ea7f063851bc5bc5238d3dec63a265ff22e2dbe7ed024402324f44725374fc0bef27f2926b651bc455a69e331dec821453922 WHIRLPOOL c9e3cedb9846b513f8200b7545f142560952aa7b3f51fbcefdff500896c2b4e7ac40f9d87d7b8293557f8b4bb5997f37c3202204f11f46e80f2540eeaee774f0
 MISC metadata.xml 546 SHA256 3968e9da6603cf7fd5e155b8f23385869a7c2ec8ebd03b6eb00463b9800e282f SHA512 51277252e056eda1eb395a7d984273bd419a164871fcede89c8f77fad077cbef9cf1167497ba2cfe162399dd5c1146c165b5af0354af92c7de9b6ef9da450717 WHIRLPOOL 5455b08a146555bcdd0802807b611f125897ed9cbf48edb7b0ec48beab270244fc1b7c609e12e48ff7648fafabff169378ad65a81f8d46b557d4dc7136e24468
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlOysDMACgkQVWmRsqeSphNpVQCeJI8A27EuAO7Uksu0lS4TbWwD
+j7oAn1QS1vFNdK1ZntyzwZmAXZiI63GP
+=NiqC
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xteddy/files/xteddy-2.2-linking.patch b/x11-misc/xteddy/files/xteddy-2.2-linking.patch
new file mode 100644
index 000000000000..6dd01e48f5e9
--- /dev/null
+++ b/x11-misc/xteddy/files/xteddy-2.2-linking.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,6 +5,8 @@
+ 
+ AC_PATH_XTRA
+ PKG_CHECK_MODULES(IMLIB2, imlib2)
++PKG_CHECK_MODULES(X11, x11)
++PKG_CHECK_MODULES(XEXT, xext)
+ 
+ PIXMAP_PATH="/usr/share/xteddy"
+ AC_SUBST(PIXMAP_PATH)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@
+ bin_SCRIPTS = xtoys xteddy_test
+ 
+ AM_CFLAGS  = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++xteddy_LDADD = @IMLIB2_LIBS@ @X11_LIBS@ @XEXT_LIBS@
+ 
+ DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall
+ 
diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild
index 5f1997f71a94..62f9c0fb5254 100644
--- a/x11-misc/xteddy/xteddy-2.2.ebuild
+++ b/x11-misc/xteddy/xteddy-2.2.ebuild
@@ -1,10 +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/x11-misc/xteddy/xteddy-2.2.ebuild,v 1.7 2012/10/13 08:05:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/xteddy-2.2.ebuild,v 1.8 2014/07/01 12:57:22 jer Exp $
 
-EAPI="4"
-
-inherit autotools
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="A cuddly teddy bear (or other image) for your X desktop"
 HOMEPAGE="http://webstaff.itn.liu.se/~stegu/xteddy/"
@@ -24,8 +23,8 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS README ChangeLog NEWS xteddy.README )
 
 src_prepare() {
-	# Fix linking order for --as-needed
-	sed -i -e "s/AM_LDFLAGS/xteddy_LDADD/" Makefile.am || die
+	epatch "${FILESDIR}"/${P}-linking.patch
+
 	# Fix paths in xtoys script wrt bug #404899
 	sed -i -e "s:/usr/games:/usr/bin:" xtoys || die
 	eautoreconf