Fixed $ROOT abuse (bug #167271) and some cleanup

(Portage version: 2.1.3_rc5)

3 files changed, 18 insertions, 14 deletions

diff --git a/dev-python/pykde/ChangeLog b/dev-python/pykde/ChangeLog
index 990bcdb73f8f..e7babccf4ea2 100644
--- a/dev-python/pykde/ChangeLog
+++ b/dev-python/pykde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pykde
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/ChangeLog,v 1.31 2007/06/16 22:42:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/ChangeLog,v 1.32 2007/06/24 20:29:31 dev-zero Exp $
+
+  24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> pykde-3.11.3.ebuild,
+  pykde-3.16.0.ebuild:
+  Fixed $ROOT abuse (bug #167271) and some cleanup
 
   16 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> pykde-3.16.0.ebuild:
   Added the -i switch to the configure options and a DEPEND on either konsole
diff --git a/dev-python/pykde/pykde-3.11.3.ebuild b/dev-python/pykde/pykde-3.11.3.ebuild
index b574341304d5..0eb8a5b69eb8 100644
--- a/dev-python/pykde/pykde-3.11.3.ebuild
+++ b/dev-python/pykde/pykde-3.11.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.11.3.ebuild,v 1.5 2004/12/07 02:46:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.11.3.ebuild,v 1.6 2007/06/24 20:29:31 dev-zero Exp $
 
 inherit eutils distutils
 
@@ -18,7 +18,6 @@ KEYWORDS="x86 ~ppc"
 IUSE="debug doc kjs"
 
 RDEPEND="virtual/libc
-	virtual/python
 	>=dev-python/sip-3.10.2
 	>=dev-python/PyQt-3.12
 	kde-base/kdelibs
@@ -40,11 +39,11 @@ src_compile() {
 	use kjs && myconf="${myconf} -m"
 
 	python configure.py ${myconf}
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} || die
+	emake install DESTDIR="${D}" || die "emake install failed"
 	find ${D}/usr/share/sip -not -type d -not -iname *.sip -exec rm '{}' \;
 	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS
 	use doc && ( cp -r examples ${D}/usr/share/doc/${PF}
diff --git a/dev-python/pykde/pykde-3.16.0.ebuild b/dev-python/pykde/pykde-3.16.0.ebuild
index af52be957c2b..abc16ea80f98 100644
--- a/dev-python/pykde/pykde-3.16.0.ebuild
+++ b/dev-python/pykde/pykde-3.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.16.0.ebuild,v 1.3 2007/06/16 22:42:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.16.0.ebuild,v 1.4 2007/06/24 20:29:31 dev-zero Exp $
 
 inherit eutils distutils
 
@@ -27,28 +27,29 @@ RDEPEND=">=dev-python/sip-4.4.5
 src_compile() {
 	distutils_python_version
 
-	local myconf="-d ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages \
-			-v ${ROOT}/usr/share/sip \
+	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages \
+			-v /usr/share/sip \
 			-k $(kde-config --prefix)
 			-L $(get_libdir)"
 
 	use debug && myconf="${myconf} -u"
 	myconf="${myconf} -i"
 
-	python configure.py ${myconf}
-	emake || die
+	"${python}" configure.py ${myconf}
+	emake || die "emake install failed"
 }
 
 src_install() {
 	dodir /usr/kde/3.5/lib/
 	sed -i -e 's:/usr/kde/3.5/lib/libkonsolepart.so:$(DESTDIR)/usr/kde/3.5/lib/libkonsolepart.so:' Makefile
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 #	find ${D}/usr/share/sip -not -type d -not -iname *.sip -exec rm '{}' \;
 
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	use doc && dohtml -r doc/*
 	if use examples ; then
-		cp -r examples ${D}/usr/share/doc/${PF}
-		cp -r templates ${D}/usr/share/doc/${PF}
+		insinto "/usr/share/doc/${PF}"
+		doins -r examples
+		doins -r templates
 	fi
 }