6 files changed, 18 insertions, 42 deletions
diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 8ee447637df6..0f5e46e23461 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/scons
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.10 2003/10/28 15:34:49 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.11 2003/12/16 20:35:36 lanius Exp $
+
+*scons-0.94-r1 (16 Dec 2003)
+
+  16 Dec 2003; Heinrich Wendel <lanius@gentoo.org> scons-0.93.ebuild,
+  scons-0.94-r1.ebuild, scons-0.94.ebuild:
+  - removed old ebuilds
+  - now uses distutils eclass
+  - marked 0.94 stable on x86, ppc
 
 *scons-0.93 (28 Oct 2003)
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index b72b785819fa..62377baf8a10 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,9 +1,5 @@
-MD5 3ef79d53183b217c9141c1112c6803f6 scons-0.94-r1.ebuild 633
+MD5 f365d67b3c927faee5077d2233668815 scons-0.94-r1.ebuild 633
 MD5 77c34dfc8bf18ab1339c8f0b3fde9a49 scons-0.0.9.ebuild 622
-MD5 16ca37f70400011f2c4bb826a8c06452 scons-0.94.ebuild 664
-MD5 091e2a091501634093f3caf34eeda9b5 ChangeLog 1639
-MD5 43856e620a1a79c2f5226ba4f31048ce scons-0.93.ebuild 622
+MD5 d4ac42457d7344226659cd1afdfcd92a ChangeLog 1871
 MD5 4dc4ffb0858a0519ac3df0210d3a9324 files/digest-scons-0.94-r1 62
-MD5 a8ef1b989f62b15f4c4a4ac4b73b810f files/digest-scons-0.93 62
-MD5 4dc4ffb0858a0519ac3df0210d3a9324 files/digest-scons-0.94 62
 MD5 1e281c5c3a071165dab94961bab8d741 files/digest-scons-0.0.9 62
diff --git a/dev-util/scons/files/digest-scons-0.93 b/dev-util/scons/files/digest-scons-0.93
deleted file mode 100644
index ce805aafa1e6..000000000000
--- a/dev-util/scons/files/digest-scons-0.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ae1dbd0e9f2433881a3ef0936bed73e scons-0.93.tar.gz 231123
diff --git a/dev-util/scons/files/digest-scons-0.94 b/dev-util/scons/files/digest-scons-0.94-r1
index 497ab0b4f323..497ab0b4f323 100644
--- a/dev-util/scons/files/digest-scons-0.94
+++ b/dev-util/scons/files/digest-scons-0.94-r1
diff --git a/dev-util/scons/scons-0.93.ebuild b/dev-util/scons/scons-0.94-r1.ebuild
index 74b1d3400d2f..5710e5751394 100644
--- a/dev-util/scons/scons-0.93.ebuild
+++ b/dev-util/scons/scons-0.94-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.93.ebuild,v 1.1 2003/10/28 15:34:49 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.94-r1.ebuild,v 1.1 2003/12/16 20:35:36 lanius Exp $
+
+inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Extensible python-based build utility"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
@@ -10,16 +11,13 @@ HOMEPAGE="http://www.scons.org"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
 
 DEPEND=">=dev-lang/python-2.0"
 
-src_compile() {
-	python setup.py build
-}
+DOCS="RELEASE.txt CHANGES.txt LICENSE.txt"
 
 src_install () {
-	python setup.py install --root=${D}
-	dodoc *.txt PKG-INFO MANIFEST
-	doman scons.1
+	distutils_src_install
+	doman scons.1 sconsign.1
 }
diff --git a/dev-util/scons/scons-0.94.ebuild b/dev-util/scons/scons-0.94.ebuild
deleted file mode 100644
index 6be2f9d7df5f..000000000000
--- a/dev-util/scons/scons-0.94.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.94.ebuild,v 1.1 2003/11/17 01:37:16 seemant Exp $
-
-S=${WORKDIR}/${P}
-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="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
-
-DEPEND=">=dev-lang/python-2.0"
-
-src_compile() {
-	python setup.py build
-}
-
-src_install () {
-	python setup.py install --root=${D}
-	dodoc *.txt PKG-INFO MANIFEST
-	doman scons.1
-}