Revbump. Use EAPI=2 and use dependencies.

(Portage version: -svn/cvs/Linux 2.6.26-gentoo x86_64)

2 files changed, 26 insertions, 25 deletions

diff --git a/dev-python/pythong/ChangeLog b/dev-python/pythong/ChangeLog
index 98910fa69c8a..37e0c0b4841d 100644
--- a/dev-python/pythong/ChangeLog
+++ b/dev-python/pythong/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pythong
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.17 2007/07/14 08:23:33 hawking Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.18 2008/10/26 23:32:10 hawking Exp $
+
+*pythong-2.1.5-r1 (26 Oct 2008)
+
+  26 Oct 2008; Ali Polatel <hawking@gentoo.org> -pythong-2.1.5.ebuild,
+  +pythong-2.1.5-r1.ebuild:
+  Revbump. Use EAPI=2 and use dependencies.
 
   14 Jul 2007; Ali Polatel (hawking) <polatel@gmail.com>
   -pythong-2.1.4.ebuild, pythong-2.1.5.ebuild:
diff --git a/dev-python/pythong/pythong-2.1.5.ebuild b/dev-python/pythong/pythong-2.1.5-r1.ebuild
index 15a98779d21a..94ef4571783a 100644
--- a/dev-python/pythong/pythong-2.1.5.ebuild
+++ b/dev-python/pythong/pythong-2.1.5-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5.ebuild,v 1.9 2007/07/14 08:23:33 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5-r1.ebuild,v 1.1 2008/10/26 23:32:10 hawking Exp $
 
-inherit python distutils
+EAPI="2"
+inherit python distutils multilib
 
 MY_PN="pythonG"
 MY_PV=${PV/_/-}
@@ -20,7 +21,7 @@ IUSE="doc"
 
 S=${WORKDIR}/${MY_PN}-${MY_PV}
 
-RDEPEND=">=dev-lang/python-2.2.2
+RDEPEND=">=dev-lang/python-2.2.2[tk]
 	>=dev-lang/tk-8.3.4
 	>=dev-python/pmw-1.2"
 
@@ -29,44 +30,38 @@ DEPEND="${RDEPEND}
 
 PYTHON_MODNAME="libpythong"
 
-pkg_setup() {
-	python_tkinter_exists
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
 	python_version
 
 	sed -i \
-		-e "s:^\(fullpath = \).*:\1'/usr/lib/python${PYVER}/site-packages/':" \
+		-e "s:^\(fullpath = \).*:\1'/usr/$(get_libdir)/python${PYVER}/site-packages/':" \
 		-e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \
 		pythong.py || die "sed in pythong.py failed"
 }
 
 src_compile() {
-	return
+	:
 }
 
 src_install() {
-
 	python_version
 
-	insinto /usr/lib/python${PYVER}/site-packages/
-	doins modulepythong.py
-	dodir /usr/lib/python${PYVER}/site-packages/libpythong/
-	cp -r ${S}/libpythong/* ${D}/usr/lib/python${PYVER}/site-packages/libpythong/
+	insinto $(python_get_sitedir)
+	doins modulepythong.py || die "doins failed"
+	doins -r libpythong || die "doins failed"
 
 	exeinto /usr/bin
-	doexe pythong.py
+	doexe pythong.py || die "doexe failed"
 
-	dodoc leeme.txt
-	cp -r ${S}/{LICENCIA,MANUAL,demos} ${D}/usr/share/doc/${PF}
-	rm -f ${D}/usr/share/doc/${PF}/demos/modulepythong.py
+	dodoc leeme.txt || die "dodoc failed"
+	insinto /usr/share/doc/${PF}
+	doins {LICENCIA,MANUAL,demos} || die "doins failed"
+	rm -f "${D}"/usr/share/doc/"${PF}"/demos/modulepythong.py
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins ${DISTDIR}/python.pdf
+		doins "${DISTDIR}"/python.pdf
 	fi
 }