Use pkg-config to get $(X11_LIBS) for the hsetroot binary in src/Makefile.am wrt #504056 by techno156

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

4 files changed, 52 insertions, 21 deletions

diff --git a/x11-misc/hsetroot/ChangeLog b/x11-misc/hsetroot/ChangeLog
index 17d6a8bd15fd..28648a7e54d7 100644
--- a/x11-misc/hsetroot/ChangeLog
+++ b/x11-misc/hsetroot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/hsetroot
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/hsetroot/ChangeLog,v 1.13 2012/06/04 20:13:08 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/hsetroot/ChangeLog,v 1.14 2014/03/10 09:39:12 ssuominen Exp $
+
+  10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/hsetroot-1.0.2-underlinking.patch, hsetroot-1.0.2.ebuild:
+  Use pkg-config to get $(X11_LIBS) for the hsetroot binary in src/Makefile.am
+  wrt #504056 by techno156
 
   04 Jun 2012; Michael Weber <xmw@gentoo.org> hsetroot-1.0.2.ebuild:
   Fix SRC_URI/HOMEPAGE (reported by df, bug 416293)
@@ -43,4 +48,3 @@
 
   05 Dec 2004; <pyrania@gentoo.org> +metadata.xml, +hsetroot-1.0.2.ebuild:
   Initial import.
-
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index 7ead3bbca734..5506cbc94a86 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -1,14 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST hsetroot-1.0.2.tar.gz 125535 RMD160 0aadf0308ec0068525babca338a35cc3899c1dc9 SHA1 a39e0fff11eb17e5432761aabcd8b68242210bb5 SHA256 d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7
-EBUILD hsetroot-1.0.2.ebuild 840 RMD160 3d4ac8b4d29ae5b67db0af1438bd43c624acc617 SHA1 61bff1929ddac74192b896bc361180de03ad29be SHA256 2b86cba1766ed8defcce4993491fa745f17f7066a6f33f9340414fbc9c2ce992
-MISC ChangeLog 1616 RMD160 c0ed76b73f09a8f93f1baf8eafe8d27411c816b6 SHA1 532e7d921fe925e2ad5f971359eb30e880f99243 SHA256 ea35555efeae5b5cc639518824030e1cc86dfc5d31e90d9705a129636c6e348d
-MISC metadata.xml 1083 RMD160 bb188a7e643ac9b7d4d22eb7a9370b3330f34b4b SHA1 e80ed3d0424d25205fae66c3aa765a4cbb25d261 SHA256 5ffaa17bfcd4767c3acc094c03f000a12b1186252bbe126e80e5f4e7c3b98ef2
+AUX hsetroot-1.0.2-underlinking.patch 523 SHA256 bd98cf079531ff83ffa74b97f0afddd6520341078b539b7e1127caf3f9b8a1df SHA512 3f1eb93ecba3e0b5976f92436e544650a6801980c1179994519f23a9a636f59dfd56bc7f444c136f43500261eaa67c8200bd13eaf1daa2f40ca2fe787c160937 WHIRLPOOL 6a66e379573bd666ac61d8c4aebe56eb1b1ebfe5f255350024cc086d404de0d7c0fbaddf7b8e682b509e17fc82b1b5940a91ec96dbbca7aeada107ac990c2577
+DIST hsetroot-1.0.2.tar.gz 125535 SHA256 d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7 SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3 WHIRLPOOL bcf543cf7fb6b6f14ff10de66d554ae9a2e1074a7adbe11068c501a495b98b6518c6cd26504ec8a5aff644c789b86d52c74c026af266c881bd9b13dab9ca5bb8
+EBUILD hsetroot-1.0.2.ebuild 853 SHA256 c44db2c40775d6a15165587eb7493c0e5b014f4ee99ad832e35062221a383ca9 SHA512 473bc651a0407afb2f4dc1315bf07d4d267a574bcf8f0217b63d32d5932918f6f23bceb1a7a94b2095c5205a3c25944512c212f60c23c3bbefd2fd9140815c9c WHIRLPOOL 523679c2f26c11ab47bffd954dfe0d6425335954c58b2434da5df0ab63320359f1a58e1bfbeb553ee073bd66f700ecc8b0ec88cc602c4856f9ee351945409fa7
+MISC ChangeLog 1849 SHA256 79394aa396a24eb66109e14fb5bc88b818641fb9b6d247b67880f27a4440a1f6 SHA512 ef6951c730e3ff75df41a04d61c8ce8cff72a8b487dd44d425638c6abe49d46e9deacc343a7a89be8411e1e1776e35402c702e985a1f1746bc7c4ad951a92bc8 WHIRLPOOL ce00fbf08c8a53feded0430202cba70367ee6eee8c694edf907d817b5ba0f344c61c3f895ca9836d78536d1b5dc5496f702c18f788733b9745b6a56134bd4d85
+MISC metadata.xml 1083 SHA256 5ffaa17bfcd4767c3acc094c03f000a12b1186252bbe126e80e5f4e7c3b98ef2 SHA512 ba393484a79aa2b5852eb6d7d27cc8f07858ef011fc93ce33fb18768117da83f344ae81bc33c322f9c99564623f2034d134d2a19d0c8f8c0791094cda10eff35 WHIRLPOOL e744db89695bfe5d38dd2cdee33b4e729300c12fbdcbc607d3bd14677f2ffd65af91c816cff55d773eff4acadffcef2a4e50c827f228c1afb7b3bfc08aa69b3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAk/NFrsACgkQknrdDGLu8JBVFgD/dKlKx1rk9/14N8YkW6CJsOu2
-pQDPBMsLb6ovzp3hBT0BAIGBqPdSJOAFODM+TsJgowHxrHsHZmP+KeE6ogQM0AyW
-=ajaP
+iQEcBAEBCAAGBQJTHYdtAAoJEEdUh39IaPFN4LAIAIE5fE0BeOGBhGszL0v6aa0a
+E4W0yQQAuu1s76ykZ5IpWH0YtxRL19TlBB1JWn+Gmwp4GxwcJsTCfIRXEeXhyBOm
+Dis3WuU66/e99jYYMP57dpsNCJ5qa6W/yVSqbCvZSMH8HepTUhYLSv71PibnshAo
+ZMBCAOyrRGW+KjSg/sdk1fLN0nw2nZiWT2Kfobnsg33QzRYArTYWtUPqEQimutdu
+8PvtUZIOdnEEP6tTqXExykO9S9arCBII4V2UGeLISOZzIV3qVn1PGyWyBZPzudcn
+Zzgm3bwMHC/+EOnma0rW4KVNqD2cjDeGZBEbYkZxOXUb/6A8poRATI78WS6G9I0=
+=WS/J
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch b/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch
new file mode 100644
index 000000000000..8d87a48fb805
--- /dev/null
+++ b/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/504056
+
+--- configure.ac
++++ configure.ac
+@@ -38,6 +38,8 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
++PKG_CHECK_MODULES(X11, [x11])
++
+ # Check for imlib2
+ AC_CHECK_PROGS(imlib2config_cmd, imlib2-config)
+ if test x$imlib2config_cmd = "x"; then
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = hsetroot
+ 
+ AM_CFLAGS = @CFLAGS@ @IMLIB2_CFLAGS@ -Wall
+-LIBS = @IMLIB2_LIBS@
++LIBS = @IMLIB2_LIBS@ $(X11_LIBS)
+ 
+ hsetroot_SOURCES = hsetroot.c
+ 
diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
index a05cae9c35ec..2d66ca534f35 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.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/hsetroot/hsetroot-1.0.2.ebuild,v 1.15 2012/06/04 20:13:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/hsetroot/hsetroot-1.0.2.ebuild,v 1.16 2014/03/10 09:39:12 ssuominen Exp $
 
-EAPI="2"
-
-inherit autotools
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X"
 HOMEPAGE="http://thegraveyard.org/hsetroot.html"
@@ -18,14 +17,13 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	>=media-libs/imlib2-1.0.6.2003[X]"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	x11-proto/xproto"
 
+DOCS="AUTHORS ChangeLog NEWS README"
+
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
 	# The pre-generated configure script contains unneeded deps
 	eautoreconf
 }
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}