version bump, QA

12 files changed, 66 insertions, 149 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index d16f4c4dca24..1cf00404720e 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/sip
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.32 2004/05/25 13:10:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.33 2004/06/23 16:29:25 carlo Exp $
+
+*sip-4.0 (23 Jun 2004)
+
+  23 Jun 2004; Carsten Lohrke <carlo@gentoo.org> -files/license-3.5.diff,
+  sip-3.10.2.ebuild, -sip-3.5.ebuild, sip-3.8-r1.ebuild, +sip-4.0.ebuild,
+  -sip-4.0_rc2.ebuild, sip-4.0_rc4.ebuild:
+  version bump, QA
 
   25 May 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.1.ebuild,
   sip-3.10.ebuild, sip-3.5.ebuild, sip-3.8-r1.ebuild, sip-3.8.ebuild,
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index cbaa3be10193..fd9c3e7ad7c1 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,14 +1,11 @@
-MD5 edbdecdec8172965a3c03f81800f7bb7 sip-4.0_rc4.ebuild 921
-MD5 21766263ef69b9a11708a0e3116f57c6 sip-3.5.ebuild 1112
-MD5 baac0d2312f413efa26f8ab92988f8a7 sip-3.8-r1.ebuild 1186
-MD5 281cf49306a434fefde4fe9a58fad3d5 ChangeLog 4361
-MD5 c9c916d3c88d9d329557915662274f1d sip-4.0_rc2.ebuild 1163
+MD5 636a656283ec4f116734033d51a17af1 sip-4.0_rc4.ebuild 825
+MD5 4d4a3c636c5ca3aa6f61006e3e4dfc67 sip-4.0.ebuild 972
+MD5 7554ecef77ebd21238c9d79910566c89 sip-3.8-r1.ebuild 1018
+MD5 5bcca37ee6cb7bda7046552188dfd065 ChangeLog 4595
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 e12d0dbae08caf2952cf4562741fe64d sip-3.10.2.ebuild 869
+MD5 818d3059e24c4cd91a514931d8efead6 sip-3.10.2.ebuild 900
 MD5 e052f291e46bb8d1de4cfb1b45aeac88 files/digest-sip-3.10.2 62
 MD5 821af86e779d5bc5b3457336a0426fa1 files/digest-sip-3.8-r1 67
-MD5 ea94cf729c92330a5d8a6d508361fd1c files/license-3.5.diff 1052
 MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
-MD5 02beeecfef8cd92555d0a20b8d331fa6 files/digest-sip-3.5 67
-MD5 f372fdd0e5dba477231734fa44c96ee8 files/digest-sip-4.0_rc2 62
+MD5 554618e94f36a7be6f47c51f452740fa files/digest-sip-4.0 59
 MD5 56a92b393eb795251d30b8039d66ab3c files/digest-sip-4.0_rc4 62
diff --git a/dev-python/sip/files/digest-sip-3.5 b/dev-python/sip/files/digest-sip-3.5
deleted file mode 100644
index e862cb144265..000000000000
--- a/dev-python/sip/files/digest-sip-3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a3a598a25316aa947b79703678b18b5 sip-x11-gpl-3.5.tar.gz 163057
diff --git a/dev-python/sip/files/digest-sip-4.0 b/dev-python/sip/files/digest-sip-4.0
new file mode 100644
index 000000000000..2525c3896456
--- /dev/null
+++ b/dev-python/sip/files/digest-sip-4.0
@@ -0,0 +1 @@
+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/license-3.5.diff b/dev-python/sip/files/license-3.5.diff
deleted file mode 100644
index 96ec57b9bce2..000000000000
--- a/dev-python/sip/files/license-3.5.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- sip-x11-gpl-3.5/build.py	2002-12-13 23:40:01.000000000 +0100
-+++ sip-x11-gpl-3.5/build.py	2002-12-13 23:41:00.000000000 +0100
-@@ -540,31 +540,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 = resp.strip().lower()
--
--        if resp == "yes":
--            break
--
--        if resp == "no":
--            sys.exit(0)
--
--        if resp == "l":
--            os.system("more LICENSE")
--
-     inform("Building the %s version of SIP 3.5 for Python %s on %s." % (licType,pyFullVers,sys.platform))
- 
-     # We can't be sure that we can run programs under Windows (because it might
diff --git a/dev-python/sip/sip-3.10.2.ebuild b/dev-python/sip/sip-3.10.2.ebuild
index 0c3c9989ec2d..343250e811be 100644
--- a/dev-python/sip/sip-3.10.2.ebuild
+++ b/dev-python/sip/sip-3.10.2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.10.2.ebuild,v 1.1 2004/05/22 19:54:14 carlo Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.10.2.ebuild,v 1.2 2004/06/23 16:29:25 carlo Exp $
 
 inherit distutils
 
@@ -13,6 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE=""
 
 DEPEND="virtual/glibc
 	x11-libs/qt
@@ -32,3 +31,7 @@ src_install() {
 	einstall DESTDIR=${D} || die
 	dodoc ChangeLog LICENSE NEWS README THANKS TODO
 }
+
+pkg_postinst() {
+	einfo "Please note, that you have to emerge PyQt again, when upgrading from an earlier sip-3.x version."
+}
diff --git a/dev-python/sip/sip-3.5.ebuild b/dev-python/sip/sip-3.5.ebuild
deleted file mode 100644
index f5913f70c239..000000000000
--- a/dev-python/sip/sip-3.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.5.ebuild,v 1.15 2004/05/25 13:10:08 carlo Exp $
-
-IUSE=""
-
-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."
-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"
-
-DEPEND="virtual/glibc
-	x11-libs/qt
-	>=dev-lang/python-2.2.1"
-
-S=${WORKDIR}/${MY_P}
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/license-3.5.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}
-
-	make || die
-}
-
-src_install() {
-	distutils_python_version
-	dodir /usr/include/python${PYVER}
-	make DESTDIR=${D} install || die
-	dodoc NEWS README THANKS
-}
diff --git a/dev-python/sip/sip-3.8-r1.ebuild b/dev-python/sip/sip-3.8-r1.ebuild
index d0625f77e304..d96f8e6a2d52 100644
--- a/dev-python/sip/sip-3.8-r1.ebuild
+++ b/dev-python/sip/sip-3.8-r1.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.5 2004/05/25 13:10:08 carlo Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.8-r1.ebuild,v 1.6 2004/06/23 16:29:25 carlo 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="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
 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/glibc
 	x11-libs/qt
diff --git a/dev-python/sip/sip-4.0.ebuild b/dev-python/sip/sip-4.0.ebuild
new file mode 100644
index 000000000000..89a4dbd820c4
--- /dev/null
+++ b/dev-python/sip/sip-4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/06/23 16:29:25 carlo 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/glibc
+	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."
+}
\ No newline at end of file
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 78209789f64c..000000000000
--- a/dev-python/sip/sip-4.0_rc2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# 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.4 2004/05/25 13:10:08 carlo Exp $
-
-IUSE=""
-
-inherit eutils 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"
-
-DEPEND="virtual/glibc
-	x11-libs/qt
-	>=dev-lang/python-2.3"
-
-src_compile(){
-	distutils_python_version
-	dodir /usr/bin
-	dodir /usr/lib/python${PYVER}/site-packages
-	python configure.py -l qt-mt \
-		-b ${D}usr/bin \
-		-d ${D}usr/lib/python${PYVER}/site-packages \
-		-e ${D}usr/include/python${PYVER} \
-		"CXXFLAGS+=${CXXFLAGS}"
-	make || die
-}
-
-src_install() {
-	distutils_python_version
-	dodir /usr/include/python${PYVER}
-	make install || die
-	echo "/${D//\//\\/}/s//\//" > fixpaths.sed
-	sed -i -f fixpaths.sed ${D}usr/lib/python${PYVER}/site-packages/sipconfig.py
-	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
index 748b8c3b1ad1..e740f0b38681 100644
--- a/dev-python/sip/sip-4.0_rc4.ebuild
+++ b/dev-python/sip/sip-4.0_rc4.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.1 2004/05/22 19:54:14 carlo Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0_rc4.ebuild,v 1.2 2004/06/23 16:29:25 carlo Exp $
 
 inherit distutils
 
@@ -16,6 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE=""
 
 DEPEND="virtual/glibc
 	x11-libs/qt