Use distutils_get_intermediate_installation_image().

Package-Manager: portage-2.2.0_alpha29_p17/cvs/Linux x86_64

3 files changed, 19 insertions, 20 deletions

diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 5c7d107b1135..579c52807646 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -19,9 +19,9 @@ EBUILD zope-2.10.7-r1.ebuild 2419 RMD160 a8eacc97fc3ec0d837e130c19b6160c51087054
 EBUILD zope-2.10.7.ebuild 2378 RMD160 b5aec5e9ff6fc8081dff21d3ab5049929922712d SHA1 8a7d41e475abb6efd60b1212e8520f862d804f8b SHA256 641c43f253d26a75a926283f5a5c8dadc65797cf605984b5d1b185c1161e8845
 EBUILD zope-2.10.9.ebuild 2337 RMD160 7c7c5d215a96ecad33a10810e0d9c8e1d9dd9400 SHA1 b371ad3c5bfac6492b9c2c8483e3a00d60da3d3d SHA256 1dcd78b0751013e7b50fa9364ff2cf362a11046a7b824681c10395444cfc4889
 EBUILD zope-2.12.16.ebuild 4958 RMD160 53648fc6b7979d81f86ced4c14d4ce215963bc3f SHA1 79634547e285cb17e24603ecb8f6c049bd39ba26 SHA256 9a9a6e5da8dcf1064ac5717453134b2704f97f68c6759e71836e5410a522b3d5
-EBUILD zope-2.12.17.ebuild 4958 RMD160 d149ab3e2287156f4f5bc53e25acec936f94c13b SHA1 6f15228cb8ff40f529dea54842e67b091ede91b4 SHA256 3c20048870169be7c62675247cc9212aa5c77fffa2fe97dd449f42004df1f07d
+EBUILD zope-2.12.17.ebuild 4981 RMD160 41ce80f46d0099ecaedb64279ad6fd2638cdcc02 SHA1 9ebe01ce5cc6cea4d814621bac097442c06d2450 SHA256 85998c31d9866914511f959d18f90c6af28b3e0e70d79e18386f5611bf7ead25
 EBUILD zope-2.13.5.ebuild 5100 RMD160 ef1ebac004928b09c330b0ecf96f8221ef54e9c1 SHA1 c165d04e9d5e42860fe5b13bc7517ec77c2d9fd4 SHA256 8408b703c3628cef90de18938e1ba0f63d7e649a98e9f1a5a3c9956baf186949
-EBUILD zope-2.13.6.ebuild 5210 RMD160 6663733d03e2c3ee68862914f7a887a73c7d5f9e SHA1 e2cd42f33360dc1366f5b241ca01f18fd8750393 SHA256 31150dc2c01dac1d2e2982a47b625d87bc4766fc093bb83ec52647dfd3afaaa3
+EBUILD zope-2.13.6.ebuild 5123 RMD160 85ad3dfd2b58a0c824c1c7e378a931d8c4dc749c SHA1 a175800b97308f419f19f6187c8599f3f34c9094 SHA256 b0451d8924135828076de8568d5b43b74436bcd665678490c92329caacbc73c6
 EBUILD zope-2.9.10-r1.ebuild 2439 RMD160 4d893fe82971f3d3a6b5bf47873c272ec732329b SHA1 930744cecdff3eed82705332bb505b9d5abbf486 SHA256 057741f43d33bd395e4bf69a1706931c5dcae18cd4f5e7e94d849a85dcde6345
 EBUILD zope-2.9.10.ebuild 2397 RMD160 e33501ae1658b572c23e9383492215c2af0cc5b1 SHA1 fabcdb45cce3c0ae12e3f77e12a2122f409f13ec SHA256 c2ccd01a1e47987ef0a82c2803decdb85bc189e955b2c6c6c62186c897164a04
 EBUILD zope-2.9.12.ebuild 2356 RMD160 77459a869dd0925c53572055e901fa1e710128f1 SHA1 2abb52de300d7d67c1f5f13600310cbc37264dfd SHA256 55a08e94da72603b68859f3dd91595fb8d2fc481378e5e0c868265dc396f164d
@@ -32,17 +32,17 @@ MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 97551
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNmM7xAAoJENgZr6v6gHY0vAIP+wcevXsbJH1mLHN7BPTB1wsA
-lB63bgnoCTYMUHVgxM4cRD0FhgI4RUA5N6wD1L6cnX3bGz8/5OMGEjp6ThnVNg4/
-JioyW5cdaq41STRwPh/H3a9PBI2MJ8bn+tK0nO203T3S1Vul8ceJgGkLltd3pq0A
-aSAdXW9nS/q8ljtBbKvVU9DIMlupSjLDuLTwlE9N4rlE5LMCjrDagRcI7NWU1zut
-NA/jgEkShdHJQ2GJB6x9cLKjqoh9JT1ytq1Nrb2MC0qaWd5Nt1E444ximppV/W6d
-q8p7Cfy9t8iA2GyCQvqJrV4DgPSk310HR+V3eg/vNXZjk0aN0EJn6ms6crPabn0E
-uCtxETyNiZkH2fPDQ4vtk+JBTD4N/PE6Fr4JrsUH/V6DqDvNBj11UZD9O+fHy43c
-+Jn88gHJ95fjjYe2m/Jfzt3H+1CetyOgRm50JnU4eWO8DrL+zXF94qp89IxPj8Pn
-CbLSxdkABbezKCY2ee5Hrsa4RXJgG3Cjfz1w+p9dvKHE+mN3NooqXQBfwuLxpd8z
-MdeXQSQ71Bi10WKs+RM4kRIQeHbNjMx+dsPNyHTClZN+zozP0u4O6NxyxFoHZQ7l
-CoGUzzXDbygcAPnKnE4lLJzmJCbLDBa/QPsLiVqMrl+n5lLPTqTEjbvikNSvCYIV
-tovvQtaPgKe19BruD/wW
-=yJCY
+iQIcBAEBAgAGBQJNpNHHAAoJENgZr6v6gHY05+sP/3NXt7KcZWkxR0LMm9AKHCSD
+taStm72bOz4LxlJjPJhF8JoGVy8AYIEBatbmMqWmlhVBmPFgPLRkkcbWejoUQLeT
+o9C+iMHAHOzvFRmpgXFvgUCdviq6LUynia0A49Pm3pyHgchQLdv8sshKEowEu4HA
+Dd8ZbyeRJUYSp0D/yb/xPi1CZGQ07+G3+/oEa3EILDQ1D7tqphNVRi3nLTYjSus/
+7S2YuOq/wvEPGjcK7iYOh7Zvxz+vyco7KgNHlP6KPE8WFnf1tTppM7LJJqKIoyM/
+FQlS/uDEg8feT5ITatY0jcts8m3d8J9IpLw7LVVIIqMRw75a+8uq6/LbIpkPwZm7
+++D77v0GXukEDoIJW2AAH8FgoVuak03iRCkzIbZ5uyo8+NrdlZtycHrOLwjnoGCT
+Tvt4tZTVZy5aUNr8qIdT22KzSevI+J+unB6IuFW1SgVO+vg2XwqK1sW7LNpAstHi
+8KtWNG2B32o7vYIrffLaMRXJ1sT1WE1K2T3wzaGFaJH4wQmSXbaO9540AaS8+qBZ
+kyFnOHA4YohKhS/8TovvDG3cxQSI4IQn8LXgskeDQM62X2jC7kr11Ug9Tnm2iqEs
+Ko/rLbfauE19r5a/rcFIo0ndZ1FlcpFFzsIEIvRoTWkDUoB9A8DwVP+z+svR130n
+3TsoBlC7hNirAotAFvGs
+=CI6K
 -----END PGP SIGNATURE-----
diff --git a/net-zope/zope/zope-2.12.17.ebuild b/net-zope/zope/zope-2.12.17.ebuild
index e170714c2a26..612b65b63510 100644
--- a/net-zope/zope/zope-2.12.17.ebuild
+++ b/net-zope/zope/zope-2.12.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.12.17.ebuild,v 1.1 2011/04/03 19:24:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.12.17.ebuild,v 1.2 2011/04/12 22:26:57 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -100,7 +100,7 @@ src_compile() {
 }
 
 distutils_src_install_post_hook() {
-	mv "${T}/images/${PYTHON_ABI}/${ZOPE_INSTALLATION_DIR}/lib/python"{,-${PYTHON_ABI}}
+	mv "$(distutils_get_intermediate_installation_image)/${ZOPE_INSTALLATION_DIR}/lib/python"{,-${PYTHON_ABI}}
 }
 
 src_install() {
diff --git a/net-zope/zope/zope-2.13.6.ebuild b/net-zope/zope/zope-2.13.6.ebuild
index a18c88c9e7e2..9c7871230c69 100644
--- a/net-zope/zope/zope-2.13.6.ebuild
+++ b/net-zope/zope/zope-2.13.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.13.6.ebuild,v 1.1 2011/04/03 19:47:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.13.6.ebuild,v 1.2 2011/04/12 22:26:57 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -110,8 +110,7 @@ src_compile() {
 }
 
 distutils_src_install_post_hook() {
-	# mv "$(distutils_get_intermediate_installation_image)/${ZOPE_INSTALLATION_DIR}/lib/python"{,-${PYTHON_ABI}}
-	mv "${T}/images/${PYTHON_ABI}/${ZOPE_INSTALLATION_DIR}/lib/python"{,-${PYTHON_ABI}}
+	mv "$(distutils_get_intermediate_installation_image)/${ZOPE_INSTALLATION_DIR}/lib/python"{,-${PYTHON_ABI}}
 }
 
 src_install() {