Skip python-single-r1_pkg_setup when python is disabled, bug 466408.

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

4 files changed, 21 insertions, 9 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index f55e3fd5f5f0..6fbdfc8670dd 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.129 2013/04/18 20:02:28 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.130 2013/04/19 00:25:16 floppym Exp $
+
+  19 Apr 2013; Mike Gilbert <floppym@gentoo.org> systemd-201.ebuild,
+  systemd-9999.ebuild:
+  Skip python-single-r1_pkg_setup when python is disabled, bug 466408.
 
   18 Apr 2013; William Hubbs <williamh@gentoo.org> systemd-201.ebuild,
   systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ee23a9607614..2383d3e5525a 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -17,14 +17,14 @@ DIST systemd-200.tar.xz 2109864 SHA256 9a08baa8fa5c48f0aab683b2f771e4be75c3c852a
 DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe899c03ed5ebec7e70c8cc10 SHA512 e181b0bd0d0169890f99733d5e61ca506115b50d702b24895add5240ef3929ed9add87b0d3fd34a3366c1830339f6e4b5aa50f763f6d7d75b80ce677d35c385d WHIRLPOOL 84465cc8b3a97c2fbf120c8515ced6a759c1dec2df525b92a552308e1060475bf889de92a05ad470a2d56b582e3190dcc37aa4d009c8a0714411894cfed99376
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-200-r1.ebuild 7304 SHA256 321931cf7a04ba7a681b6457d136e016a04ed6c40fe9fb1aadfddc359ec9eae8 SHA512 ed6a3ff8c3b37b3e50dce30e19d78f3c6cfa0fc8a730ddbe0665806c389460de30e60c5abfdc33cf50c61922d240cbc08f2ee7d06ca5e919ecf272ca3da484a4 WHIRLPOOL e497c7f8447475ee6f915779bfaac196470398e4292326c560f393f53600054bbe283ba96a2f2fbcf959358d405acec7de61aa5e248857b723f7280de34e45a4
-EBUILD systemd-201.ebuild 8137 SHA256 74f6f002f0b5f64e446dede9a77f1cade0816b0cab733ccc9b51e42d25e37f69 SHA512 40cc029d8592176b94e20a6516423c5e555698d1c68c7903526547cf1830c5ef757a99a11e7d8cda982e40c8d291559d29fcda5220b22b3cdcb9a19ad99364d8 WHIRLPOOL a0ce23bfa1d2dfe97c6bc1b2e4bf8c179c5e1c70978399c254068b78eb6f89bd3a96a37fce18451e6e2313de8b7a10bcb8968785f44c1303ba89fee8fed64bc9
-EBUILD systemd-9999.ebuild 8518 SHA256 f17838b558d2464ee939de7c2ad022bfb5c78a768b5475da32e656fcdad1afa5 SHA512 7f8e8eefaf9c3e857468b827cdbb2b363f5da8db523c4bb06997105767c034e6cec9eaa970e73afb03d9e47f09ef7ef84b35213da2d0767765c7f37ba98f8552 WHIRLPOOL 55195e2b73b76374f35d2d8ab95e21c304e91d044e9348805b9ad30ff5af506ec6f96d24c5285ca3cf2e6231ed3523efd4adaaecca44f44f7473586f63c82b41
-MISC ChangeLog 24558 SHA256 a7fae6227e27629a63904762e2c01efa6f4ffdcb4bbff914827bc460a31c41da SHA512 4441b712fe76e7bec7569a8af171c524ce8ab308a2f95955bc52ad914dfd7c04a59af348193186dfca1b1efcc3287e113c53d9a841748c77a7daa2078ec5011f WHIRLPOOL b6782bb544f86a18efe493d517288691fc01e28a3683a31168eaeb5f43364f0bad6fc98251cd0ac71b211305fb348392e755272af74708d1bbb05452406e7aa1
+EBUILD systemd-201.ebuild 8195 SHA256 9e0fdd66daa67d912276c63c7460aed2caa28904f9ea8fec353b78670ad4666c SHA512 cc143c730950b356b57f002a323ca5cdd4f564dca01f99ade912bc2371f57180c1f047dec1a35993e2721ca011c2ce0618ea6531f3881b413e1f5c3f7ecc3882 WHIRLPOOL 5a3a8d076e2e189d52824b2eb77149e0774f4c0c709e9877a220e574df0a23b0dc381565ea901d4aa61ee60afacc5a594190ea8f341857fda441c6c016db723e
+EBUILD systemd-9999.ebuild 8576 SHA256 b852433da71d6f3d5d532bcbc3c40b44f43127009658da9856e10b09818926b5 SHA512 acc75b1bb21ff4881ca2d8843d82c8d5c512b3038c9b6902fddfac58e33f5c9b637f3f2f499cd10a33b61d01c84b5eb5f7b1c891d8a02194691e542dd9c6d92c WHIRLPOOL c6d1e5a03358143c3709b6ec0219f4b4c4641b731cf5849f47d60da7cec5920cc715fdc213254fda02ee0c736bb13a49f0a92c1b53499dcfe323cde2aff33eb2
+MISC ChangeLog 24721 SHA256 ba99156904626eef079f55ddb6b2e391ec5e165f4eb46df4b0fe20c375971659 SHA512 78b59b7c9dd6ef5af95b948d39cb3d88bf4db55b3c6d7639d18a658519685fc0059405420fc8f652a5295f10333547dcb72ca3d49b890c427cff7d0721505829 WHIRLPOOL 9811d25a64a6f95ae010e409436ae404f772b150b39f66d928a7cdb83223f5718bb9d20e31506dfee5dd2cbc8ef699ea474710b4190fc8d1480ff94c6aed153e
 MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFwUlgACgkQblQW9DDEZTixcACeKRMFOssd+ntAkC3lqCNeuw2j
-bgYAoJ81uKCWXDOhUfqBaJNmFHhqfxb2
-=TxrC
+iF4EAREIAAYFAlFwjvUACgkQC77qH+pIQ6R8zwEAlTcUDKorgqlc1lhMTcpA6RQL
+gHVUH/DLxxZJ7M5+p40BAJTh6pq1BlGB9RCW5HK5Jrs+Ob7rBKrEx9PvIQEQD6/E
+=cB7z
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-201.ebuild b/sys-apps/systemd/systemd-201.ebuild
index 09e497f72af7..548da6422537 100644
--- a/sys-apps/systemd/systemd-201.ebuild
+++ b/sys-apps/systemd/systemd-201.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/systemd/systemd-201.ebuild,v 1.15 2013/04/18 20:02:28 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.16 2013/04/19 00:25:16 floppym Exp $
 
 EAPI=5
 
@@ -96,6 +96,10 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	local myeconfargs=(
 		--localstatedir=/var
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7794f5092713..2dc1bc1958cf 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-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-apps/systemd/systemd-9999.ebuild,v 1.56 2013/04/18 20:02:28 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.57 2013/04/19 00:25:16 floppym Exp $
 
 EAPI=5
 
@@ -120,6 +120,10 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	local myeconfargs=(
 		--localstatedir=/var