fix systemd units path variable setup, see bug #465474

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xADC916E5

4 files changed, 18 insertions, 11 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9fae62a32b35..d750f85613a2 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.530 2013/04/10 16:39:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.531 2013/04/11 11:05:05 lxnay Exp $
+
+*cups-1.6.2-r3 (11 Apr 2013)
+
+  11 Apr 2013; Fabio Erculiani <lxnay@gentoo.org>
+  files/cups-1.5.0-systemd-socket-2.patch, -cups-1.6.2-r2.ebuild,
+  +cups-1.6.2-r3.ebuild:
+  fix systemd units path variable setup, see bug #465474
 
 *cups-1.6.2-r2 (10 Apr 2013)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8a1f150587cb..e92676e1f755 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,7 +6,7 @@ AUX cups-1.4.4-fix-install-perms.patch 838 SHA256 66e68f3bebd7339434e3de99582190
 AUX cups-1.4.4-nostrip.patch 487 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa WHIRLPOOL d55a6bf19e55e3cdb04510eb55b67c011ccdb8b3b73d8787b2da15a584f3e91437c0dc4b53bb62aac2b67c9985c18dddac85e06ca866722fa246a952eda16c0b
 AUX cups-1.4.4-perl-includes.patch 637 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d SHA512 f5a832f5cbc23dc7c843e96d5da2a5e8764b7dfa96871ce538475ef14162b0b2ba5f989adef7f41d6b1a9645362aae87a053aa11eb0ffec0c4c0e3d3d902eb85 WHIRLPOOL ffaaa2126be2730d229b6ccbe29b86853465963373e73d6a1cf18670f87bf3f0829372ac0c9442fa1fec8d8ace52270b7fa1a45dbe5dbeafcfc05308eb271076
 AUX cups-1.4.4-php-destdir.patch 679 SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110 SHA512 520b49722cdc615fb896045c2cf839abd4a2f0850803e9398266595b6fd780957aebba6c895df77d84633655b170e382e73a0b201f5570a4d34ea8a1075d5f8f WHIRLPOOL f47ab551e31121087a9153dc9a050f9654564edd6ce19d3449e749a5d0ddc5d09101de06345ef31b6b1a40cb64397cf1f5755b420bf3fe3ae0070639e6582d17
-AUX cups-1.5.0-systemd-socket-2.patch 12915 SHA256 878521505d4202f66831db0b88eb6f6f93ce31c92439385af3e6532a0da01d8e SHA512 67b97276453d41a5f42f7ed6c06dce14b9d0d45246bf685876b0df53488da840c8494f45f94889d195e98fb7f27cb926b79b92069eea30c917d5f3fca7fd23d8 WHIRLPOOL 4be08c9b61ee49821c2ea0c22dc405a3dca1bca90d8f5aa35035fdebc21c3ab108442960ffc74363308c979e93dbbfc6148c6f38cd44ae47dc1064e5147346fe
+AUX cups-1.5.0-systemd-socket-2.patch 12914 SHA256 779a91231b62f6467b3ee08d5cf9cb85c1fc5408a23b727aa4c4ddc54f450ed6 SHA512 9577ba50e737dd920ef06e6a5d95938ef10db5fcab8254137f15b2214846de56360dbf8c40c3a95e0b3459f5f925d18a9cd07a844cdda7dd9a41d9fac0118291 WHIRLPOOL a15a97f64db18c7ef7ba5e80096d3aeb06dbb19c388424b069e5fc8e125c159c0623aed59dc0748c8359c349a3fa314ef79f32a7b59aad214e92b974eb4f332e
 AUX cups-1.5.0-systemd-socket.patch 12829 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5 SHA512 c9dbc387a6afb0baedb3a76605537c77d0d5fdc20a403c0a5241d27ab32e05cddb3091ee312b47ada45ecb3d5ad0d4fb911cde6c6c66a379e47c3819cd30f9dd WHIRLPOOL bda7686dcf483285690f9aeaafd8630a458df70e43d4c3ce7d8f723779a956c4ff638510b4eaa5f7fcb3fd31c96f90f4c8528a74d11dce6015a7d3bae91d730a
 AUX cups-1.5.2-browsing.patch 513 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe SHA512 bd9c5be1a802a68350165c81aa107b2954bd0563edd16ee7ace762240af89c82e7ff4cc7451f16af24c87c874d8c8b094aba098d5acd612739497cca47df1e84 WHIRLPOOL b53617a904a3629bc55b0806dbafada9b0a6ae162eb7c752bcc7477fe69db8d6195d1b4e235ca6cd8c37e5f10b69410fb93278d805c18b4488425734a4a5eb1f
 AUX cups-1.5.2-linkperl.patch 724 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e SHA512 4e45372a718ff975ef9dd472d834fa3341972e2f1045f1dc437a6507f656edff589d620e844a32e5ee5bcca9e71ad608baf415d553c991190504f67aa6fa0259 WHIRLPOOL 8e5f3b320a38eeea9e807271a65a0da993f79d1c9a8bead3e688a2a85253d352c78bae448487e5a8556c70aaa921e04af4f93341dff064f2a9a704a67845b7b0
@@ -29,14 +29,14 @@ DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4
 EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd0624a7409843601e3ab6802f SHA512 725b0b632a55a227177ee6313d8ce21ff49ede6aa2cdecc62448069ad85dd979a8643e49054ee695408c66c46de7eb2d42c37cf411363be0fe638d1ad68d6829 WHIRLPOOL c11ebd1fa34492e7af49e8e0e3e131abd244529e7331c7a3421cce84777b44108f3e924fbaf7a86f3e031a0b8579f0e14580993e5063f3e6672d8d2b37e2badf
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 4cba3b3f068540fe208208dd84785b4b235883fc9d1546a7c678835ac67bc01d SHA512 b82a7a79c7ab586dd3d66b70016ce0c9c79ea7d1deffca81fb2bd8c5de0d601456245471502ab7ecbc9887fa5f732c19d933a5358c28250fc016f5837e390303 WHIRLPOOL 7925273a5321b57476c2834583f1f491bb53cba89e86babe51c13eab10506c1c7a0ae08e6e4a23b84162323a85b9010303d4f2feec4482530dee6923fb68aa40
-EBUILD cups-1.6.2-r2.ebuild 8393 SHA256 462987023f5eb622e03f472e5414c49fdf89765ea83eced22c8b8d9779eb0f3e SHA512 0e2013fc88c30d942a09a578fbc7832eda2edfc49dede0844717b50892c189315cfc705fefa093d95a5540e8df2e5f0b5c0d4fa8c83bf95707991c00ae2c431d WHIRLPOOL 6bd685a3e39f4e8002a40f5079b38575d53fcaab0b56224f7ad8837e0b4cf7841a71859cbf49fb2856480f8d4accc5182913d02cbf133ab6f567129c45768a37
+EBUILD cups-1.6.2-r3.ebuild 8393 SHA256 ec0bfc737709b5a5067f0f0269c09618afa5ef82f7d97cc49a07a9720d9778ea SHA512 641ca0f2b8e8f58cf07f68a658e31b8996d5ae654961592d21150313761b92865a11f08825e5814871f5633a79853908cfe65e57dd978cca993aa799aa42f93b WHIRLPOOL 23f2a54d329a43204a64fe2738894e6e395807bb9ead9db1757fceae63307076948a799ec708c1117a1b9eb702fc4df39f098e03125128949298b63357c00857
 EBUILD cups-9999.ebuild 8390 SHA256 52c1cd9d815c0865973df64fd528d686fd85aa3047f3126a4b74eee6c0a79706 SHA512 42481e2c62c577f8deeea0da2d14fe80c4c6a8343d0f73862a7c11c8ae8c45b0de014bb0b004e959fd01b95413d8b3f39077a265fb2a8d3572c4600bc7c6c950 WHIRLPOOL 88eb4c533aa8dcfb25d1650f8c8c56e9f785011f501ac8ab4cbc24dac3f91a55559bf62cd862f9b05becab063c2e9bfe02e1e9939b4e8ef0e927db7a70c97d90
-MISC ChangeLog 80861 SHA256 66232008f8a24904645e0ba12a2fbe9a00fc9a04fade07a14c6df894bf556a53 SHA512 ec336181071b6b4e590965fe2cc437caa68097ff79d3e64c60ad22121b37cd2509dace6bc22b4d787363cd46456fe17969e8465e0a1077aafb0ad48120cff33c WHIRLPOOL a614c649fe7df4ab32c5bc7d135a7d39595e86beb8fa0f5f5673eec2767424b3c742d7df4e83d97c981277cc6878afb31c2fa6fef5faaf5799937077299d48f9
+MISC ChangeLog 81090 SHA256 c7ae31b74059f32630f595a91e63aaa053f93d9efc318a18c9bd23cf2ef34cfe SHA512 a0d2c6d1fc345c78162105889066e6f41b1cf6d8cbdb5d2840d56556d1b2b2517e29be74a51fd4dde5c53679f729e2b12110683ebc75c5693ea7598cff771e40 WHIRLPOOL 6a2565baaf7f11435a86431a2beddd58c3d499f142b0f18be422ddcb1739d7354186636b3ee53415c30dfdf79041656b002ef4d31702e1b903331c23627142d5
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFlo5IACgkQfaj9zK3JFuUCGgCfXBDQUE9DSqS1F2ixQh7aZURL
-qowAn3N7kE33XfR7ZGvYZsPiEAYjrUF3
-=c5PT
+iEYEAREIAAYFAlFmproACgkQfaj9zK3JFuUFTACg6hG9X8/H3EuWLkVLGUOP9NIt
+NfMAoL7Cz6eydCvVlMfHRupJLni5QwJA
+=53dY
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r2.ebuild b/net-print/cups/cups-1.6.2-r3.ebuild
index c9daaf21c99b..0d5a7486407d 100644
--- a/net-print/cups/cups-1.6.2-r2.ebuild
+++ b/net-print/cups/cups-1.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r2.ebuild,v 1.1 2013/04/10 16:39:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r3.ebuild,v 1.1 2013/04/11 11:05:05 lxnay Exp $
 
 EAPI=5
 
diff --git a/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch b/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch
index d24489f0a0d5..dfd5190cf4c9 100644
--- a/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch
+++ b/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch
@@ -20,7 +20,7 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con
 +++ cups-1.5.0/config-scripts/cups-systemd.m4	2011-10-18 15:33:16.861989058 +0100
 @@ -0,0 +1,36 @@
 +dnl
-+dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.1 2013/04/10 16:39:19 lxnay Exp $"
++dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.2 2013/04/11 11:05:05 lxnay Exp $"
 +dnl
 +dnl   systemd stuff for CUPS.
 +
@@ -32,11 +32,11 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con
 +        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
 +if test "x$with_systemdsystemunitdir" != xno; then
 +        AC_MSG_CHECKING(for libsystemd-daemon)
++	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
 +        if $PKGCONFIG --exists libsystemd-daemon; then
 +		AC_MSG_RESULT(yes)
 +        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
 +        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
 +		AC_DEFINE(HAVE_SYSTEMD)
 +	else
 +		AC_MSG_RESULT(no)
@@ -53,7 +53,7 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con
 +AC_SUBST(SDLIBS)
 +
 +dnl
-+dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.1 2013/04/10 16:39:19 lxnay Exp $"
++dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.2 2013/04/11 11:05:05 lxnay Exp $"
 +dnl
 diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in
 --- cups-1.5.0/configure.in.systemd-socket	2010-11-20 01:03:46.000000000 +0000