Prefixy.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 31 insertions, 26 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index cc564648aae4..488b293c11ae 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.464 2012/04/24 18:24:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.465 2012/04/26 12:15:30 scarabeus Exp $
+
+  26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.5.2-r3.ebuild:
+  Prefixy.
 
   24 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild:
   Do not try to install non-existing files, bug 412873
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d116951383f4..109a5f260605 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
@@ -25,23 +25,23 @@ DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467ae
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a SHA1 a15340529eecbbc8a95392d2f1b508cfb4caa47e SHA256 77271eb2ea0dd120801a4b1e5381ea4859e80375d9587f83ec3f4c37ab8868c8
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
-EBUILD cups-1.5.2-r3.ebuild 8381 RMD160 ed91cac25f09936a27cf1cbdecfa5c30e0eba0d4 SHA1 857d43df7e6d85901e135fb4b5f037d990787695 SHA256 0e4c66f0505251eb2f09a06b087686ff1c74c0e71a3d6008df348ca183a14b2a
-MISC ChangeLog 70667 RMD160 fe34f313355d0a564247fc4c071ce0d07f932e89 SHA1 08ceacc68b40d29d8641dac1be7f3acc6e5adfa7 SHA256 dca4bde937c4b5315537f80dc6e5ce7ce85991b4d9258ad28ae6c499fc15b6f3
+EBUILD cups-1.5.2-r3.ebuild 8406 RMD160 52f3ab8df585cea312a4b36d3b6cf10fdfe6c7a8 SHA1 53ae53653dbe1f362a2c8598ceec44da11d9255e SHA256 92b68fac13bccbe57f6a976db42a774328b8a07c1ed68e4ba1f4b35df1ef9cbd
+MISC ChangeLog 70756 RMD160 dc4386d9ac4674baa876201f0bec5a7b8f35ffd1 SHA1 4b03985623a99154dbeb0ff5971ba311bb0fc922 SHA256 0a37c5543efa6213b32ff42dd784a7b274efc297eed6161a9b54fe9203b210c9
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPlu/7AAoJENwGBM22xffebvEQAJKpsRtlPqFg3vGFAsrWFC7x
-WV2ZKsxUdVxV6FfDdlVviutiDzOJmm8CGkWurVEfsQCT8LUJA6sZRzZn0j88uRy1
-hF/WN1uf3V2XW1EYHSgvUpyLTKXirfiQR1atwoDyS/RSlAb1qIxT9t3/W66NmpQU
-FSKJfjyFUvfWqLRpXNsflhR+2tAY70lkyIpkREh0HOGswlPnMNlmrr5Nhsb741uc
-hENsLVjdOeF+HF6P4Urv2x1smKTpU36aV/jURQMMbM9YH2aoELsKIn9bkb3imEnK
-u2JYsap3+dthWp/6Zcjjybyc3uuyJ2AHJHG/G1UBUNTG//Evws4ogeRC1BT6hPtl
-3VC10YRxo2W0RzzLpfwAKesloQPlAvTsEwmYh9+n84axLnY76mnEz/RhLAJtp0EK
-UiMECVvi5d8Mk6T9Xa8+oah3r6hB6JhTsOSSGEwHRlwH/YiFYK/s94zrs4mSME0G
-TNQOmFR5aPHA4bljFefrYPj2149ZjvKZ4VUVcCQxNvS/6l5sywNf4Mmx7XE3d5CQ
-wMR8Gs9Mvr18bMdjxLZfT85uk18SmAnlxZSloXb0BMYEFlfZVTAnr87DaNbE5lT9
-4fHrnqq1lLC8Q/jJRSlW2u+zxmr3DsWkdTdbo7PfsVI4agfMlfELSrIzCeF4kDZS
-HiyH7P9V43GbpfIMTtlW
-=ZpHD
+iQIcBAEBAgAGBQJPmT0CAAoJEOSiRoyO7jvoeH0QALJSlklq5237jd/si+LCQKdT
+JE6rUMDrTFfb3m14DpYE8i9SoY1PQCAJ0+r5w4JQuj743Mnhzfsm8WGb3H4+P5LD
+kq2A1JstSyjY34ehHW0mzDingvndE8YUIZOZL7TG1eSIKfF0cJOFaikH3gMWsHMc
+QwllPGdnfkFpmzWfSp4rJLC2cFUsGqNTPhCRZYRpdIYy8XEf4PTx2P/7xac1vLFQ
+q1b17yGAAU5HlkjfNf37et336SF2zyOit873+bkz8oh8MD1QkrJPFigYJ30HRRN1
+4TrwaMxtOnkz4qzxoppcMsi7vL0OR7vUw1/r1OmlNN5bfijqXzH9idg6kH5BuvuK
+YlnE+y1iYscIPzQeIgmoqhP0jSpLhX6kA9rSKbYLaiNFECK0Df5sodGXucFk+Yrq
+EApfMu3JL3fLI3OywumaU6a1AyZybZXKuJdLFfzfriuDA85WAGiTZU0u87VN6MBL
+Bd4wAa7UieI+cjyW2zaLkXxbl080OwYYQ5YCr24Qb8TILl6xux7YJ7Ujuz+1/R40
+4jo7LT8DJ7Lfdf48Wws8hBFLYJmayaChQNgZuAExj0bol1JJAAKvsK0d5tnxwtQg
+JIUQnheHdqGmOW3HyKXZrmYR9kyZqsd6ucuZ1IEcpCmPeEsnGmMEUcYac+bgZlqc
+Sf5vICCMgjgjt5hEQ+ad
+=+3Z2
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r3.ebuild b/net-print/cups/cups-1.5.2-r3.ebuild
index 07420ef96525..cc8f978004c0 100644
--- a/net-print/cups/cups-1.5.2-r3.ebuild
+++ b/net-print/cups/cups-1.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r3.ebuild,v 1.4 2012/04/24 18:24:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r3.ebuild,v 1.5 2012/04/26 12:15:30 scarabeus Exp $
 
 EAPI=4
 
@@ -70,6 +70,8 @@ PDEPEND="
 	filters? ( net-print/foomatic-filters )
 "
 
+REQUIRED_USE="gnutls? ( ssl )"
+
 # upstream includes an interactive test which is a nono for gentoo
 RESTRICT="test"
 
@@ -160,7 +162,7 @@ src_configure() {
 	fi
 
 	local myconf
-	if use ssl || use gnutls ; then
+	if use ssl ; then
 		myconf+="
 			$(use_enable gnutls)
 			$(use_enable !gnutls openssl)
@@ -235,7 +237,7 @@ src_install() {
 	fi
 
 	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
 
 	# install our init script
 	local neededservices
@@ -254,14 +256,14 @@ src_install() {
 		# correct path
 		sed -i \
 			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${D}"/etc/xinetd.d/cups-lpd || die
+			"${ED}"/etc/xinetd.d/cups-lpd || die
 		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
 		# write permission for file owner (root), bug #296221
 		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
 	else
-		rm -rf "${D}"/etc/xinetd.d
+		rm -rf "${ED}"/etc/xinetd.d
 	fi
 
 	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
@@ -270,10 +272,10 @@ src_install() {
 
 	keepdir /etc/cups/{interfaces,ppd,ssl}
 
-	use X || rm -r "${D}"/usr/share/applications
+	use X || rm -r "${ED}"/usr/share/applications
 
 	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
+	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
 }
 
 pkg_preinst() {