Use pkg-config when linking against systemd (bug #502422).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

4 files changed, 44 insertions, 7 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 2a1e4ccd985e..e162f3cf0cf1 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.241 2014/02/22 19:27:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.242 2014/03/03 16:50:33 teiresias Exp $
+
+*sane-backends-1.0.24-r3 (03 Mar 2014)
+
+  03 Mar 2014; Christopher Brannon <teiresias@gentoo.org>
+  -sane-backends-1.0.24-r2.ebuild, +sane-backends-1.0.24-r3.ebuild,
+  +files/sane-backends-1.0.24-systemd_pkgconfig.patch:
+  Use pkg-config when linking against systemd (bug #502422).
 
   22 Feb 2014; Markus Meier <maekke@gentoo.org> sane-backends-1.0.24-r1.ebuild:
   arm stable, bug #497460
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 7a97f98ffb19..1dd645cafb67 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,6 +10,7 @@ AUX sane-backends-1.0.23-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0df
 AUX sane-backends-1.0.24-automagic_systemd.patch 1310 SHA256 5461cb3aa8bad1b299cd92c525cf6af5a3af5a82e81a74549a7f660d026ee610 SHA512 1edf28a2d106cf05df92a55ef3bf4ea530c9ee69a2517f14a33a5ff30ba69702d818677da1715ab19169a4d5575f1c7c2755431193d48a40d4f80d11e6308120 WHIRLPOOL 9404f9938567bec86487969fa0e1af21cf83c8aa88344983c09a2380c279c3de7b9c4bcd8a41836ffc3ab9628bfe4f8a38c0c165f5d933adefc66fb589fdf5d6
 AUX sane-backends-1.0.24-kodakaio_avahi.patch 2900 SHA256 83f2a75a379fd964e8662d61394dd61d674bfaf5d4cf13d12725af83aaa36f7e SHA512 c00c01d2b7ad1770117403373ece89b14ff58ed23b6719b01f89c381dd88a1195c6c57c1d3ca25d7036ea21128a36f14675e7bfae0e6db671db24fb4c1422674 WHIRLPOOL ee3be39baa2a33615308d1805d0c5f59ae6e1b4e72f481ef0629c71f94f4d26dbd06e2dca12a969e883f0453e07953c1bfbc8cbafc19dca16f5ec1e2c86ceaeb
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0dfb63944788f450d798a8882412f1d3e6da5c7e49f33cceba51 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 WHIRLPOOL d72b314c7e4898c83a4c79e6fa39af978bd60e2b78afa58c1f8e1709b5f597292e965d330a58cd4109780fb2051dcd7880008f65d2b204fe476cbf3ce898e22b
+AUX sane-backends-1.0.24-systemd_pkgconfig.patch 933 SHA256 25dd61255b78ff3ae14ffc4112b74e31743dfd2e9dd7e117d3a076c222e15f1e SHA512 2453e8587d3b44240df489a076e044ed1d64ffc5e7c95a141db2f5e207cad01ea9ca9c9a29a763bd73a69005ae8a95a4f883188f8892bee143ee0157ac820ea5 WHIRLPOOL e20779a15bf3f0dc47901ea4a66b4c7c1942180bcfdbc4bff93e35eb46d203541066c741583da302681ae93cbe5dbd420c2c4edb083dbd761e58cd6d955d7fd7
 AUX sane-backends-1.0.24-unused-cups.patch 1658 SHA256 ceb0b0809c90e8c89da70bf054c62d96a621e8a141ad2d4a9f9e48e222728376 SHA512 9c8eca84f7fe9bb4b9a80e622a577fa270f7790e84ad1cdac3894f8c6fd2f91756f14227a128c3e9252d16c16e7a51b3695c52e983871eae96d8afb2970a0296 WHIRLPOOL cd55ab0dbd86196c54e560a874e8e5c5435655c85068d35d8560fa8888dfb3bac19a4900ebfa59fde5e6a576ce3759b8bd7a61fce614872bec1afb6859cce53d
 AUX saned 150 SHA256 d18856d6dd26fac11988fea5217c8616686ad3c0c024ad5437efbf0fd24984f5 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 WHIRLPOOL 5bdd707daeba740b980ce6dd51096716eec2c2939681f6abd9e7f73b50d8d384a68a07dcc11e9295cd123cc5d2a53d02def52133a559c3e33d63612028d2aac5
 AUX saned.confd 76 SHA256 197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 WHIRLPOOL ede920bf5eb1ee59263296a2ccce1ab2da2b04669c2f8a58de1fc4fa76cc1eee501290eb4fdaece464bc184cc0cfb17d100e9309a33d79c06142a3f03c91b837
@@ -22,13 +23,17 @@ EBUILD sane-backends-1.0.23-r1.ebuild 6716 SHA256 e32dfb1d2487652cf2977f79f6744f
 EBUILD sane-backends-1.0.23-r2.ebuild 6994 SHA256 0dad30427f3d982aaaf5bb0e34d9d370d50ad43179f4000543e7ff2b4dcab6ec SHA512 a9e5c521a087dccb61385a9ec73be611f84ef61a90f289c49e169d22e0db88dc8997acde18c0fa7e014b7812f962d76f2780dc45409d17945287d411e0789de6 WHIRLPOOL 2e0c37396f2583c6d728ccd27ebe55a9890be416c397459f6ca16172c205dd473fe85829eed270f00f01d7ee9cfabeb4b2d91c28ac2480992c6a96514a74e41c
 EBUILD sane-backends-1.0.23.ebuild 6453 SHA256 f8f16bc95d192d4ab4d509d67585d7ef423c0b68488f209ccea2fc843ad1aaa7 SHA512 2aa779439770a7993466b113555106c122e989b9226fb15e2b616f17d0ebf50da22154eff751043fec828fe529191fffe3e1d5b3465ce522d155f83f45284f8b WHIRLPOOL a6e07f218cfb297dd99a3bcbc28186b79ad81e2309dd4049e1c70922cb6b0583d0f1f598c136ce09c45a27d964aeaefa34b0fabff12c0452b936cb2af62c625f
 EBUILD sane-backends-1.0.24-r1.ebuild 6696 SHA256 f78c9ed804bb68fa4fa51e8f5dca6f367a0fa05f9ce412bd3457a01a73ed7747 SHA512 c367fde4fe8c5b0bc85ac9e1602ac531f8becf68ca000cdabaa73b21313fac3642d7585dc6090de090a2a5360e500532baa79ce0453a65dd4f90dd06e271d895 WHIRLPOOL a48ac7d30d1ddfcfd4405a85c863b30169d2e1f83bf9c221a3fbc8c175948afed88c8bcdffb7d3e5457b280654d5e8de91c122fe44fff79e95574516d5738428
-EBUILD sane-backends-1.0.24-r2.ebuild 6751 SHA256 933d8cb8acd2c3b98af27c0d54fde210ced06bf85a6c29ee32a4aebf2b27b3c1 SHA512 6f97bd10fa25c5bdad8a00380ae01f72f76acdc86735443f7eed6bdfb83fe7f3c7116cee0f0c3967d8495ffa9de05a123d338dcb86f9c2606edd677e969b256c WHIRLPOOL 0028a41312f753b33c75d8bdd7bd007e86ba54c7fb962a2eb49b2755ccd5e1a890f484678d796ec5fbffd951b33ce6a32ff527b2f6074b73807869f9322cccba
-MISC ChangeLog 42171 SHA256 f01cf44f76ee063af101f14b0ea12abfc75df8841ceb6b6c5fa73acbc6e8fb53 SHA512 e790a4294115e185074f0468324a2ad4c010743a1a0a55d622c40cb88468ebeff50abacf321adf4c9f2da6acc94ae6f461b3ad22beb94054fc9bec8f46231d9f WHIRLPOOL 09a1d0a718de64470d56d5e688b8f9aafcd3ad6362e5258cfbd95f63c1db53994bbdb8a6478df12d0cae1ead426f2f4d823126bf95fe6d686c57fbbef6c57ed1
+EBUILD sane-backends-1.0.24-r3.ebuild 6798 SHA256 9d2def03a25e2d7ebefaacb162740421f80775174a75728079d7c6487944ea45 SHA512 54ec94865f2283c7def2195ae892ad707fd5bc2b81127160e302bf47ab6ccedfeae8291e9014e3c281a5dd38d0570b703ffa9d95605ccded4f2ab3032bb4d821 WHIRLPOOL 4bac2e977e559faededfc8ba1fbdf781a0bd27727f31890e177dfab4970a1f6ff22f586a235ad747effa85eb5193b94cbfd683443d7c0cdff1a6e27e6ccd0e01
+MISC ChangeLog 42457 SHA256 095ebb174e13262f5af8d0dc79b0931521bdb5b24738bd3d7a7a88a3af217411 SHA512 0db065c0ef14ab9442afb889d3bcb05373b746d7fbbd3aa0ca344e4bd1c8df82f7726f9121fb9ea5d26017ead1707e7144723c135b0122db785b9c0ea043838e WHIRLPOOL 55283c4f17af260bd7a973517684657b0e2827c7b5d15921a9abf975c0f0d38400213fd7a33ce2933c780620e496b1ebfe1981d1e02f14d1dda5880ca59f4412
 MISC metadata.xml 233 SHA256 c5f5ebf692f6c9e98fb12ac750be2e67f8b316b820dc6d36dfa3f22fead02ca4 SHA512 76ddd2dcdfdb17b98cd96ee032935125b95ee8b78722c1049b9beaef6cf482760c6bd7791d77ef5ca52c4185a5c01222a5f874c033ec3788cce2b4906ed18682 WHIRLPOOL 30cd038d04c297199c5d1d340f3612ce5e4226c099e1272b6c3257c2f9ff61cac32b577ffbcbdee7f888f8ededa9fa6d5aec6801249b2db53586531788f39229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMI+8sACgkQkKaRLQcq0GKliACcDF5ciGG5sXLC42Li0CqCmDjB
-dt4AoI2UZG7S0RpYrfvhAyLuQAzGSQnc
-=SkjL
+iQEcBAEBCAAGBQJTFLLeAAoJEH8qFnJlIeBtcaIIAIpzcNRVMx4l75dMYDUoqBGa
+/lPVmLu6/lXKIbh3d6OqvqTsGMuvlSfVOJjnMBp2sSJiGAcpzMZppcFiZKvWgON/
+8AXl/ln08UN3PIoxfD554bS8kT/5xo2As+RMYoMXit2w7mZhz5vXD/aR1TMJ7QuN
+OqbtSj137eq0dymr8tR8IaJopSg1mZ0EV4i2H2OCjIqMe4HyT6V/at6+vLG5n1Nv
+8VPifjARvj5WDe24SEOBIU/uEbKA3trQs5y83NUMKuy1rOFa6HgnMWKa0ozIXk8h
+azqCWv6mmMokp+IjZYi4YH0+AlxFLDTl9GuhCrGiV1/bTCYAMtynrghe5S1fPU0=
+=8xti
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
new file mode 100644
index 000000000000..2a75145ae4f4
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.in b/configure.in
+index 7413646..2c05265 100644
+--- a/configure.in
++++ b/configure.in
+@@ -347,17 +347,11 @@ dnl fi
+ AC_ARG_WITH(systemd,
+ 	AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
+ if test "x$with_systemd" != xno ; then
+-    dnl added by llagendijk 12/7/2012 to detect systemd for saned
+-    $as_echo_n "Checking for systemd..."
+-    if test -e /usr/include/systemd/sd-daemon.h ; then
++  PKG_CHECK_MODULES(SYSTEMD, [libsystemd libsystemd-daemon], have_systemd=yes, have_systemd=no)
++    if test "x$have_systemd" = xyes; then
+ 	AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
+-	have_systemd="yes"
+-	SYSTEMD_LIBS=" -lsystemd-daemon"
+ 	AC_SUBST(SYSTEMD_LIBS)
+-	$as_echo "yes"
+     else
+-	have_systemd="no"
+-	$as_echo "no"
+ 	if test "x$with_systemd" = xyes; then
+ 	    AC_MSG_ERROR([Systemd support was requested but systemd was not found])
+ 	fi
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
index 27df7aed1e69..cf619c0528e9 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild,v 1.1 2014/02/21 19:46:35 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild,v 1.1 2014/03/03 16:50:33 teiresias Exp $
 
 EAPI="5"
 
@@ -168,6 +168,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/niash_array_index.patch \
 		"${FILESDIR}"/${P}-unused-cups.patch \
 		"${FILESDIR}"/${P}-automagic_systemd.patch \
+		"${FILESDIR}"/${P}-systemd_pkgconfig.patch \
 		"${FILESDIR}"/${P}-kodakaio_avahi.patch \
 		"${FILESDIR}"/${P}-saned_pidfile_location.patch
 	# Fix for "make check".