new version

12 files changed, 163 insertions, 80 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index acd423c34cd0..c83250a077d8 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.8 2002/12/13 10:56:44 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.9 2002/12/14 00:04:50 verwilst Exp $
+
+*PyQt-3.5 (14 December 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  New version, + changed license to GPL
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/dev-python/PyQt/PyQt-3.3.2.ebuild b/dev-python/PyQt/PyQt-3.3.2.ebuild
deleted file mode 100644
index 5cb5987a2e9a..000000000000
--- a/dev-python/PyQt/PyQt-3.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.3.2.ebuild,v 1.6 2002/12/09 04:21:12 manson Exp $
-
-S="${WORKDIR}/PyQt-snapshot-20020722"
-DESCRIPTION="PyQt is a set of Python bindings for the Qt Toolkit( VERSION 3.x ONLY!!)."
-SRC_URI="http://www.riverbankcomputing.co.uk/download/snapshots/PyQt/PyQt-snapshot-20020722.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 sparc  alpha"
-
-DEPEND="virtual/glibc
-	sys-devel/libtool
-	>=x11-libs/qt-3.0.4.1
-    	>=dev-lang/python-2.2.1
-    	=dev-python/sip-3.3.2"
-
-src_compile() {
-	# Fix for one installation problem. The libtool included with the
-	# source package does not have the relink patch.
-	# Use the system libtool instead.
-	dodir /usr/lib/python2.2/site-packages
-	dodir /usr/include/python2.2
-	python build.py \
-		-d ${D}/usr/lib/python2.2/site-packages \
-		-b ${D}/usr/bin \
-		-l qt-mt -c
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install-eric || die
-	echo "#!/bin/sh" > ${D}/usr/bin/eric
-	echo " " >> ${D}/usr/bin/eric
-	echo "exec python /usr/lib/python2.2/site-packages/eric/eric.py $*" >> ${D}/usr/bin/eric 
-	chmod +x ${D}/usr/bin/eric
-	dodir /usr/share/doc/${P}/
-	mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}/ 
-}
diff --git a/dev-python/PyQt/PyQt-3.5.ebuild b/dev-python/PyQt/PyQt-3.5.ebuild
new file mode 100644
index 000000000000..cf2a50f0be93
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5.ebuild,v 1.1 2002/12/14 00:04:50 verwilst Exp $
+
+S="${WORKDIR}/PyQt-x11-gpl-${PV}"
+DESCRIPTION="PyQt is a set of Python bindings for the QT 3.x Toolkit"
+SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-${PV}.tar.gz"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc sparc alpha"
+
+DEPEND="virtual/glibc
+	sys-devel/libtool
+	>=x11-libs/qt-3.0.4.1
+    	>=dev-lang/python-2.2.1
+    	=dev-python/sip-${PV}"
+
+src_unpack() {
+
+        unpack PyQt-x11-gpl-${PV}.tar.gz
+        cd ${S}
+        patch -p0 < ${FILESDIR}/license-3.5.diff
+
+}
+
+
+src_compile() {
+	dodir /usr/lib/python2.2/site-packages
+	dodir /usr/include/python2.2
+	python build.py \
+		-d ${D}/usr/lib/python2.2/site-packages \
+		-e /usr/include/python2.2 \
+		-b ${D}/usr/bin \
+		-l qt-mt -c
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README.Linux NEWS LICENSE README ChangeLog THANKS
+	dodir /usr/share/doc/${P}/
+	mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}/ 
+}
diff --git a/dev-python/PyQt/files/digest-PyQt-3.3.2 b/dev-python/PyQt/files/digest-PyQt-3.3.2
deleted file mode 100644
index 6b7f8102e16f..000000000000
--- a/dev-python/PyQt/files/digest-PyQt-3.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23a8975024f2b8f6e349c28075bd0a65 PyQt-snapshot-20020722.tar.gz 570991
diff --git a/dev-python/PyQt/files/digest-PyQt-3.5 b/dev-python/PyQt/files/digest-PyQt-3.5
new file mode 100644
index 000000000000..e681c54a20ce
--- /dev/null
+++ b/dev-python/PyQt/files/digest-PyQt-3.5
@@ -0,0 +1 @@
+MD5 3145f56f187d98147de20360b990da01 PyQt-x11-gpl-3.5.tar.gz 654406
diff --git a/dev-python/PyQt/files/license-3.5.diff b/dev-python/PyQt/files/license-3.5.diff
new file mode 100644
index 000000000000..82d3106b7212
--- /dev/null
+++ b/dev-python/PyQt/files/license-3.5.diff
@@ -0,0 +1,34 @@
+--- build.py.orig	2002-12-13 23:43:10.000000000 +0100
++++ build.py	2002-12-13 23:43:23.000000000 +0100
+@@ -646,31 +646,6 @@
+         licType = "GPL"
+         licname = "GNU General Public License"
+ 
+-    inform("This is the %s version of PyQt 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 PyQt 3.5 for Python %s on %s." % (licType,pyFullVers,sys.platform))
+ 
+     if licType != "GPL":
diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index d00ef92808bf..7cb04874429f 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for dev-python/sip
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.8 2002/12/13 10:56:45 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.9 2002/12/14 00:06:55 verwilst Exp $
+
+*sip-3.5 (14 December 2002) Bart Verwilst <verwilst@gentoo.org>
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/dev-python/sip/files/digest-sip-3.3.2 b/dev-python/sip/files/digest-sip-3.3.2
deleted file mode 100644
index 093e182f6c28..000000000000
--- a/dev-python/sip/files/digest-sip-3.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 161c28f0bd3ef755ac44d4e39088c3be sip-3.3.2.tar.gz 153672
diff --git a/dev-python/sip/files/digest-sip-3.5 b/dev-python/sip/files/digest-sip-3.5
new file mode 100644
index 000000000000..e862cb144265
--- /dev/null
+++ b/dev-python/sip/files/digest-sip-3.5
@@ -0,0 +1 @@
+MD5 5a3a598a25316aa947b79703678b18b5 sip-x11-gpl-3.5.tar.gz 163057
diff --git a/dev-python/sip/files/license-3.5.diff b/dev-python/sip/files/license-3.5.diff
new file mode 100644
index 000000000000..236968a731c5
--- /dev/null
+++ b/dev-python/sip/files/license-3.5.diff
@@ -0,0 +1,34 @@
+--- build.py.orig	2002-12-13 23:40:01.000000000 +0100
++++ 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.3.2.ebuild b/dev-python/sip/sip-3.3.2.ebuild
deleted file mode 100644
index d370f12c19c5..000000000000
--- a/dev-python/sip/sip-3.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.3.2.ebuild,v 1.5 2002/12/09 04:21:13 manson Exp $
-
-DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-SRC_URI="http://www.riverbankcomputing.co.uk/download/sip/${P}.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 sparc  alpha"
-
-DEPEND="virtual/glibc
-	>=dev-lang/python-2.2.1"
-
-src_compile(){
-	chmod +x build.py
-	dodir /usr/bin
-	dodir /usr/lib/python2.2/site-packages
-	python build.py -l qt-mt -b ${D}/usr/bin -d ${D}/usr/lib/python2.2/site-packages
-	make || die
-}
-
-src_install() {
-	cd ${S}/siplib
-	mv Makefile Makefile.orig
-	sed s:"cp sip.h /usr/include/python2.2":"cp sip.h /var/tmp/portage/sip-3.3.2/image/usr/include/python2.2": Makefile.orig > Makefile
-	mv Makefile Makefile.orig2
-	sed s:"cp sipQt.h /usr/include/python2.2":"cp sipQt.h /var/tmp/portage/sip-3.3.2/image/usr/include/python2.2": Makefile.orig2 > Makefile
-	cd ${S} 
-	dodir /usr/include/python2.2 
-	make DESTDIR=${D} install || die
-	dodoc NEWS README THANKS
-}
diff --git a/dev-python/sip/sip-3.5.ebuild b/dev-python/sip/sip-3.5.ebuild
new file mode 100644
index 000000000000..6cea2d8b54cf
--- /dev/null
+++ b/dev-python/sip/sip-3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2002 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.1 2002/12/14 00:06:55 verwilst Exp $
+
+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"
+KEYWORDS="x86 ppc sparc  alpha"
+
+DEPEND="virtual/glibc
+	>=dev-lang/python-2.2.1"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	patch -p0 < ${FILESDIR}/license-3.5.diff
+
+}
+
+src_compile(){
+	chmod +x build.py
+	dodir /usr/bin
+	dodir /usr/lib/python2.2/site-packages
+	python build.py -l qt-mt -b ${D}/usr/bin -d ${D}/usr/lib/python2.2/site-packages \
+			-e ${D}/usr/include/python2.2
+	make || die
+}
+
+src_install() {
+	dodir /usr/include/python2.2
+	make DESTDIR=${D} install || die
+	dodoc NEWS README THANKS
+}