Let's put some sanity into the prefix directory offsets. Bug 469846.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 49 insertions, 27 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 93e153cddbe4..2279f3d71367 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # 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.536 2013/05/14 16:04:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.537 2013/05/14 18:44:48 dilfridge Exp $
+
+*cups-1.6.2-r5 (14 May 2013)
+
+  14 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r4.ebuild,
+  +cups-1.6.2-r5.ebuild, cups-9999.ebuild:
+  Let's put some sanity into the prefix directory offsets. Bug 469846.
 
 *cups-1.6.2-r3 (14 May 2013)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index a16857026f35..471bb0fbb2af 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -30,24 +30,26 @@ EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd062
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 0a7ce20dfd2db91a6ed81c54bea74f57c2b416f245b33798fab8df01f8c3a2c6 SHA512 8e58e10a2c3c0cacc22bf2fb234ececcc6e9dc2c9a17d2babc7c491e0a956e8d42a29abc2d5e196b82593b593139430278fd83f27b6a6148f733aa65ea44a311 WHIRLPOOL 65af0f97161198ab8699da209f9de93d397d4d754258821ce29e5f772465906d4aeadae48a26dbee412ff5953eedc6e50d6b9da76d54626d1922fb1b55e2ec71
 EBUILD cups-1.6.2-r3.ebuild 8922 SHA256 4275ed53ca9aec23a415f95e214b83ccf83bb0c1566ec46bcd0fc855892f4c4b SHA512 e61aee93408fa21707f602dba03e7487d8eb286a2f2c30a9194f6c82f3d4689e89c91908603fb742caff595e32647132703fb3afe93da281acfcb29fc485e54a WHIRLPOOL 3d62981aba362fa3ccf5a8c6c63c9df5d90288479d423ca2e0b2010ce0beb753562dc938ca728108c9c586ee5b49bc5f630bf43fe9247e7e95b918e52519bbd0
-EBUILD cups-1.6.2-r4.ebuild 9007 SHA256 83c50432499130649ca9696a8e7888fa314a03fb88ad5ef70e2e191ee26057dd SHA512 ac5083068a495eb85e75b10b2d9deb9b0c778ab3dc5163db46fb4b1ed585f2a08fa19e7f861f6cc4b4013e042dc763a50aa9df4df74a89c8bd5dfbf6c7e78f0e WHIRLPOOL 58b20fe77d55bb2acd72bc9b744a2e4089e8869b2f4e028d0b6b94e56933695ccad308c39c781020c79a383cfec9046ea9f08aa871d1e371936921bf32edceb0
-EBUILD cups-9999.ebuild 9004 SHA256 4364cbc83fc584fba94f8614b86afa59bb74961eee84f57b2c849d56deda3224 SHA512 91c89d78229e9cce831ab569aa368dd417b017bf6964e361150b5c952546ed198d44df604d53346982f0ced81d09a0423e96a9c2bdf1364835a018b82bd969d1 WHIRLPOOL de261422e963f828361aa3cb1f7a6a443c253f64c8cfb1746c50848f357f2f87fb4183b9e6937c45501e2565e06f8db8d965b522fc2d6f8ca5dc416b1dbf4018
-MISC ChangeLog 81951 SHA256 9cf74b91a2a4b196bdece2863b76ed767216fdc3cf621f912062637ee20841b0 SHA512 b713da90491d80c8995648e7b41ab8735450733e6b43926c8321b221ea691c755b9e92963f3825a5e8e0256f67260b18f7089ee69763d09c4d408820ac9c0a30 WHIRLPOOL 95ee38c9751f71c162093b86f4c195dc6e58eb0ed85e70c2d4dc19aae40aa1acfa6babd4451040a42e783562e57ca4b803af9158a706e35c77ed3c5682846c65
+EBUILD cups-1.6.2-r5.ebuild 9222 SHA256 99c8495c9035aee48e1f8ef9f7101c4aa4dfa4ca9cdd5f43d421a64af56e32e7 SHA512 9fba4f202f5d638492ece0505bad9033b151ee91e62dd7f2a519aaf57e0b16795ab842ee9a7f6bcf5cec5745c5e40978fe478dc4395d91052ebb43008bfb7dd5 WHIRLPOOL a0e0df76ca5d897939e4114e1e2003330ee85c39f6618a43705a03a7ccb0a87ff81eca09862402a703aaad031cfc43ca2de7e1a2e2e66db827b20aba85a5431d
+EBUILD cups-9999.ebuild 9219 SHA256 0a6f4afc17194d15575c1daf19d4655b18ad430281d331d99ada0d951be6e75c SHA512 c77178d1875fa90cb81eff79af88d59fa5f96e751a0e1e1e6bf0a883b679256655e4741018c4175eb7326b9cf3a5906e8d96b545f07655eed4ebdc14792cc816 WHIRLPOOL a161c0c57c97a67f7a435c176e64b905a313a7468ff57c986ebc5aedcb56e36e72e46aecbbed0e6dcdde7623c05752b8510f77b3aad93e40e5ff7ff61a43bd03
+MISC ChangeLog 82176 SHA256 90a16bcb03fa39d6689269d54f857f0e64c232b3f6b97cc32868936e5dd01d99 SHA512 a9ae2562a6b3ad7a779483ed1868cd9d42ba5d4435326dabca4a54f40707f80ab2152f6b2e529d73fb89429501dc939163246fbd0ed5eb805747aadd74241722 WHIRLPOOL 6e03c1187319dc3058116cf1f457b453f8a286cee54123e3285b04d7060e7000f0ea1cfb5b69f1913698ba270fedc9cca137b35a9b4afd10b506d734ce5c5049
 MISC metadata.xml 888 SHA256 fc10de1798aeb6e16d8457d45abad85d39802e59a5f461d1374043a629ab8c6f SHA512 ff93d64033d5d7f3491b77af44a92553d9cefa4ea4671eb7a9380b5a2645fe7e384bf1e277a81431578524b6dce55528d6e0c1d3408c43f3f11140b21d9b623b WHIRLPOOL ab3145f58da411364c4c12e35d66c034ef02be686e8dfd696c207fffdf193ae4a4619a184364710f2409cc92b2dc3dfc75f703c29dfb5f59423b20c7dbd9fc87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRkmBwAAoJEOSiRoyO7jvoZ3oQAK7kStzE+lT2tkWtE7b1OtiG
-7ZmihErvhHsHUF75rn4Fwxgkg8rVl18NtPICcOU7FX89HW3OqaQ4qlQ4OU5+rqx2
-TjsIUGBxHz+1unvxqHqHWxH3NgS1dBpC6nQgh/ZGV4NxUXj9YUSpb3GX+4zIK3G9
-m/dKEtp4jYg5ZmRZrvWDCAzspHLNQ5Knfc+8KaN/IbE8OO5DBSvtnLyIMRbeQ0Dv
-ycpHbyE+qKNIokoctbzBUec7ritxYCsqjANy0/8utv+A3FpJWH16kK4OgdAOqy1q
-NcQVGmApeOZ6qBmzOq7EcB4p13ypO5Vra6exAXlJSZypcQvdTXmeGdvBFllxMnHJ
-KDkJW0aYYE3CYNjFON0BRrdKNYDZt2VqQk7YdwjJG6tJhjiIsDNvvX8DHuEoCVB/
-qlCrFZj4oonQMcee4K/WSq6PTAeYszDOSj5TzRmWvU8iaz/iJuYz4GqdM9N5D93I
-EQIuip1YiY+mR3RwJkl+0jPn/eiViI8AMHWwJd3dYdqIury9m3y5rBWSkcre6WJR
-NATHRyXTPdA84uIS3/W7rznZHVkI1QdQz2xw8hFcwuU5XjW4hi/d9ZTu5DtJkcpn
-4mtkL7mCIXdKnyKTJGbaVXQZSyFzdW+lWGT9pLqVb+YNEIFZdXoWDEn+TatkURCL
-xHGtg5juD3DeYvaetxut
-=uB5Q
+iQJ8BAEBCABmBQJRkoaJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcEbQP/1TYwzm8FtkCG9vvYen05wnC
+QszA0DsDuq6lNUtQXb6TUTDSqtR08w1h4q2TqdympxXzd3KZ5AL89m+nrtjFwBvU
+ZiaoXNOeOmEt2Or5mW/NBnReNXMQ/e8r10zXIfetIRVJ1PO+sI8bjFX4QK0SUIZV
++Xa7pHw60A6cTab9PAaGfKWYYSHqPiTrOwCgVsYLenIEWq+9UM6n2KmTgItzBnp0
+5WQbPqqmywqwmu+uNoppHNvXh6xGni9kgLILu9IT7HjKYAzsrNxb77OZ0S0+92DT
+oh6mk8iuOdqox07+Gecl4xhY12or7Qe4dmRDzDIIR/MgFN8fr/ursAS7ntvCOmD8
+HMr2lhBiU6PfHEjkQOUS4a9y5Ob0OMcSVSuzp5OlQUwhzYGQo00WK+TzTk59b+Xe
+nFI2gMhNBWPV5V7twqz++bnk6evZBxNCjlLmzKO3+ItJ6epQkhtYmoIzP3FdhX3s
+NShMIuOVyEmhNy0y5eLw+ZLFUWEjPI3SPQWGHpOsGwA+u+iPTJSqIPg5sf5aMPL8
+wmmAtwllMwuIbbtLXR0K9ODbMej+Rm4yDgSrl+zVSbKLNkvrekxubpqyu8qIbAHP
+fHSUqK8ki00BZKkg5flB4ac2uC23vH2nU/qEV4CTeYQnVzbTEuIbqs2wcJAifk9C
+Olwd7fXqvtZD00V5zpRR
+=cpY3
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r4.ebuild b/net-print/cups/cups-1.6.2-r5.ebuild
index c03441634856..1f27214984a2 100644
--- a/net-print/cups/cups-1.6.2-r4.ebuild
+++ b/net-print/cups/cups-1.6.2-r5.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-r4.ebuild,v 1.3 2013/05/12 15:52:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r5.ebuild,v 1.1 2013/05/14 18:44:48 dilfridge Exp $
 
 EAPI=5
 
@@ -189,9 +189,9 @@ src_configure() {
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
 	# makes more sense when facing multilib support.
-	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)${EPREFIX}"/usr/libexec/cups:' Makedefs || die
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "${EPREFIX}/usr/libexec/cups":' config.h || die
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=${EPREFIX}/usr/libexec/cups:' cups-config || die
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
 }
 
 src_install() {
@@ -292,9 +292,16 @@ pkg_postinst() {
 		echo
 		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
 		elog "a daemon cups-browsed which implements printer discovery via the"
-		elog "Cups-1.5 protocol. Not much tested so far though."
+		elog "CUPS-1.5 protocol."
 		echo
 	fi
+
+	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+		ewarn
+		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+		ewarn
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 71b9083501ad..90ac6b0cefe8 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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-9999.ebuild,v 1.33 2013/05/12 15:52:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.34 2013/05/14 18:44:48 dilfridge Exp $
 
 EAPI=5
 
@@ -189,9 +189,9 @@ src_configure() {
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
 	# makes more sense when facing multilib support.
-	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)${EPREFIX}"/usr/libexec/cups:' Makedefs || die
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "${EPREFIX}/usr/libexec/cups":' config.h || die
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=${EPREFIX}/usr/libexec/cups:' cups-config || die
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
 }
 
 src_install() {
@@ -292,9 +292,16 @@ pkg_postinst() {
 		echo
 		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
 		elog "a daemon cups-browsed which implements printer discovery via the"
-		elog "Cups-1.5 protocol. Not much tested so far though."
+		elog "CUPS-1.5 protocol."
 		echo
 	fi
+
+	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+		ewarn
+		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+		ewarn
+	fi
 }
 
 pkg_postrm() {