Move distutils-r1_src_install to the end of src_install() since it apparently fails to return to OLDPWD.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 23 insertions, 30 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 2bec3aff5175..f7c25014c4f2 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.281 2014/10/21 09:20:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.282 2014/11/28 21:28:24 jer Exp $
+
+  28 Nov 2014; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.8-r1.ebuild,
+  rrdtool-1.4.8-r3.ebuild, rrdtool-1.4.9.ebuild:
+  Move distutils-r1_src_install to the end of src_install() since it apparently
+  fails to return to OLDPWD.
 
   21 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   rrdtool-1.4.8-r1.ebuild, rrdtool-1.4.8-r3.ebuild, rrdtool-1.4.9.ebuild:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 7c93d76a23f7..f1077a2085f2 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -11,27 +11,15 @@ AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 SHA256 a8d5f4816fbfc760b52dc7
 AUX rrdtool-1.4.9-disable-rrd_graph-python.patch 1895 SHA256 437affd44326fa95b0c6417d063dff7a5af86aed1c0a614db72ffc754b52aa34 SHA512 694bbb456252149d10edb7e5706cc35f9d7ee1e8659f7446e191e2c2a10f1dc597db681b3a1a8d0a8a487c08dccf0dc2c2326bcde786c8ef9c7a222682fb241a WHIRLPOOL 6aa7192c0814019524d6f5e756693850e9c906a5e4c9312127cec4504ef9f63018ef97f688fccdb4003c6f0f7116a492c56fd5966bde3a8db669e60421a66096
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
 DIST rrdtool-1.4.9.tar.gz 1385640 SHA256 3e2826e0d60aaf85313da35b3c0d3a926748fe482b4ada766a325a83b60125cc SHA512 938d6a10c750cbc1e368020fc2408644bc10f6e1d9316f3117df406beef16d7d5fca2fc6fa2bdb6b1ed3e49aa872d58f1f66d1ccee9fe73483c6a5e483c33d4a WHIRLPOOL bc5fb01aef18feb89bb801a2f7fa8c2002b8f8a40e8038355e7edda8a729f354a639c864c01a1ddc7a66d19c8911d75f4f202008bec994d521a209dc6579fe10
-EBUILD rrdtool-1.4.8-r1.ebuild 4201 SHA256 c64b2b1615f6b1f987abf452d0e964b9a78de600ab9f1553108a1c4191d09593 SHA512 bff2eca00500b495f20a7a2905264abddd1430ed53ba2a030ba61f448be902fe83fd626d80e849a198b0058d3b09196e559582df4f10aabb6664cbfdd054a668 WHIRLPOOL 02b4d8177424846cad024cfa5ca8d5db76349ed95b6c8339b38d23594494ab0260474441e1851adf768928c8554a7e2644c5d17b8ff19fc99e2e0195fb805a07
-EBUILD rrdtool-1.4.8-r3.ebuild 4259 SHA256 d85a75906ffe538a536940e4aa5f7d747af72d41ef53d352119ed253c264eaa9 SHA512 99550799e8752284079a84f0c3cd7c85d132cc10e71857ffcc732de200a940abaf7af144772fb98bffbc34343c540278f31b0e3983fd7edd7b763319b73919e6 WHIRLPOOL 824e0c6c2a63d1a34bf1bebd79a1839fcfa351c8a3d8e4a133f847b59a5d01ba5edf0e3fe5230a3c069652ee69899f2ccdaac6737cee4b51192c6edd493a0c5e
-EBUILD rrdtool-1.4.9.ebuild 4452 SHA256 563ed25e84d0338c0dcf99db98425bb1a00ab5b3ab93a06fd37d6a2d07b49c9b SHA512 1010439dccde22c0fc3a5ec374bb23473471c3d65d3998468b17b0afabd437a41d5f97d9bf4bf320259fac1084c9621c510bff7df7762311d68f584b478923ef WHIRLPOOL 14647636a883d5ceb10c6337244ad7d9a1453d7e1671e2a521af3742f2f5bed24d31f63d4cc737f405ea8ebdc76a94f6c95b4dfefac8d1364c451c7136df72bb
-MISC ChangeLog 41704 SHA256 10d749904f9e041f10fb7fa7aa4066d9134fc347a807659e4d1dc99a4266fa0a SHA512 512cd14250e30466f6f3f9194e922b7586c59ab50a5795adee596f0f2a3578056309b54e55c9307195c7260545d75594c8fbcebd2abf13beb7ca6616de29fbdf WHIRLPOOL e2541d0c22a7fe733e39157776b9e3271d633a8562a0cfad74fa9290bb4685384a250feacd39bf471f6b42ec21b37e2792a99c0574ef642376556ef3fbf1aee2
+EBUILD rrdtool-1.4.8-r1.ebuild 4195 SHA256 3872a32410188740eb0271ac439f51069ffffe369de62c24ef30f9b97c348cdb SHA512 f0e82a17ce6e1c2aac846d5acf0aefd061666e802129627593eb0a46df91e9a6df95038a0de9a92ac416613b77f3c71f3f82837bb55aca1e85ecc1221486db7b WHIRLPOOL 85636d1eb1f51e179293da2488646d7c88406ac5cbedd8b002663944fef7a29af51e5836fc2598a50fa26243c9d0862e7e76f622014165b93ba4f26e77dbd99e
+EBUILD rrdtool-1.4.8-r3.ebuild 4253 SHA256 fa7eac496db4e4a710f04c2cdaf1db3ce923e5abbcda33033c8318b6384726e8 SHA512 36d89f1b779b06e3baa41f813354bad27a3ffcf0a1ab71126a00fa12e55f77a57b1c41bef73be43a8d3cebdd96352db086744a6e1ecf17ab37aa413d6f393c3a WHIRLPOOL 506abe54831e2dce1c6bc6a68b4cad0a992335eaccf84433e43995ec1a5960ed3884fa8a0604dc7d1a08ff0ce2a22affc0635ffd8d75755920de2b046cae3189
+EBUILD rrdtool-1.4.9.ebuild 4446 SHA256 f5a032e364a99bf58d4ef0617ff3c860a756ac6e38586d6ee36d33382dce18c8 SHA512 00c0596f04da3705bb7a2953e5a720f6bb720ba822abdeddfe16cea86b3863f91007a63630f913935684499eb1ce8f315758efe96db60b0d0c9eff73c14c0815 WHIRLPOOL c59e15fc8ee8e5859b4ab3010b4bfe1320e3fb1d5f9c468de9b31957fbd6372baf8e1caef903ec2550aec6a0ce221b2dc4281d5fe5ad53c5c386ceaff6e8ba3d
+MISC ChangeLog 41929 SHA256 6c57e2d16262f5cf4d0aa9a677bef0245930190f632a6974fbabe713a19974f5 SHA512 c472f8473183ae7845a964e354db63e703041a067ff0d24d1b0e7e9a2da5520298be757f50ce3ae85a30b4d596c2670744ab7c8f32bc6d29f242c3c1aee59e76 WHIRLPOOL 94263354e9ce9021bdbb81d8327b397b286b08936b568d592ae212548054c7f7ae27a0ca67e82f132e3dbd79b90fe210e993371d5eb2a27d90863da667409f66
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJURiVdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
-NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvFhoP/1kCik9+FhXHji8+hDjucMmX
-ddfkAN3aZqML2MK1SHxYkp/qkXvn31xhmT1BG9eJ2a0om4kzqK2N74O+pk2/1yfW
-yHMr//jyzCvclo60kYca3l8UMIlZMPSaOjJRZXLC5sG8pJARb1uskArdChFFct8w
-4L4yqCp63CN6/jG35/LRaDeHIjG66AyLkNqDZesMdAoCPg2X91UesRSc0bOF3Tcw
-At7aUZxUQ/CK4L0q34w7vMop+Amh4bkgzDOrtC5uRLGx6Wv2xjveSeaFJHwKY3bL
-SR+uT5RntYtO+aMHYvo3LxQoUUPz0WziEv7DWtwczevE45boLYflOJXwsGFeghAL
-g23XgRz6aAKHrkdGe0vudZQlPCSzG2oDp7rMY8mQGOz4LBMcU/8iK2z3fE8I7/m/
-sAMd1R36uE5jcK4I7qHSQlIlz+/REF94TFxtWO4+dkWEqr6d0/Sn1uJOHL6es2hc
-6fu4Ol+RJTQzwxSPjRd5KA+Hy6k0kWRSGXXbFcnPj24zLl6TnSCFLwu5Sr5oXiAN
-IslzQxhNx4xZtUw/hsEv9l01CrUuO0TQOCXiGMlcCoEuQeTg+E6nMe/1LFeg7aUP
-gqae773hqrGXFViDX+1uh0ZU+c6nekqs1BB4X4Grp+vy6LJKj4MPTul4CZZENbfY
-l7fivKhx1Fhc9qDDWGel
-=wFqT
+iEYEAREIAAYFAlR46PsACgkQVWmRsqeSphOgZgCdF1FfGZgK0KUejRhE4HIsxYKq
+RTsAn261CRGqGnMLtdIpq0LqAJB65IHT
+=g50D
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
index cdf936de4084..8ed91697e6d5 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.13 2014/10/21 09:20:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.14 2014/11/28 21:28:24 jer Exp $
 
 EAPI="5"
 
@@ -133,8 +133,6 @@ src_install() {
 		perl_delete_packlist
 	fi
 
-	use python && distutils-r1_src_install
-
 	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
 
 	find "${ED}"usr -name '*.la' -exec rm -f {} +
@@ -144,6 +142,8 @@ src_install() {
 
 	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
 	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
index d03e2a3ef86c..01898fbc58bc 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild,v 1.4 2014/10/21 09:20:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild,v 1.5 2014/11/28 21:28:24 jer Exp $
 
 EAPI="5"
 
@@ -135,8 +135,6 @@ src_install() {
 		perl_delete_packlist
 	fi
 
-	use python && distutils-r1_src_install
-
 	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
 
 	find "${ED}"usr -name '*.la' -exec rm -f {} +
@@ -146,6 +144,8 @@ src_install() {
 
 	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
 	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild
index 30f7a8ceae07..7a37b73fc1ce 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild,v 1.3 2014/10/21 09:20:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild,v 1.4 2014/11/28 21:28:24 jer Exp $
 
 EAPI="5"
 
@@ -138,8 +138,6 @@ src_install() {
 		perl_delete_packlist
 	fi
 
-	use python && distutils-r1_src_install
-
 	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
 
 	find "${ED}"usr -name '*.la' -exec rm -f {} +
@@ -149,6 +147,8 @@ src_install() {
 
 	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
 	newinitd "${FILESDIR}"/rrdcached.init rrdcached
+
+	use python && distutils-r1_src_install
 }
 
 pkg_postinst() {