see bug 35368 - some compile/install fixes, removed older versions

13 files changed, 18 insertions, 272 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 5a2464130ccb..a0caae9ae97c 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sip
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.17 2003/12/08 21:22:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.18 2003/12/17 14:13:05 caleb Exp $
+
+  17 Dec 2003; Caleb Tennis <caleb@gentoo.org> sip-3.5.ebuild, sip-3.6.ebuild,
+  sip-3.7.ebuild, sip-3.9.ebuild, sip-4.0_rc1.ebuild, files/license-3.5.diff,
+  files/license-3.6.diff, files/license-3.7.diff:
+  Some fixes for 3.9 and 4.0_rc1 as noted in bug #35368
+  Removed older sips (not available anymore via download anyway)
 
 *sip-4.0_rc1 (08 Dec 2003)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 77f8258e897f..a2e6ae58108e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,18 +1,9 @@
-MD5 af9e483687e94ac0d2e986928be744c7 sip-3.6.ebuild 1150
-MD5 5007056660b7ffc52a6c7d6c05661143 sip-4.0_rc1.ebuild 1093
+MD5 0417bc97bae45238a7ab12d6ba8fd4e6 sip-4.0_rc1.ebuild 1184
 MD5 ec49578a524ed7e000d2426ec8ce5a53 sip-3.8.ebuild 1146
-MD5 663051ce033391f46f91b0014813ae73 sip-3.5.ebuild 1146
-MD5 1a436228ee6b96d93077e5372165ef18 sip-3.7.ebuild 1150
-MD5 1f8cd8fccaa4fa3465c0c0d477de0c08 ChangeLog 2033
-MD5 ebcb4e381418096e798bb2cf56c65997 sip-3.9.ebuild 1053
+MD5 f69480bf34caedd3a5b94051578c3887 ChangeLog 2362
+MD5 8f7a382122fe77c74b22776c280d97e0 sip-3.9.ebuild 1144
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 ea94cf729c92330a5d8a6d508361fd1c files/license-3.5.diff 1052
-MD5 3d3910def0f161c87391dd758512fc18 files/license-3.6.diff 1037
-MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.7.diff 1003
 MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
-MD5 02beeecfef8cd92555d0a20b8d331fa6 files/digest-sip-3.5 67
-MD5 6e388fdcff422e9e350096079b248249 files/digest-sip-3.6 67
-MD5 1714ef78f327931403628a61a1856c52 files/digest-sip-3.7 67
 MD5 821af86e779d5bc5b3457336a0426fa1 files/digest-sip-3.8 67
 MD5 e43f24c08a89ddd401ae7c0630d38ce8 files/digest-sip-3.9 59
 MD5 9a5061a23b5fbfc2962d69fc14890f84 files/digest-sip-4.0_rc1 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-3.6 b/dev-python/sip/files/digest-sip-3.6
deleted file mode 100644
index 30f99e2c5773..000000000000
--- a/dev-python/sip/files/digest-sip-3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8593ad47f9b5edf789887b619b43a6a sip-x11-gpl-3.6.tar.gz 174084
diff --git a/dev-python/sip/files/digest-sip-3.7 b/dev-python/sip/files/digest-sip-3.7
deleted file mode 100644
index 4ceab0e0d3ce..000000000000
--- a/dev-python/sip/files/digest-sip-3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f186952fe88097caa3b25503e3583ce7 sip-x11-gpl-3.7.tar.gz 178716
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/files/license-3.6.diff b/dev-python/sip/files/license-3.6.diff
deleted file mode 100644
index c6b8b8edff52..000000000000
--- a/dev-python/sip/files/license-3.6.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- build.py.orig	2003-04-26 16:51:47.000000000 +0200
-+++ build.py	2003-04-29 11:24:28.000000000 +0200
-@@ -574,31 +574,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")
--
-     inform("Building the %s version of SIP 3.6 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/files/license-3.7.diff b/dev-python/sip/files/license-3.7.diff
deleted file mode 100644
index 5fba51163375..000000000000
--- a/dev-python/sip/files/license-3.7.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.5.ebuild b/dev-python/sip/sip-3.5.ebuild
deleted file mode 100644
index a71be5aa09c2..000000000000
--- a/dev-python/sip/sip-3.5.ebuild
+++ /dev/null
@@ -1,50 +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-python/sip/sip-3.5.ebuild,v 1.11 2003/09/06 23:32:29 msterret 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."
-SRC_URI="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-
-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.6.ebuild b/dev-python/sip/sip-3.6.ebuild
deleted file mode 100644
index e278b93c518e..000000000000
--- a/dev-python/sip/sip-3.6.ebuild
+++ /dev/null
@@ -1,50 +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-python/sip/sip-3.6.ebuild,v 1.5 2003/09/06 23:32:29 msterret 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."
-SRC_URI="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-
-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-${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}
-
-	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.7.ebuild b/dev-python/sip/sip-3.7.ebuild
deleted file mode 100644
index 3471282cb81c..000000000000
--- a/dev-python/sip/sip-3.7.ebuild
+++ /dev/null
@@ -1,50 +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-python/sip/sip-3.7.ebuild,v 1.2 2003/09/06 23:32:29 msterret 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."
-SRC_URI="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-
-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-${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}
-
-	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.9.ebuild b/dev-python/sip/sip-3.9.ebuild
index 66a30b2800ad..569209b9dd89 100644
--- a/dev-python/sip/sip-3.9.ebuild
+++ b/dev-python/sip/sip-3.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.9.ebuild,v 1.1 2003/12/08 21:22:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.9.ebuild,v 1.2 2003/12/17 14:13:05 caleb Exp $
 
 IUSE=""
 
 inherit eutils distutils
 
 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/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
 
 SLOT="0"
@@ -35,5 +35,7 @@ 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_rc1.ebuild b/dev-python/sip/sip-4.0_rc1.ebuild
index dd450326ac58..2ec50950af9c 100644
--- a/dev-python/sip/sip-4.0_rc1.ebuild
+++ b/dev-python/sip/sip-4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_rc1.ebuild,v 1.1 2003/12/08 21:22:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0_rc1.ebuild,v 1.2 2003/12/17 14:13:05 caleb Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ 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."
-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"
@@ -38,5 +38,7 @@ 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
 }