Don't use $FILESDIR in pkg_preinst() for binpkg support wrt #453726 by Fabio Erculiani

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 35 insertions, 29 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 2373ed130b6f..e81375b3dc12 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.797 2013/01/23 11:10:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.798 2013/01/23 20:23:12 ssuominen Exp $
+
+  23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
+  udev-197-r4.ebuild, udev-9999.ebuild:
+  Don't use $FILESDIR in pkg_preinst() for binpkg support wrt #453726 by Fabio
+  Erculiani
 
   23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
   udev-197-r4.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 974fd5a47417..c0ff2c35e1e7 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,20 +11,20 @@ DIST udev-197-patches-1.tar.bz2 1344 SHA256 563479e8860ba6d67366f40d9e58b85e31f9
 DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
 EBUILD udev-171-r10.ebuild 16106 SHA256 c9e107c27107cfe9c9e3cba319d7280b4510f0b466222354f45c6c8664b48371 SHA512 79a62ae8e519a7cf2e0e78f5d87d7d046ef14ea0571bf20e51b1121927e40b67069291ed050610541422c47535c1d85b6f2f3001078fe2f73d89878fdd3782a3 WHIRLPOOL 770759c3c24ed66d0ebda92517a096f91f4d644af276116f21c4acb9625644e33f9441927fe75167786df2e6400635622670e7a5cb6056f5311222537982f065
-EBUILD udev-197-r3.ebuild 13973 SHA256 193f58bc75a39fab224e21495dde7b5704d84da0ba2d6c9d001afaab8b9e415f SHA512 effb6f128662eb7ccdd50e7e08e5119e22aa9a7775cda67fd1e9872506cd246fa3cd2cdabbd2163e3c94aceb63c1685fdd07d9c26459e067677f5c91e0c1c6c3 WHIRLPOOL 2b68afa6d3fd641055c027d062009a2d4229dd519ac64a34c9ebfd5cd5c98b8ccdbe6e34b1a9abcc7e6fe22132ae1c1fb87ae81e1032fc9967da08b0169e0a0a
-EBUILD udev-197-r4.ebuild 14101 SHA256 85d946ebff56bcf0834cb24a2b66426d0b2d74dccd573d0010988db7b24e2ad6 SHA512 f4bea98832660813554fcdfcfe068c5aadb71554e7c57b23936a772cf9b5588047ab8be02e2eb56ec74c48c33c58d117abb285f7edf019c7696cb05314c48206 WHIRLPOOL 21c8e2014f69598cb5b919477c58f9d8b3e86e7e4ed057339043ec3eab0d4776ede13cf837145357d4ce3bfb0ccac3acd8f678e051242c179ed06f2e57783b3a
-EBUILD udev-9999.ebuild 14099 SHA256 5dc75f480d7711d05f4db36a233ab8f3d84f6bb17194ac278c053ff2111754ed SHA512 19cfc9ff93dcd8883daab842e567e98a545bf4e597f9be4c079197eb363cc2bd15e84a4777a02bc8d90fc3b0d40d6d923a08d08c2d3288a59b35d81cb0654ac9 WHIRLPOOL fa1ee315186a930adc3a7d6c168d4babc52529943b89e5ba8ea36c4faeade426ba94afba7d5cf4ec872185e53b6c6cc73b092d6bf6df1a67895efcce61192a23
-MISC ChangeLog 52369 SHA256 c0eb384a76baf7d068a019187e7f79990b5645438a6a3f6ae435f9ce4c3a18b1 SHA512 a4f03b88f48290c3491143e41a83c2b77c0daf7ca458c43963f8fdc116dd1042f39d3f473e237d511da64ad913f0851357524a1c28d3deeeda0bc8ae0b979e3b WHIRLPOOL 2f8a28fced022f5cb60361582b02dfb68d0647f77d065793d842d4601c9c6a9a9abedd5cb3c2f6472c0eb26e32b493aced81e63d2c6a10fdb1e36dc4b1a2a5fa
+EBUILD udev-197-r3.ebuild 13735 SHA256 44494cb1f29bc31a02aa51f6b75e68fb302a44ded64d648d4c78929985311c20 SHA512 2cc5c3367cafad971e52c96563700e63be41be0a11632c346cd7abdc93eb04edb88e40de46ccc682e1c46ec2907e14fa775861a94c6eb51b488873a5594496b8 WHIRLPOOL 805226aed1d2bdad3cb58a12c0752edb9737b6022d046fb33c4ea3c1f5e106d9e439443d8a4c3d00849890150f298ac6dc1215e0278467e7dcc21cb0bb2a0431
+EBUILD udev-197-r4.ebuild 14250 SHA256 04425909832bf7042d5c074e970174fdc8d82f0a1841ae696cff7c6856d96621 SHA512 3ae7411ac1a40d77cbe3b16de640afde43ee0e442c7f444b6a28518a6233a295a23d7b4d1fe1323caa4973424f16f38c018ab49ee0deb813b5f5ba3841fbe51c WHIRLPOOL 7433b574c6afdea8ec201e94f287f10af399995e6bcf600a64c88bc76b9580c1dcb0eadec7179d146d78cf52287dff43d4654d9dc630d28dae5f9a5a4dfa619d
+EBUILD udev-9999.ebuild 14248 SHA256 77aa8e26cf24b4e0efcf74566ffb70addb84b601cdef6c765d6a73f580c76063 SHA512 0781011cb70cad154a0f1863d75be212afbeeda5d55811bfd66aace13b288d3e1b4ef2b6aa771dabe553d173f54c3f6d754a94afe8b9a031d3ed9cb004f1a85e WHIRLPOOL a05e13983b47a2518d23f59ecae2ad0b9ae30dfc9fd24d31c206b36d6c949ee447700ff824084fe98dc8ee4fa8d70d9a7a9defca03526b750cfcb5642de40669
+MISC ChangeLog 52575 SHA256 0d63f50b024435694106ea9e5bab796bc703e9aca816a035427266ab3231928d SHA512 2158bb5438d37372674a7b109dcd9867f1c70f76cd9c59a54efd84492504ae3588780ae2831c9751e965c7a40bd0e80f269b4f5d4569d31be92b0206f05fbddf WHIRLPOOL 1367e2a544317448b6be36fa4ac5fa00dddcbd9e5a2a2367012ed59a678d82bae2be8f639ccaaeb3d1112b8ef68047c207aa668babb7b070cdbc1fe0b5de46e5
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/8YUAAoJEEdUh39IaPFNQeMH/2nQwqk1JcokA1mZUdP3OaZI
-Z2y/A7xWGg/6O7E+msNzdkxkqWcVZMAWQOn2mvex1F4QLVO/wPjB4fMxNaGwBiVB
-PM55UikB9E3xPUSiT/yg2hdvCPNGs2tXKMNlPyWJL0LRMvAEwQfyTGrkInYdu7l7
-vrCqwySiYb8y2/APRRgFQj8FdLGM16Yhdg+aInOkkCL72HdCtzgTxvVUSYaf7S1e
-vb4UAZixq4xk4No1AKZTbLRkko+NSGMj7vfNhGvKj729dK3iAJ9RSkGwSPOoXsf4
-bcPitIdQrpnz12hGUA0lCo2/RqLV1P6/82E2eW6L0FcNuamubq4qD7GqZrvXgh0=
-=yqBK
+iQEcBAEBCAAGBQJRAEamAAoJEEdUh39IaPFNvJ8H/RWKzdrjfwahuna1FpMAhiKV
+k4eE+QDz3Rf60+xth5zC/ZLxDhTU26Xycwl/Hp6y7df++dRTvKvdgWu/iCkkz02m
++BjyGOQTLc4W4qVdGNq9AJioVQdTrobR0k1ONB/SxSDOwyEJx/mkUOydiLjXKWPR
+oss+7s3fLLC8MKsyn2azy8e+ZEW7A1CzVHCiKcxJw7t1ooanF/tK/aXHSrKv/9LT
+8zU5gYwbOig2MD4gBbnm5Kh2AhlTEa5FcJx7TSqkgHT2L7rAflqJc+52BGelGqGJ
+EmTdJzVjMODdmsPY39CIo3hS/U7wU891/7dCgdspYu2Vd6kPySszRm2LD2umnBk=
+=75bH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-197-r3.ebuild b/sys-fs/udev/udev-197-r3.ebuild
index 30cc120b7389..8f0bc10c413c 100644
--- a/sys-fs/udev/udev-197-r3.ebuild
+++ b/sys-fs/udev/udev-197-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/sys-fs/udev/udev-197-r3.ebuild,v 1.26 2013/01/23 11:14:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.27 2013/01/23 20:23:12 ssuominen Exp $
 
 EAPI=4
 
@@ -140,17 +140,6 @@ src_prepare()
 		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
 	fi
 
-	# This check is for maintainers only
-	if [[ ${PV} = 9999* ]]; then
-		# Support uClibc wrt bug #443030 with a safe kludge so we know when
-		# to check for other uses than logs. See the echo for secure_getenv
-		# at the end of src_prepare().
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
-			eerror "The line count of secure_getenv failed, see bug #443030"
-			die
-		fi
-	fi
-
 	# apply user patches
 	epatch_user
 
@@ -357,6 +346,10 @@ src_install()
 	dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
 	find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
 		sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
+
+	docinto gentoo
+	dodoc "${FILESDIR}"/80-net-name-slot.rules
+	docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules
 }
 
 pkg_preinst()
@@ -376,7 +369,7 @@ pkg_preinst()
 	preserve_old_lib /$(get_libdir)/libudev.so.0
 
 	net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	[[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}"
+	[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
 }
 
 # This function determines if a directory is a mount point.
diff --git a/sys-fs/udev/udev-197-r4.ebuild b/sys-fs/udev/udev-197-r4.ebuild
index 298372fc5a25..239d3dcd8e49 100644
--- a/sys-fs/udev/udev-197-r4.ebuild
+++ b/sys-fs/udev/udev-197-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/sys-fs/udev/udev-197-r4.ebuild,v 1.15 2013/01/23 11:14:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.16 2013/01/23 20:23:12 ssuominen Exp $
 
 EAPI=4
 
@@ -362,6 +362,10 @@ src_install()
 	dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
 	find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
 		sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
+
+	docinto gentoo
+	dodoc "${FILESDIR}"/80-net-name-slot.rules
+	docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules
 }
 
 pkg_preinst()
@@ -382,7 +386,7 @@ pkg_preinst()
 
 	if has_version '<sys-fs/udev-197'; then
 		net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-		[[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}"
+		[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
 	fi
 }
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 664082c3475c..9c5850cafd80 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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/sys-fs/udev/udev-9999.ebuild,v 1.157 2013/01/23 11:14:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.158 2013/01/23 20:23:12 ssuominen Exp $
 
 EAPI=4
 
@@ -362,6 +362,10 @@ src_install()
 	dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
 	find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
 		sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
+
+	docinto gentoo
+	dodoc "${FILESDIR}"/80-net-name-slot.rules
+	docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules
 }
 
 pkg_preinst()
@@ -382,7 +386,7 @@ pkg_preinst()
 
 	if has_version '<sys-fs/udev-197'; then
 		net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-		[[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}"
+		[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
 	fi
 }