Add prefix support (dir offsets), bug 416217

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 35 insertions, 33 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index dd6134f8f0b1..fa52fd79a553 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.533 2013/05/05 07:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.534 2013/05/11 22:16:12 dilfridge Exp $
+
+  11 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r4.ebuild,
+  cups-9999.ebuild:
+  Add prefix support (dir offsets), bug 416217
 
 *cups-1.6.2-r4 (05 May 2013)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 419b6a0d1d1b..4b99448126c2 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -29,26 +29,24 @@ 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-r4.ebuild 8938 SHA256 165250a4e209c8200ccb1e63aba2e4a93df0cf88a1a8a3d022b1be1433be13e3 SHA512 74bca25e9c65412263421a2a4ff3e098d382dd180736cb136904423f946f35a4d174d6f05cd39ec71bd1a6cff54fec76f79718be0b6c2b66d39ce2c59933e61d WHIRLPOOL 1950863215eb767fcc49b73750e4f5836cbb2ed302459ee4db03432acb3050d785bbff50684dc46cce0fbe23eaa046a8421e3aaf7b1a4377e0e79db4bb0a2798
-EBUILD cups-9999.ebuild 8935 SHA256 dd1299873d38c9a08a1dac9f71a68107e36c31b415918eb16d094b5bc942b098 SHA512 b1e9c8cf821f2bc1ea634ae1aadeec7e4b9ce5724e758093570e47e8444e11cde5f1af754a51390fd3f592877f22d1c9320554f134aa3b873805f6279b6fc528 WHIRLPOOL 35d8bc4ce0228245c095e7133df9b826dfff48c76072ccf59f10cb27cb2e10eb7883b6efb52929d2d7242a728d9f6eb5266ef483c991a6b369d08800456463e5
-MISC ChangeLog 81482 SHA256 4283b55678ba809e64d362a75539d178000968d76591524f516e0182893de8b4 SHA512 53457fea64f06bf0a17476bfdac6c507fe4e09b23d076c5d9253aabfc8c839c787b6c6f2615db4b4ad8ba9766db4ae489af3fc865d4820f4709fe5606c0665c6 WHIRLPOOL d658a382ce25d3e4b955495ec219600fc1227d08de45ba74e2f2a79653324418f71616f90362b3e8afa08bca3b9c97a7e469b6dc0750f3c34666ce3994234685
+EBUILD cups-1.6.2-r4.ebuild 9007 SHA256 cf1af61c6eff8896aa1916fa69113c9177d8ad0bc1635cfdd5db19756468974c SHA512 eac110d8e729bea4685ebaf8b810f7a609f8b71fb96cc166064ff73ec50eb55e11e39130fddf29c53cd3db9517af19df5a532b61e9131977a2ee006486ef4dd9 WHIRLPOOL 49d175bb990a6af97fbd9dac324681ce8b50f862d3d216435d2725151dae0f47119afea2abcd4df441ff37fd72a1b77f14e889a96447cefc9d23edeac36d21ef
+EBUILD cups-9999.ebuild 9004 SHA256 1b1bca8ea07b62ee2a37b9c35361cf65b5f6e0f1239d2a756bd9fef0d762f13f SHA512 94a6fe3af15a3b124b7cf428ec6f88c8fce47c57453d9a43dec34416a1216922e901b0e6e3a40f5c921f2cdb9e9340b4146499f628181d3224c68342508a1528 WHIRLPOOL 42707b2468871588b46e0c1693c2e83bae875fefbcafc1d6d9444378f1808b409871c0c71264e8be37374033b54291c929cf5b397c8a98dcaa893cd058dcd22c
+MISC ChangeLog 81632 SHA256 efc87ee8def0f6638e4d2fb48a0e54dac175a393babb8b365ac21a03060a8c17 SHA512 0d844e92afdb62c62477b9cb51fcf135847b040292ec323d3942b0fc9861fb72629d5344cdd23ad10bfce350d321ae8fa93a799a5e68eea46f743e85770219cb WHIRLPOOL bf02561a002050a731173350db7ff3efcf60c53b54a68bba97659e6fe19e422e8b02e36565d34c4079188d71def55bcffe34990654005fd3f532455f8215d441
 MISC metadata.xml 888 SHA256 fc10de1798aeb6e16d8457d45abad85d39802e59a5f461d1374043a629ab8c6f SHA512 ff93d64033d5d7f3491b77af44a92553d9cefa4ea4671eb7a9380b5a2645fe7e384bf1e277a81431578524b6dce55528d6e0c1d3408c43f3f11140b21d9b623b WHIRLPOOL ab3145f58da411364c4c12e35d66c034ef02be686e8dfd696c207fffdf193ae4a4619a184364710f2409cc92b2dc3dfc75f703c29dfb5f59423b20c7dbd9fc87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRhgWrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDDHsP/3Xd3KUH+uGe6STrvsCMDe7W
-uT8wcY5ifzhRhgBvnvcQvSI8o5IgkkeXBD1m1efDHX2faxRa26cckvvjuDQHB/kd
-bThaGRLSG+Qsj6FS2r1BCQDEUYWlNGsh+A03cgThgjGhsglskIijQzTMGRQm6yiA
-1DsV8GYmgBa3QAfjPh/86ebRRl3iBnbMxgqrHM0HSuELZDorwfUKPoRPtGhQKrt7
-x2/a1ZIJzGm7j/JfO66eKNTCJRRMpyzGdG7Cl3z70ZM22+4dOC+/kNRkXRUW5kqk
-7xkv8P10y5ZbTYTUy88iY4kKhr8b4Pf5UyPGVd/c902G2C18b8Fvh/dE0aRjbUS4
-j7Ym5MoHHvig1DqR5GM+mE5+kb9HQa2K8dThrrchWRMhTWwFRvt1OhD33e5mJy7u
-33WwhEbU+9/G21qi9HpUtFeCCAZz9y8vusQCC2NXmAugI5mdLl0Q7jqnx5nXDQOl
-u8ZgJ70459rZodCpnunQ/R6zsm39T9L34DKO6snzR5ieYYxtubruWSaPAbSU8nsE
-lBVBqhkuMT2ySQxxhBFWQA8fpX08XS2V15WoVzX1C5B6I0v79WuhGSEo6CGf5LIj
-OXh/QHPWndHWygIOxC1YkYJmsi2C2Db438JXhKChHfEyXwzIKlwxkGS5mk4gcsne
-UkbopcOgIw8/UxFuxLvJ
-=Q4cf
+iQIcBAEBCAAGBQJRjsPvAAoJEJS/30SErRQv/g4P/RElps58wVe2mCOZWE8qOz0v
+GKmlTTwxXREiNMYrU/0j0/WrP7EW7Y+JqL8ga3Ww5vEdnLOJXb2YnX9Rreq96Crs
+rE15isfzC59p7s0g7hknoYJU5393TOQ2COfaG4U2dlaOXdg2q5HC63998QF0L4CK
+F0A7wTD0UUzpTUDsY835ODjKryp5pZbP41XmCpTw+SreTHbVhjpUeV4n9k4j3rT/
+t0xUrmP5BDuRHC0IYrUTVv0Na3Fz7nAkm5x/DsKtIjpvq3bpbfAQf3s2cCdFBe1E
+BgG4E33eont43NQHGjzFsYB0mUK2ETZdsYMuoX4Ug+H0j6UcH7s36yb3yEYEGqBa
+aMowTEX72OXTm0i4zf6t96idmDBdyEl607Hxo28XnKNX0BPjeKjrjUk7KSjFAcl0
+fS1lmyQIZwivUi/Kv2jpfBwxaX9x3eO3ifJnF6sk/rxYU/cZflyqiGK9CAVEswKK
+apFrzfxIq7esOSYsylH2XMpgIGMT+ch6ZC9H+AZPApaKWEIQrxLKbbG6mgEsUhfW
+k8/ZVGguZG8EPZXZF8sTyCNZ/FsJtGaQNwslvadppE062HyeiMsrSeJZNk9YtVpa
+lyYz7PHGv/Bc5IoMC2NeR8Wc8N/901mebxQlGymOTUKBxAFqPaoNCkHnJSGHx6mY
+bJ2LQLLyrosmoRGxhTDk
+=AfV4
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r4.ebuild b/net-print/cups/cups-1.6.2-r4.ebuild
index def7608a93b1..d5d07f1f1812 100644
--- a/net-print/cups/cups-1.6.2-r4.ebuild
+++ b/net-print/cups/cups-1.6.2-r4.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.1 2013/05/05 07:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild,v 1.2 2013/05/11 22:16:12 dilfridge Exp $
 
 EAPI=5
 
@@ -160,11 +160,11 @@ src_configure() {
 	fi
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
 		--with-cups-user=lp \
 		--with-cups-group=lp \
-		--with-docdir=/usr/share/cups/html \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
 		--with-languages="${LINGUAS}" \
 		--with-system-groups=lpadmin \
 		$(use_enable acl) \
@@ -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)"/usr/libexec/cups:' Makedefs || die
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/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() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index b19951c6042e..769e97420c2d 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.31 2013/05/05 07:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.32 2013/05/11 22:16:12 dilfridge Exp $
 
 EAPI=5
 
@@ -160,11 +160,11 @@ src_configure() {
 	fi
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
 		--with-cups-user=lp \
 		--with-cups-group=lp \
-		--with-docdir=/usr/share/cups/html \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
 		--with-languages="${LINGUAS}" \
 		--with-system-groups=lpadmin \
 		$(use_enable acl) \
@@ -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)"/usr/libexec/cups:' Makedefs || die
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/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() {