Move clean-up code to pkg_postinst. Remove old versions. Bug # 153915. Thanks jakub.

(Portage version: 2.1.2_rc1-r4)
 (Unsigned Manifest commit)

5 files changed, 11 insertions, 99 deletions

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index ba4f0646f60b..575ef9a182cb 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -9,18 +9,14 @@ EBUILD scons-0.96.91.ebuild 792 RMD160 dd780bbd812a86097e0f2bb3fd2b746eb9479f45
 MD5 76fd5c9b7b482563cea14f5dd1fb983d scons-0.96.91.ebuild 792
 RMD160 dd780bbd812a86097e0f2bb3fd2b746eb9479f45 scons-0.96.91.ebuild 792
 SHA256 651631eb6e2c4ae36f531fcd63092dd9bd4412d40850b49e3a05e40fd912f5fb scons-0.96.91.ebuild 792
-EBUILD scons-0.96.92-r1.ebuild 1133 RMD160 3922ed7d3a3c0ee181b1da46b8bac94ffbba092d SHA1 88461b2367b36b95faf8e873f1efcd0d3b14be77 SHA256 2e0c9c12dd0362edb638ea77935dd10d239366f84880cf986c54201de47a2263
-MD5 6adcd9d94d6fe89823824018b50068d1 scons-0.96.92-r1.ebuild 1133
-RMD160 3922ed7d3a3c0ee181b1da46b8bac94ffbba092d scons-0.96.92-r1.ebuild 1133
-SHA256 2e0c9c12dd0362edb638ea77935dd10d239366f84880cf986c54201de47a2263 scons-0.96.92-r1.ebuild 1133
-EBUILD scons-0.96.92.ebuild 781 RMD160 1789fb022bd44e40187f5bdc864f22092d297c63 SHA1 d28b4e201d193f8ace7429dc39d0fbe17c0ad7cd SHA256 f43723e4f979c0c8944dd2417b760c7c4bd1e4235da5636455bacd32c1b88378
-MD5 0b274bd706bb94384b8bf9198c530ace scons-0.96.92.ebuild 781
-RMD160 1789fb022bd44e40187f5bdc864f22092d297c63 scons-0.96.92.ebuild 781
-SHA256 f43723e4f979c0c8944dd2417b760c7c4bd1e4235da5636455bacd32c1b88378 scons-0.96.92.ebuild 781
-MISC ChangeLog 4743 RMD160 4cfca762f9fa723eb14e1f07263d209dda817b26 SHA1 8f792ae2fa0019a18f290a6f2be543f538906887 SHA256 c6aa28d2dafe6d27f0bc2a922e8bf51fc3c038564a050ca1043953b31ef41eff
-MD5 e4decfaabe4a53c7e1573df6fc4df65d ChangeLog 4743
-RMD160 4cfca762f9fa723eb14e1f07263d209dda817b26 ChangeLog 4743
-SHA256 c6aa28d2dafe6d27f0bc2a922e8bf51fc3c038564a050ca1043953b31ef41eff ChangeLog 4743
+EBUILD scons-0.96.92-r2.ebuild 1116 RMD160 afddb40dd12e86e995a65b390dee05ba4ede745f SHA1 a692f9cdfcce66be1ea8fa76e385a28475cd53e6 SHA256 cc0e01178fb1acd2a5e6b7736fb81032e035885901382a4d5d7b0b5bc42f5593
+MD5 7eeed63d3326cb209b71cab76601c480 scons-0.96.92-r2.ebuild 1116
+RMD160 afddb40dd12e86e995a65b390dee05ba4ede745f scons-0.96.92-r2.ebuild 1116
+SHA256 cc0e01178fb1acd2a5e6b7736fb81032e035885901382a4d5d7b0b5bc42f5593 scons-0.96.92-r2.ebuild 1116
+MISC ChangeLog 4975 RMD160 2a180d3f2400cc271517f11a438fa42b7ddcf797 SHA1 8a6c17e598231a43496924061243cca5c6b32ee4 SHA256 15d96ead231a52e0d732f492b99cf00270e552819f3d06919c8b8bb9300cd012
+MD5 073ba66ea68251b2a97b59b40d50d650 ChangeLog 4975
+RMD160 2a180d3f2400cc271517f11a438fa42b7ddcf797 ChangeLog 4975
+SHA256 15d96ead231a52e0d732f492b99cf00270e552819f3d06919c8b8bb9300cd012 ChangeLog 4975
 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
@@ -31,9 +27,6 @@ SHA256 cda3dce0471e0d1847cfe8252f72ed6d9d7a5f6f24538de22069a5efbe69d29a files/di
 MD5 0d66344665ce9b6dc4dacf102cefbdcc files/digest-scons-0.96.91 241
 RMD160 cb282cfae07d93a32a691f2c18b5180e7e3340ca files/digest-scons-0.96.91 241
 SHA256 b42887ac04763ce53954a1daae6abbb407dec8d94e5ff97c5ad68e92fe58c0d9 files/digest-scons-0.96.91 241
-MD5 eab8b262b59513ff611465a7a87dace4 files/digest-scons-0.96.92 241
-RMD160 a123cdd25b02ad6d16e722550cbd0f861534047c files/digest-scons-0.96.92 241
-SHA256 18d9dc464ed98c8ca0fe517854601ccb6bad3bfa80f7ca8a3b213829d75fda13 files/digest-scons-0.96.92 241
-MD5 eab8b262b59513ff611465a7a87dace4 files/digest-scons-0.96.92-r1 241
-RMD160 a123cdd25b02ad6d16e722550cbd0f861534047c files/digest-scons-0.96.92-r1 241
-SHA256 18d9dc464ed98c8ca0fe517854601ccb6bad3bfa80f7ca8a3b213829d75fda13 files/digest-scons-0.96.92-r1 241
+MD5 eab8b262b59513ff611465a7a87dace4 files/digest-scons-0.96.92-r2 241
+RMD160 a123cdd25b02ad6d16e722550cbd0f861534047c files/digest-scons-0.96.92-r2 241
+SHA256 18d9dc464ed98c8ca0fe517854601ccb6bad3bfa80f7ca8a3b213829d75fda13 files/digest-scons-0.96.92-r2 241
diff --git a/dev-util/scons/files/digest-scons-0.96.92 b/dev-util/scons/files/digest-scons-0.96.92
deleted file mode 100644
index 11845d4053d1..000000000000
--- a/dev-util/scons/files/digest-scons-0.96.92
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b6b388cdd640b7f297f37a678c65d5c scons-0.96.92.tar.gz 372708
-RMD160 75aa04717da98eccabc42180f6eab9ee4b8bd904 scons-0.96.92.tar.gz 372708
-SHA256 c2ab6143174c0d3d2d6f2e5ae6bc77dd3a4843aba5e41d1265f54cdc2c17ebeb scons-0.96.92.tar.gz 372708
diff --git a/dev-util/scons/files/digest-scons-0.96.92-r1 b/dev-util/scons/files/digest-scons-0.96.92-r1
deleted file mode 100644
index 11845d4053d1..000000000000
--- a/dev-util/scons/files/digest-scons-0.96.92-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b6b388cdd640b7f297f37a678c65d5c scons-0.96.92.tar.gz 372708
-RMD160 75aa04717da98eccabc42180f6eab9ee4b8bd904 scons-0.96.92.tar.gz 372708
-SHA256 c2ab6143174c0d3d2d6f2e5ae6bc77dd3a4843aba5e41d1265f54cdc2c17ebeb scons-0.96.92.tar.gz 372708
diff --git a/dev-util/scons/scons-0.96.92-r1.ebuild b/dev-util/scons/scons-0.96.92-r1.ebuild
deleted file mode 100644
index 36b97a5039ed..000000000000
--- a/dev-util/scons/scons-0.96.92-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.96.92-r1.ebuild,v 1.1 2006/11/03 14:03:33 twp Exp $
-
-NEED_PYTHON="1.5.2"
-
-inherit python distutils multilib
-
-DESCRIPTION="Extensible Python-based build utility"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.scons.org"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DOCS="RELEASE.txt CHANGES.txt LICENSE.txt"
-
-src_install () {
-	distutils_src_install
-	doman scons.1 sconsign.1
-}
-
-pkg_postinst() {
-	python_mod_optimize ${ROOT}/usr/$(get_libdir)/${P}
-}
-
-pkg_prerm() {
-	# clean up stale junk left there by old faulty ebuilds
-	# see Bug 118022 and Bug 132448
-	if has_version "<dev-util/scons-0.96.92-r1" ; then
-		einfo "Cleaning up stale orphaned py[co] files..."
-		[[ -d "${ROOT}/usr/$(get_libdir)/scons/SCons" ]] \
-		    && rm -rf "${ROOT}/usr/$(get_libdir)/scons/SCons"
-		einfo "Done."
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${ROOT}/usr/$(get_libdir)/${P}
-}
diff --git a/dev-util/scons/scons-0.96.92.ebuild b/dev-util/scons/scons-0.96.92.ebuild
deleted file mode 100644
index 60c6301732f4..000000000000
--- a/dev-util/scons/scons-0.96.92.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.96.92.ebuild,v 1.1 2006/10/23 21:44:59 twp Exp $
-
-NEED_PYTHON="1.5.2"
-
-inherit python distutils
-
-DESCRIPTION="Extensible Python-based build utility"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.scons.org"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DOCS="RELEASE.txt CHANGES.txt LICENSE.txt"
-
-src_install () {
-	distutils_src_install
-	doman scons.1 sconsign.1
-}
-
-pkg_postinst() {
-	python_mod_optimize ${ROOT}/usr/$(get_libdir)/${P}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${ROOT}/usr/$(get_libdir)/${P}
-}