Clean up manpages in the same code path as they are installed, bug #485494.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 28 insertions, 22 deletions

diff --git a/sys-apps/attr/ChangeLog b/sys-apps/attr/ChangeLog
index db802b10a7cb..723c976e152c 100644
--- a/sys-apps/attr/ChangeLog
+++ b/sys-apps/attr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/attr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.159 2013/10/14 18:20:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.160 2013/11/24 08:38:45 mgorny Exp $
+
+  24 Nov 2013; Michał Górny <mgorny@gentoo.org> attr-2.4.47-r1.ebuild:
+  Clean up manpages in the same code path as they are installed, bug #485494.
 
   14 Oct 2013; Michał Górny <mgorny@gentoo.org> attr-2.4.47-r1.ebuild:
   Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 862f74bf4f8d..d7b1fdbb7587 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -18,26 +18,26 @@ EBUILD attr-2.4.44.ebuild 1329 SHA256 423bc4dc52adee242958beccf05f10ee3fcb9a1033
 EBUILD attr-2.4.46-r1.ebuild 1519 SHA256 eca5075125abe03d83505fabdab6d6315c97d89f2ad4e2287adc7d3f40aa5d8e SHA512 5edc2bcf730cf0ef7fae97407bb80fa7d0a055e9d88d2e9a7f6e54f322fad407358cab2022f4acfc8c260ca936c9eaf9e63adb7b0918233b5927b0715cd360c0 WHIRLPOOL 0fa331f966f87fc5d1ffa01db0aca47753e7eead83b12780eaa78f475513a96d5463afad7ed51471a6f475ed16fce19f738f8def9d4877042c2b57184be7b3b2
 EBUILD attr-2.4.46-r2.ebuild 1585 SHA256 8ebffb291ba5b0168a281088ac3757b542c2eb4decdfeeb4755f28a290bdb817 SHA512 c0fb74cf0e01d96773942be315c7bb6f9bf842d4b355001da33e258174f95fcc36ab9c5e9f7946e9d50edc85731ff7601565923cd77035defadbe43a968d9582 WHIRLPOOL c475d3e15d4e7319bdd52faae9c2bff7196f22a33b5701b79e9f7912390d68fcd09da6c5f6f9bec379c3e56f92f7c1c9bb2edc21501cb41f8172275aee3fcfdf
 EBUILD attr-2.4.46.ebuild 1457 SHA256 740487a8d66bf16b3c22130213ea52c288883e5ac224b8effde22ba36d0e4149 SHA512 a723ca0e85bf78ad54583923b6c1f4006bf7705630a17ceae369adebbf8f0ca008f904ababb06934cb6755aac84ddcfbf765c4cf5063cea231154c77fa4d427d WHIRLPOOL e69ee10c68659dfdd1d182ace7ca14f3b12346fdc1e5d89bf9c88be429037cac2cf16024abba1075e5bb09630605707254a8556eaef616f871eb370180b5eb39
-EBUILD attr-2.4.47-r1.ebuild 1835 SHA256 afc984dfa5252eb9a2549f8363ce5deac0ea976b882665dbcb6c3c3a57454bc1 SHA512 3b22648589d687d0307c88a12c031708d5c34baf518ac71f896a331466e39309308d0875b2e4ae953681c9834a22215da95593658dc585c7306f9efd82bd4179 WHIRLPOOL 73729683f2c2596e73452851fa774af6c72ae4d12e14d9e36dd7d79f743d71789ac9272c326d4fcbc26f6dbfc5394f93ae739f3bd07138826aeac0f0219ce11b
+EBUILD attr-2.4.47-r1.ebuild 1900 SHA256 8a72448c36f7f6418250636774e7a236c1659c53d1ead95c4681f0eec23db916 SHA512 75ec661e8d66a06a804887da56315c09c5ccdfcbcf0def87c76134ae5395621fd045a2322c7e16ea6b87dd0dc96b8a7a8abb4d078b39d4c829e210eb2f614993 WHIRLPOOL cb293fae177c0b542fb8ba4b6b60344de8e397c9d2409130016535dd4c33ef0fc3436740227a325969d288fec5e8b965d62648011b9116a42dd2ccee28daeb1b
 EBUILD attr-2.4.47.ebuild 1388 SHA256 1588576ef4c53a3cec7d67253f25b5a359e7dfa6e738f9a42112c1d3c3642d81 SHA512 d7d224475451552a501a1ca1c4fcbd326f4e4031fd732f1bd03db12beb1320d512a9c29c32fed85baccbc4fd84a00d86248b3bab44bf9731d881a795e49061a2 WHIRLPOOL a585ad508bb9b0a3eaf4ce12a6667ac7e26a4ad4dcc4a64e18f539419c5e59afd0aefff6d9bc0bb38d585fda1c3c33c8a05321deab755c9487e5bfb8ad978228
-MISC ChangeLog 20028 SHA256 c8f1fc7d71c42b89226620ba5d45bd23602b47a63d97afd3490c874d6a2f1307 SHA512 10327a835701c4491f6fcfe2ebdc0b747d5f4b29097b0739d9da311d150469403c88ec953228cace117a0f598a7ec79105c91ce032c657c9caf563bcb0d50bfc WHIRLPOOL df6d7b2ac72835edbbe262ffa395e2542858fd59b86e03097ef82784a4279ffae7a104d8ac424e21c78202124287130137b30ea9e1ad9228b05640b0f0c8cb4e
+MISC ChangeLog 20180 SHA256 0a1672c19e890d9e1019fad57cedf1900e4acfcf9a0bd4ce8bb07e52c64b7a08 SHA512 581f5eecac56d7f5ec37e6765f185ef48fea2a8bc11223797e10d8cf2689f786fb084551da914dd55db1bee703fe136146e82b101a7c8629c880850b64243c6b WHIRLPOOL 5e6a637a23886b6166aaa823701ba2471b3adf20df6ad8e4c74c4bfb5b4f850b6ecea27f16def403e802b86357fb425f54f9f4e2c4d18df62bf06fd919797f40
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSXDXgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSkbsZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKcgP/2S2q9JOajGuhGoHJfpBVpSH
-p7LhA+kj+x92HsW657VttROXedZ0iUeMhBYK7EHFRZygh0eZDe8rSNrJhy/FcoGm
-aXxtnhRMBx6M+AmiZgrTx9oImUHk91oDt+XLkP1gviAP4wR8e4IDSkvi6HjnNY3E
-lJ943x0LcxpKI1ieiehegXHt6bka7T79Ntduo+3nzJ1Eit/IYIyXd8kD71QLrwLX
-4hPXLjQs9VSlOFLKzwq+VpX3e/i/w4S0qhYMDbhCnREQ7dNYFrK/HChFbv/TFRWM
-XF0mlZUlWLpanJjMx058AztWkuchj/lceXT/dV8JdMwjspfU5kDr4vkHC279X6mm
-X/+ljB0Lkvbkppz3LOCJsfuephlLcGLsA8xPCD9zpVVh2XoT3qFqf6nB1lA5CuQ5
-PCG+IDr/gWegB79OIf1w9pk0rU0WKMrNjPkZ+98jVCJFsLoE/WBdQm9z2oq/8OuY
-b+zy65uJpER8aNEzPXk66iYFg1gnvPuSvhsFtBiL+4gDZYEEKoIyffUBnKICbd3t
-+M1CpUkVbkGstJZ8EK9zG0jWkSMtPiSUPFYWpV93N2hDESiy0nu9mfo0jTnMmQRn
-XrqUZHpCnKjxu3y4k8rD/3QI9bBvK9HlVs2jUeXdq/vmfk6JAuLOuKq8If1tZSRw
-sb7j8cnOf1YVTA27whS0
-=G230
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIXEP/A4ise3ni3kWWmbSAUJ11zmf
+OzCCjYyqEjgc9b66fQZcHLjjYnkwdeYTEKGE2rAPi9Jxz55ZQCvxh1aGm8JeLU1Z
+93sfOPjtnufvRYz9UojOXjb3onbIiSxyf10ityNGFupVDMUtveMtO4+l0gd9W/6n
+tmgEL10zWvBDCv9IplhS0y0PBxYuGHIEyCYYfIF6AKMw2gdIgE5F1vPziz187I3p
+3ACqanh7QHrbkJomK0zSW3YHCl4AzTlaIhHyeq4OnTqbUwNAJ4Z+iZBcAhoKslcK
+GX7LWBOOP8xfDSP36ubTW+wlOILHsgUa5urbF4S0OFgk8JRPVC5N1SB5RIvj3fTj
+Ut6xy2ZXtQGUW4BBAlB+o5tc/bg38p8V7gGvDxl0T0NelzFLAdD3b5W7hYPpM9Ra
+vsaSdWJEzsjvQDhCXq5KzAmh0d5h27wf+rs6suzQizVy+cf1GHZBV4Ge0qQCjsGW
+tf42/QbUdAPLRfsJzJf8E6sn25IIZnXXo1K34iPJxMvxxDGVgGf2Pe7BLn7XVYNB
+SOpo2NWq6pmLMgPtqhfGU8sbN6vKCM1dqA9zK+GM+JetJx6oDwRVKtgn1Gz4W0XU
+bVATi+1sgsGiYcWgDU6YC7390ed3BOpIK54e8EcabsumlCAeE6AMNmF9FpleDkQk
+2ZwrwfoJswAjgj7uYa0K
+=Y3pH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/attr/attr-2.4.47-r1.ebuild b/sys-apps/attr/attr-2.4.47-r1.ebuild
index 49e77674b0eb..d7d97f956bf4 100644
--- a/sys-apps/attr/attr-2.4.47-r1.ebuild
+++ b/sys-apps/attr/attr-2.4.47-r1.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-apps/attr/attr-2.4.47-r1.ebuild,v 1.3 2013/10/14 18:20:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.47-r1.ebuild,v 1.4 2013/11/24 08:38:45 mgorny Exp $
 
 EAPI="4"
 
@@ -54,13 +54,16 @@ multilib_src_install() {
 		DIST_ROOT="${D}" \
 		install install-lib install-dev
 
-	# we install attr into /bin, so we need the shared lib with it
-	multilib_is_native_abi && gen_usr_ldscript -a attr
+	if multilib_is_native_abi; then
+		# we install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+		# the man-pages packages provides the man2 files
+		# note: man-pages are installed by TOOL_SUBDIRS
+		rm -r "${ED}"/usr/share/man/man2 || die
+	fi
 }
 
 multilib_src_install_all() {
 	use static-libs || prune_libtool_files --all
 	einstalldocs
-	# the man-pages packages provides the man2 files
-	rm -r "${ED}"/usr/share/man/man2 || die
 }