clean up

6 files changed, 32 insertions, 75 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index cb9570715797..9c5ccebb80df 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,25 +1,35 @@
 # 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.10 2003/02/12 06:34:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.11 2003/04/04 01:13:02 liquidx Exp $
 
-*sip-3.5 (14 December 2002) Bart Verwilst <verwilst@gentoo.org>
+*sip-3.5 (14 Dec 2002) 
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> sip-3.5.ebuild :
+  changelog cleanup, ebuild cleanup.
+
+  14 Dec 2002; Bart Verwilst <verwilst@gentoo.org> :
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
  
-*sip-3.4 (18 Sept 2002) Sascha Schwabbauer <cybersystem@gentoo.org>
+*sip-3.4 (18 Sep 2002) 
 
+  18 Sep 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
   Added ppc to keywords.
 
-*sip-3.4 (15 Sept 2002) Bart Verwilst <verwilst@gentoo.org>
+  25 Jul 2003; Bart Verwilst <verwilst@gentoo.org> :
+
+*sip-3.3.2 (25 Jul 2002) 
 
-*sip-3.3.2 (25 July 2002) Bart Verwilst <verwilst@gentoo.org>
+  25 Jul 2002; Bart Verwilst <verwilst@gentoo.org> :
 
-*sip-3.2.4 (5 July 2002) Bart Verwilst <verwilst@gentoo.org>
+*sip-3.2.4 (5 July 2002)
+
+  5 Jul 2002; Bart Verwilst <verwilst@gentoo.org> :
 
 *sip-3.2.1 (5 May 2002)
 
   5 May 2002; B.Verwilst <verwilst@gentoo.org> ChangeLog :
-
   New version, needed by PyQt 3.2
 
 *sip-3.0 (1 Feb 2002)
diff --git a/dev-python/sip/files/digest-sip-2.4 b/dev-python/sip/files/digest-sip-2.4
deleted file mode 100644
index f3ed1e62d0c4..000000000000
--- a/dev-python/sip/files/digest-sip-2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 281a1a18fdd126a8e8722ee97c808729 sip-2.4.tar.gz 291762
diff --git a/dev-python/sip/files/digest-sip-3.4 b/dev-python/sip/files/digest-sip-3.4
deleted file mode 100644
index b7f5d7023b16..000000000000
--- a/dev-python/sip/files/digest-sip-3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab0b69e48f7e7c27bb099304bddf3985 sip-x11-gpl-3.4.tar.gz 159038
diff --git a/dev-python/sip/sip-2.4.ebuild b/dev-python/sip/sip-2.4.ebuild
deleted file mode 100644
index 530499043795..000000000000
--- a/dev-python/sip/sip-2.4.ebuild
+++ /dev/null
@@ -1,23 +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-2.4.ebuild,v 1.12 2003/02/13 11:39:19 vapier Exp $
-
-S=${WORKDIR}/${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/software/${P}.tar.gz"
-HOMEPAGE="http://www.thekompany.com/projects/pykde/"
-SLOT="0"
-KEYWORDS="x86 sparc alpha"
-LICENSE="MIT"
-
-DEPEND="virtual/python"
-
-src_compile(){
-	./configure --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING NEWS README THANKS TODO
-}
diff --git a/dev-python/sip/sip-3.4.ebuild b/dev-python/sip/sip-3.4.ebuild
deleted file mode 100644
index 8bc1cf1edc76..000000000000
--- a/dev-python/sip/sip-3.4.ebuild
+++ /dev/null
@@ -1,32 +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.4.ebuild,v 1.8 2003/02/13 11:39:23 vapier 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="MIT"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/glibc
-	>=dev-lang/python-2.2.1"
-
-S=${WORKDIR}/${MY_P}
-
-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
-}
diff --git a/dev-python/sip/sip-3.5.ebuild b/dev-python/sip/sip-3.5.ebuild
index 8b3c5759c557..45988f4bce3f 100644
--- a/dev-python/sip/sip-3.5.ebuild
+++ b/dev-python/sip/sip-3.5.ebuild
@@ -1,6 +1,10 @@
 # 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.5 2003/02/28 16:54:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.5.ebuild,v 1.6 2003/04/04 01:13:02 liquidx 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."
@@ -18,24 +22,24 @@ DEPEND="virtual/glibc
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-	patch -p0 < ${FILESDIR}/license-3.5.diff
-
+	unpack ${A}
+	epatch ${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
+	dodir /usr/lib/python${PY_VER}/site-packages
+	python build.py -l qt-mt \
+		-b ${D}/usr/bin \
+		-d ${D}/usr/lib/python${PY_VER}/site-packages \
+		-e ${D}/usr/include/python${PY_VER}
+		
 	make || die
 }
 
 src_install() {
-	dodir /usr/include/python2.2
+	dodir /usr/include/python${PY_VER}
 	make DESTDIR=${D} install || die
 	dodoc NEWS README THANKS
 }