Revbump. Use EAPI=2 and use dependencies.

Package-Manager: portage--svn/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 38 insertions, 27 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/Manifest b/dev-python/pythong/Manifest
index 2b80ecf933f1..2bb0605a717a 100644
--- a/dev-python/pythong/Manifest
+++ b/dev-python/pythong/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST python.pdf 2547987 RMD160 664ac62006584494c6d60ad734384c2b78fcc4ae SHA1 f20939742f51c58895d7be571590045ea5cc17f7 SHA256 20e17f365b9f2c5ab0bed656a1ff8797b22b079a238a278674879b807bfd9dd4
 DIST pythonG-2_1_2.tgz 392294 RMD160 8d0b59b62881d20b1c39872246ced8a958df032c SHA1 ca389938c6cf75731e0f4741a89c7f36d094e569 SHA256 08b71559e218aabc44ca11ac796413d4ea57c0b793ebf44024c2745b01ed0a2b
 DIST pythonG-2_1_5.tgz 397754 RMD160 e407ea8a92a4451af6331d19b94c0970201a91f4 SHA1 9b455961acb321963a81535de34426824c5b3967 SHA256 6bc89217bfd89717eddd3b27682bb783446bcd3d87ed450e943e0369fa2c9243
 EBUILD pythong-2.1.2.ebuild 1367 RMD160 a26eb8e2c87cf5e3a1dee20d9a2b1117e8df91d2 SHA1 cd2525775757e77576e00d7f3cefd1bf09ac94f3 SHA256 2496d4422bee9fe216ed907d0f017ff71b396c99d33720172753baec48a498f9
-EBUILD pythong-2.1.5.ebuild 1645 RMD160 d6b3ca74032bbc226b0963954fa30fc708a41b7e SHA1 cb73f670846cb1e51a52fa874f8745533ebcedad SHA256 79ea29f3e1074ea9d7168d45a39deb588d0ac75c156c2fb3bf944415d3cdc7ee
-MISC ChangeLog 2288 RMD160 d50a3f3173b0903c00ca2e6479c594e2eba72b46 SHA1 aa12ce4e76d8df21b1362aa7c6b4ae3e37fcd46a SHA256 c0187297d2891d4b3ffa13da60d9a4b8d4fa7d4de58faf92c1cd227a7892c07c
+EBUILD pythong-2.1.5-r1.ebuild 1604 RMD160 36150a477ff63ae1ca33cc6f9b32bea714fec6fe SHA1 d4fd3ea9df46dc59cc5644b1b6c316c60bc3c1d6 SHA256 a76627f75548ba78d8e35908895d50eb1f3afd49d2237de092c0e5f6a942091e
+MISC ChangeLog 2465 RMD160 ee9cfa502b8c02b8bb53023dd45f86a44c32072d SHA1 434e685cf83fc96587770ac2d2c0bcb28da845c6 SHA256 cb4380f94d668bc36da8eaf5ff8d941f1052eb0def0c3ff2dca8bf912c3c2ae1
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkE/gYACgkQQU4yORhF8iDaXwCeKcUA9PqKi6OY2tX4VH8B9Xve
+bIYAn3AFmCd8LenbF27zDDOenzf7FTSA
+=G2YL
+-----END PGP SIGNATURE-----
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
 }