fixing #33210, #44121 and cleanup

7 files changed, 12 insertions, 131 deletions

diff --git a/dev-python/pykde/ChangeLog b/dev-python/pykde/ChangeLog
index 9684b21a22ad..c0bec06d713b 100644
--- a/dev-python/pykde/ChangeLog
+++ b/dev-python/pykde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pykde
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/ChangeLog,v 1.11 2004/05/04 12:12:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/ChangeLog,v 1.12 2004/05/25 12:13:35 carlo Exp $
+
+  25 May 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.7.4-r1.ebuild,
+  pykde-3.7.4-r2.ebuild, files/pykde-3.5.2-sandbox-patch.diff,
+  files/pykde-3.7.4-sandbox-patch.diff:
+  fixing #33210, #44121 and cleanup
 
   04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pykde-3.7.4-r1.ebuild,
   pykde-3.7.4-r2.ebuild:
diff --git a/dev-python/pykde/Manifest b/dev-python/pykde/Manifest
index f979b2c709d1..e4a2c683ed27 100644
--- a/dev-python/pykde/Manifest
+++ b/dev-python/pykde/Manifest
@@ -1,8 +1,4 @@
-MD5 e2274479458d99d5c8fc4b42b5561bf0 pykde-3.7.4-r2.ebuild 2164
-MD5 3d08c6ddbbbc3025634798294a1b5ddf pykde-3.7.4-r1.ebuild 2169
+MD5 33b1a8693489e87597155bd66e03e4df pykde-3.7.4-r2.ebuild 2164
+MD5 253d5f0dc3deee9738dd32a5fbeead62 ChangeLog 1964
 MD5 8ffc620e0c006abd05da325a3f888251 metadata.xml 182
-MD5 0ed09e8ec81b80cc9cdc8160bcead6b9 ChangeLog 1753
-MD5 87cf4dfaa7eb6c2dc39268151690e347 files/pykde-3.5.2-sandbox-patch.diff 763
-MD5 c8882bffcd911e22d9dd58d740b4bf6a files/pykde-3.7.4-sandbox-patch.diff 763
-MD5 9964a12f8d0110947df654b5969e69e1 files/digest-pykde-3.7.4-r1 63
 MD5 9964a12f8d0110947df654b5969e69e1 files/digest-pykde-3.7.4-r2 63
diff --git a/dev-python/pykde/files/digest-pykde-3.7.4-r1 b/dev-python/pykde/files/digest-pykde-3.7.4-r1
deleted file mode 100644
index 238ea35a5cd4..000000000000
--- a/dev-python/pykde/files/digest-pykde-3.7.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 871740c95c572ade9d0299ef0830656a PyKDE-3.7-4.tar.gz 630256
diff --git a/dev-python/pykde/files/pykde-3.5.2-sandbox-patch.diff b/dev-python/pykde/files/pykde-3.5.2-sandbox-patch.diff
deleted file mode 100644
index 0b26888c96a0..000000000000
--- a/dev-python/pykde/files/pykde-3.5.2-sandbox-patch.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.py.orig	2003-04-09 07:17:13.000000000 +0200
-+++ build.py	2003-04-13 19:52:32.000000000 +0200
-@@ -651,7 +651,7 @@
- 
- 
- def checkThreading ():
--        qtmodlib = modDir + '/libqtcmodule.so'
-+        qtmodlib = sipModuleDir + '/libqtcmodule.so'
-         os.system ('ldd ' + qtmodlib + ' > lddtmp')
-         f = open ('lddtmp', 'r')
-         buff = f.read ()
-@@ -843,7 +843,7 @@
-     if sipModuleDir is None:
-         error("The SIP module/library could not be found. Use the -s argument to set the correct directory")
- 
--    proPatches["LIBS"] = [re.compile("@BL_SIPMODDIR@",re.M), sipModuleDir]
-+    proPatches["LIBS"] = [re.compile("@BL_SIPMODDIR@",re.M), (sipModuleDir + " -L" + modDir)]
- 
-     inform("%s contains the SIP module." % (sipModuleDir))
- 
diff --git a/dev-python/pykde/files/pykde-3.7.4-sandbox-patch.diff b/dev-python/pykde/files/pykde-3.7.4-sandbox-patch.diff
deleted file mode 100644
index c9d16fd0faf1..000000000000
--- a/dev-python/pykde/files/pykde-3.7.4-sandbox-patch.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.py.orig	2003-08-13 15:45:42.000000000 +0200
-+++ build.py	2003-08-13 15:49:19.000000000 +0200
-@@ -624,7 +624,7 @@
- 
- 
- def checkThreading ():
--        qtmodlib = modDir + '/libqtcmodule.so'
-+        qtmodlib = sipModuleDir + '/libqtcmodule.so'
-         os.system ('ldd ' + qtmodlib + ' > lddtmp')
-         f = open ('lddtmp', 'r')
-         buff = f.read ()
-@@ -816,7 +816,7 @@
-     if sipModuleDir is None:
-         error("The SIP module/library could not be found. Use the -s argument to set the correct directory")
- 
--    proPatches["LIBS"] = [re.compile("@BL_SIPMODDIR@",re.M), sipModuleDir]
-+    proPatches["LIBS"] = [re.compile("@BL_SIPMODDIR@",re.M), (sipModuleDir + " -L" + modDir)]
- 
-     inform("%s contains the SIP module." % (sipModuleDir))
- 
diff --git a/dev-python/pykde/pykde-3.7.4-r1.ebuild b/dev-python/pykde/pykde-3.7.4-r1.ebuild
deleted file mode 100644
index 3afac442cd7e..000000000000
--- a/dev-python/pykde/pykde-3.7.4-r1.ebuild
+++ /dev/null
@@ -1,81 +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/pykde/pykde-3.7.4-r1.ebuild,v 1.2 2004/05/04 12:12:51 kloeri Exp $
-
-inherit eutils distutils
-
-MAJ_PV=${PV%.[0-9]*}
-MIN_PV=${PV##*[0-9].}
-MY_PN="PyKDE"
-MY_P=${MY_PN}-${MAJ_PV}-${MIN_PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="set of Python bindings for the KDE libs"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyKDE2/${MY_P}.tar.gz"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/pykde/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/glibc
-	sys-devel/libtool
-	>=dev-lang/python-2.2.1
-	>=dev-python/sip-3.6
-	>=dev-python/PyQt-3.6
-	>=kde-base/kdelibs-3.0.4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# bug #27401 and 27619
-	distutils_python_version
-	if [ "${PYVER}" = "2.3" ]; then
-		if [ "${KDEDIR}" = "/usr/kde/3" ]; then
-			mv ${S}/sip/global.sip  ${S}/sip/global.sip22
-			mv ${S}/sip/global.sip23 ${S}/sip/global/sip
-		else
-			mv ${S}/sip/kzip.sip ${S}/sip/kzip.sip22
-			mv ${S}/sip/kzip.sip23 ${S}/sip/kzip.sip
-		fi
-	fi
-
-	PYQTVER="$(pyuic -version 2>&1 )"
-	PYQTVER="${PYQTVER#Python User Interface Compiler }"
-	PYQTVER="${PYQTVER% for Qt version *}"
-	PYQTVER_MAJOR=${PYQTVER/.*/}
-	PYQTVER_MINOR=${PYQTVER#${PYQTVER_MAJOR}.}
-	PYQTVER_MINOR=${PYQTVER_MINOR/.*}
-
-	if [ "${PYQTVER_MAJOR}.${PYQTVER_MINOR}" = "3.8" ]; then
-		local x="${S}/build.py"
-		echo PyQt 3.8 detected.
-		echo Running sed on $x
-		cp $x ${x}.orig
-		sed -e 's/Release    = "3.7"/Release =    "3.8"/' ${x}.orig >${x}
-		rm ${x}.orig
-	fi
-}
-
-src_compile() {
-	dodir /usr/lib/python${PYVER}/site-packages
-	dodir /usr/include/python${PYVER}
-	python build.py \
-		-d ${D}/usr/lib/python${PYVER}/site-packages \
-		-s /usr/lib/python${PYVER}/site-packages \
-		-o ${KDEDIR}/lib \
-		-c+ -l qt-mt -v /usr/share/sip/qt || die
-	make || die
-}
-
-src_install() {
-	distutils_python_version
-
-	dodir ${D}/usr/lib/python${PYVER}/site-packages
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog AUTHORS THANKS README NEWS COPYING DETAILS BUGS README.importTest
-	dodir /usr/share/doc/${PF}/
-	mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${PF}/
-}
diff --git a/dev-python/pykde/pykde-3.7.4-r2.ebuild b/dev-python/pykde/pykde-3.7.4-r2.ebuild
index bd95288ebd32..bfa1b717f2c2 100644
--- a/dev-python/pykde/pykde-3.7.4-r2.ebuild
+++ b/dev-python/pykde/pykde-3.7.4-r2.ebuild
@@ -1,6 +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/pykde/pykde-3.7.4-r2.ebuild,v 1.3 2004/05/04 12:12:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.7.4-r2.ebuild,v 1.4 2004/05/25 12:13:35 carlo Exp $
 
 inherit eutils distutils
 
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${MAJ_PV}-${MIN_PV}
 
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="set of Python bindings for the KDE libs"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyKDE2/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pykde/"
 
 SLOT="0"
@@ -30,6 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	addwrite "${QTDIR}/etc/settings"
+
 	# bug #27401 and 27619
 	distutils_python_version
 	if [ "${PYVER}" = "2.3" ]; then