4.0.1 stable on x86, ebuild clean up

13 files changed, 13 insertions, 217 deletions

diff --git a/dev-python/cddb-py/Manifest b/dev-python/cddb-py/Manifest
index 26b1c1a747c6..e21ed143a396 100644
--- a/dev-python/cddb-py/Manifest
+++ b/dev-python/cddb-py/Manifest
@@ -1,6 +1,6 @@
-MD5 faa30ea81d8c93f04443fc91fee9a77c cddb-py-1.4.ebuild 473
-MD5 17dab046bb3ae755353daae81d9b93c7 cddb-py-1.3.ebuild 473
 MD5 bb412465a5296c956a824a4dc92741bd ChangeLog 816
+MD5 53ac39e1e6eaa62917e1cea1cd810aa7 cddb-py-1.3.ebuild 472
+MD5 70101e29bd985c4ae49b301fb7b8a2a3 cddb-py-1.4.ebuild 478
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 85079619ee795f3643d41f53e2073817 files/digest-cddb-py-1.3 59
 MD5 eb118fce3c5da84383380ea44c211166 files/digest-cddb-py-1.4 59
diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 52c412d91d30..1088531dc087 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sip
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.41 2004/08/20 22:32:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.42 2004/08/30 15:29:29 carlo Exp $
+
+  30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> -files/license-3.8.diff,
+  -sip-3.8-r1.ebuild, sip-4.0.1.ebuild, -sip-4.0.ebuild, -sip-4.0_rc2.ebuild,
+  -sip-4.0_rc4.ebuild:
+  4.0.1 stable on x86, ebuild clean up
 
   21 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> sip-4.0.1.ebuild:
   Marked stable on amd64.
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index a84bc1d72a64..094905d9abee 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,15 +1,6 @@
-MD5 1365ef6a4781c558c90b8cabe7520c1a ChangeLog 5378
+MD5 5d20a3ba2b8812b91f7643c77e9a400b sip-4.0.1.ebuild 1054
+MD5 dc1b807ef9e422cdc2d41e678a260ab2 ChangeLog 5589
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 fe41146a031ceef37f452f875dc374fc sip-4.0.1.ebuild 1059
-MD5 fd500927a0c38bbf4f5731c288505ca3 sip-4.0.ebuild 1058
-MD5 84654b58fceead3f36976a4dac646d18 sip-3.8-r1.ebuild 1106
-MD5 1defdeb5f7bc481bafccafaa4079c35c sip-4.0_rc4.ebuild 914
-MD5 8d3c359df1792cc095ddf1f47d6726e5 sip-4.0_rc2.ebuild 906
 MD5 354c3ff99047b9012d51e0e42b4b3f34 sip-3.10.2.ebuild 983
-MD5 e052f291e46bb8d1de4cfb1b45aeac88 files/digest-sip-3.10.2 62
-MD5 554618e94f36a7be6f47c51f452740fa files/digest-sip-4.0 59
 MD5 6a011f04f4a2219a674a61dd82763301 files/digest-sip-4.0.1 61
-MD5 821af86e779d5bc5b3457336a0426fa1 files/digest-sip-3.8-r1 67
-MD5 56a92b393eb795251d30b8039d66ab3c files/digest-sip-4.0_rc4 62
-MD5 f372fdd0e5dba477231734fa44c96ee8 files/digest-sip-4.0_rc2 62
-MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
+MD5 e052f291e46bb8d1de4cfb1b45aeac88 files/digest-sip-3.10.2 62
diff --git a/dev-python/sip/files/digest-sip-3.8-r1 b/dev-python/sip/files/digest-sip-3.8-r1
deleted file mode 100644
index 9093f9dd6006..000000000000
--- a/dev-python/sip/files/digest-sip-3.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2144b29adca9ff7b3b03de266da6c2eb sip-x11-gpl-3.8.tar.gz 179221
diff --git a/dev-python/sip/files/digest-sip-4.0 b/dev-python/sip/files/digest-sip-4.0
deleted file mode 100644
index 2525c3896456..000000000000
--- a/dev-python/sip/files/digest-sip-4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa2128671442b61e0b9d8e0a92783c5f sip-4.0.tar.gz 289213
diff --git a/dev-python/sip/files/digest-sip-4.0_rc2 b/dev-python/sip/files/digest-sip-4.0_rc2
deleted file mode 100644
index f47ca6bc8111..000000000000
--- a/dev-python/sip/files/digest-sip-4.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 564fcaf7be8b86b01a9e50f68f2aea6a sip-4.0rc2.tar.gz 227211
diff --git a/dev-python/sip/files/digest-sip-4.0_rc4 b/dev-python/sip/files/digest-sip-4.0_rc4
deleted file mode 100644
index 2c3ca8675602..000000000000
--- a/dev-python/sip/files/digest-sip-4.0_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49f8cb5c9f31852f9e1d7351b369c083 sip-4.0rc4.tar.gz 246592
diff --git a/dev-python/sip/files/license-3.8.diff b/dev-python/sip/files/license-3.8.diff
deleted file mode 100644
index 5fba51163375..000000000000
--- a/dev-python/sip/files/license-3.8.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- build.py.orig	2003-07-30 22:07:12.000000000 +0000
-+++ build.py	2003-07-30 22:07:57.000000000 +0000
-@@ -675,31 +675,6 @@
-         licType = "GPL"
-         licname = "GNU General Public License"
- 
--    inform("This is the %s version of SIP and is licensed under the %s." % (licType,licname),0)
--
--    print
--    print "Type 'L' to view the license."
--    print "Type 'yes' to accept the terms of the license."
--    print "Type 'no' to decline the terms of the license."
--    print
--
--    while 1:
--        try:
--            resp = raw_input("Do you accept the terms of the license? ")
--        except:
--            resp = ""
--
--        resp = string.lower(string.strip(resp))
--
--        if resp == "yes":
--            break
--
--        if resp == "no":
--            sys.exit(0)
--
--        if resp == "l":
--            os.system("more LICENSE")
--
-     proPatches["@BLX_SIP_LICENSE@"] = licType
- 
-     inform("Building the %s version of SIP 3.7 for Python %s on %s." % (licType,pyFullVers,sys.platform))
diff --git a/dev-python/sip/sip-3.8-r1.ebuild b/dev-python/sip/sip-3.8-r1.ebuild
deleted file mode 100644
index 7b6377c01758..000000000000
--- a/dev-python/sip/sip-3.8-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.8-r1.ebuild,v 1.8 2004/07/02 04:31:05 squinky86 Exp $
-
-inherit eutils distutils
-
-MY_P="${PN}-x11-gpl-${PV}"
-DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	x11-libs/qt
-	>=dev-lang/python-2.2.1"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/license-${PV}.diff
-}
-
-src_compile(){
-	distutils_python_version
-
-	chmod +x build.py
-	dodir /usr/bin
-	dodir /usr/lib/python${PYVER}/site-packages
-	python build.py -l qt-mt \
-		-b ${D}/usr/bin \
-		-d ${D}/usr/lib/python${PYVER}/site-packages \
-		-e ${D}/usr/include/python${PYVER}
-
-	emake || die
-}
-
-src_install() {
-	distutils_python_version
-	dodir /usr/include/python${PYVER}
-	emake || die
-	einstall || die
-	dodoc NEWS README THANKS
-}
diff --git a/dev-python/sip/sip-4.0.1.ebuild b/dev-python/sip/sip-4.0.1.ebuild
index 74ba87522233..81e094e60dd8 100644
--- a/dev-python/sip/sip-4.0.1.ebuild
+++ b/dev-python/sip/sip-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.1.ebuild,v 1.2 2004/08/20 22:32:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.1.ebuild,v 1.3 2004/08/30 15:29:29 carlo Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha amd64"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/dev-python/sip/sip-4.0.ebuild b/dev-python/sip/sip-4.0.ebuild
deleted file mode 100644
index 5cbda3964915..000000000000
--- a/dev-python/sip/sip-4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.ebuild,v 1.4 2004/07/02 04:31:05 squinky86 Exp $
-
-inherit distutils
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	x11-libs/qt
-	>=dev-lang/python-2.3"
-
-src_compile(){
-	distutils_python_version
-	python configure.py -l qt-mt \
-		-b /usr/bin \
-		-d /usr/lib/python${PYVER}/site-packages \
-		-e /usr/include/python${PYVER} \
-		"CXXFLAGS+=${CXXFLAGS}"
-	emake || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} || die
-	dodoc ChangeLog LICENSE NEWS README THANKS TODO
-	if use doc ; then dohtml doc/* ; fi
-}
-
-pkg_postinst() {
-	einfo "Please note, that you have to emerge PyQt again, when upgrading from sip-3.x."
-}
diff --git a/dev-python/sip/sip-4.0_rc2.ebuild b/dev-python/sip/sip-4.0_rc2.ebuild
deleted file mode 100644
index 2d90dec97d21..000000000000
--- a/dev-python/sip/sip-4.0_rc2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0_rc2.ebuild,v 1.8 2004/07/02 04:31:05 squinky86 Exp $
-
-inherit distutils
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	x11-libs/qt
-	>=dev-lang/python-2.3"
-
-src_compile(){
-	distutils_python_version
-	python configure.py -l qt-mt \
-		-b /usr/bin \
-		-d /usr/lib/python${PYVER}/site-packages \
-		-e /usr/include/python${PYVER} \
-		"CXXFLAGS+=${CXXFLAGS}"
-	emake || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} || die
-	dodoc ChangeLog LICENS NEWS README THANKS TODO
-}
diff --git a/dev-python/sip/sip-4.0_rc4.ebuild b/dev-python/sip/sip-4.0_rc4.ebuild
deleted file mode 100644
index 494abe9f53c1..000000000000
--- a/dev-python/sip/sip-4.0_rc4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0_rc4.ebuild,v 1.4 2004/07/02 04:31:05 squinky86 Exp $
-
-inherit distutils
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	x11-libs/qt
-	>=dev-lang/python-2.3"
-
-src_compile(){
-	distutils_python_version
-	python configure.py -l qt-mt \
-		-b /usr/bin \
-		-d /usr/lib/python${PYVER}/site-packages \
-		-e /usr/include/python${PYVER} \
-		"CXXFLAGS+=${CXXFLAGS}"
-	emake || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} || die
-	dodoc ChangeLog LICENS NEWS README THANKS TODO
-}