Fix html path (bug 96507), drop old

Package-Manager: portage-2.1.3_rc8

5 files changed, 27 insertions, 97 deletions

diff --git a/dev-python/pythong/ChangeLog b/dev-python/pythong/ChangeLog
index d5fa15a1fc6b..98910fa69c8a 100644
--- a/dev-python/pythong/ChangeLog
+++ b/dev-python/pythong/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2007/02/21 17:13:55 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.17 2007/07/14 08:23:33 hawking Exp $
+
+  14 Jul 2007; Ali Polatel (hawking) <polatel@gmail.com>
+  -pythong-2.1.4.ebuild, pythong-2.1.5.ebuild:
+  Fix html path (bug 96507 thanks alej), drop old
 
   21 Feb 2007; Lukasz Strzygowski <lucass@gentoo.org>
   files/digest-pythong-2.1.2, files/digest-pythong-2.1.4,
diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest
index b2898b3c1e60..7cca2a1f0828 100644
--- a/dev-python/pythong/Manifest
+++ b/dev-python/pythong/Manifest
@@ -1,26 +1,18 @@
------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_4.tgz 396305 RMD160 9bbbbf20c3f4770e1b0693cddd21593cb2132635 SHA1 43cc63776d15669c6a39bbc73ddf0bbce2a064ad SHA256 a80fa4991790dcd01a435724560e61abcd9e9770c0158dd241cb12eaaedd58e0
 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
 MD5 bcd5e896baf026d8acf071c1a8199d96 pythong-2.1.2.ebuild 1367
 RMD160 a26eb8e2c87cf5e3a1dee20d9a2b1117e8df91d2 pythong-2.1.2.ebuild 1367
 SHA256 2496d4422bee9fe216ed907d0f017ff71b396c99d33720172753baec48a498f9 pythong-2.1.2.ebuild 1367
-EBUILD pythong-2.1.4.ebuild 1368 RMD160 eb91eb2e0d2812bf5b7a5976dfb4545043e58cd6 SHA1 2ea7666ff820153823822cfc22a7d8a37184f750 SHA256 705e75455b6ecf92f2cff45cf95d241cff463800c6802aec6a975c912b5e0314
-MD5 0b2c21454fdc84f4efd04fadd59fc505 pythong-2.1.4.ebuild 1368
-RMD160 eb91eb2e0d2812bf5b7a5976dfb4545043e58cd6 pythong-2.1.4.ebuild 1368
-SHA256 705e75455b6ecf92f2cff45cf95d241cff463800c6802aec6a975c912b5e0314 pythong-2.1.4.ebuild 1368
-EBUILD pythong-2.1.5.ebuild 1493 RMD160 1ffb6617d80a959a278ea7496f89ea8ee715d87f SHA1 e948473af90020838530f1f0c2fd00e37ffe0ebd SHA256 d9d05c424165bbb7335758d785c59a6b8bd3db392960bfb027e8e1b7fb86e288
-MD5 1e88921c3d0e86a7c1bb90a36b429a2c pythong-2.1.5.ebuild 1493
-RMD160 1ffb6617d80a959a278ea7496f89ea8ee715d87f pythong-2.1.5.ebuild 1493
-SHA256 d9d05c424165bbb7335758d785c59a6b8bd3db392960bfb027e8e1b7fb86e288 pythong-2.1.5.ebuild 1493
-MISC ChangeLog 2132 RMD160 16d323fb9c2e5d2eb0e0cb5bac30d97770ad71b8 SHA1 8f43f0de9853165b9e84300078fc08f58f79f415 SHA256 b0f9603250283cb393fb098aef698bafc049c3d42cc56a8059d045b54a0d5d4d
-MD5 a580499dd66a5988ba9a8fe2b3e81594 ChangeLog 2132
-RMD160 16d323fb9c2e5d2eb0e0cb5bac30d97770ad71b8 ChangeLog 2132
-SHA256 b0f9603250283cb393fb098aef698bafc049c3d42cc56a8059d045b54a0d5d4d ChangeLog 2132
+EBUILD pythong-2.1.5.ebuild 1645 RMD160 d6b3ca74032bbc226b0963954fa30fc708a41b7e SHA1 cb73f670846cb1e51a52fa874f8745533ebcedad SHA256 79ea29f3e1074ea9d7168d45a39deb588d0ac75c156c2fb3bf944415d3cdc7ee
+MD5 e8e499da962e0c8aadf6023d0ce263fa pythong-2.1.5.ebuild 1645
+RMD160 d6b3ca74032bbc226b0963954fa30fc708a41b7e pythong-2.1.5.ebuild 1645
+SHA256 79ea29f3e1074ea9d7168d45a39deb588d0ac75c156c2fb3bf944415d3cdc7ee pythong-2.1.5.ebuild 1645
+MISC ChangeLog 2288 RMD160 d50a3f3173b0903c00ca2e6479c594e2eba72b46 SHA1 aa12ce4e76d8df21b1362aa7c6b4ae3e37fcd46a SHA256 c0187297d2891d4b3ffa13da60d9a4b8d4fa7d4de58faf92c1cd227a7892c07c
+MD5 8dffc8b12023130a2f313250d106ab1f ChangeLog 2288
+RMD160 d50a3f3173b0903c00ca2e6479c594e2eba72b46 ChangeLog 2288
+SHA256 c0187297d2891d4b3ffa13da60d9a4b8d4fa7d4de58faf92c1cd227a7892c07c ChangeLog 2288
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -28,16 +20,6 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 0aa4cfdbb3f9b0b8501b12dc1b65d7bb files/digest-pythong-2.1.2 446
 RMD160 b89af4f1c064da5551fc214830cc087aa6ee0901 files/digest-pythong-2.1.2 446
 SHA256 8999e0055533758f5ef25c3f5ee7a91fd4c4a3ff5e82b534d9359fc465b04fb3 files/digest-pythong-2.1.2 446
-MD5 50771364c0510a80dac7e5ad50f432ba files/digest-pythong-2.1.4 446
-RMD160 4067df3eee3eb35057985f3feba289d398b56ff5 files/digest-pythong-2.1.4 446
-SHA256 70015b147722b514dbb47ed34516978f5cb1a687732fa83375907cd67ef17193 files/digest-pythong-2.1.4 446
 MD5 81b0f887285468c2f382ec102691717a files/digest-pythong-2.1.5 446
 RMD160 6abe8b7b5784734f28d7b8b9a5a69619e9ca8bd5 files/digest-pythong-2.1.5 446
 SHA256 aa473413af05e8d64c11473288ab4391ad4fb038d77723a332c5a38f65244dcf files/digest-pythong-2.1.5 446
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF3H3e2jLqHNfbg2URAhooAKCxS8lubiKTXwFpT4+T8/XR75jIvwCgnonZ
-GMAxNlhOltAg3VijwN4kNl8=
-=W//6
------END PGP SIGNATURE-----
diff --git a/dev-python/pythong/files/digest-pythong-2.1.4 b/dev-python/pythong/files/digest-pythong-2.1.4
deleted file mode 100644
index 9518b8ee3eb1..000000000000
--- a/dev-python/pythong/files/digest-pythong-2.1.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ad1692872a47162aac9f75efe7e2b1a6 python.pdf 2547987
-RMD160 664ac62006584494c6d60ad734384c2b78fcc4ae python.pdf 2547987
-SHA256 20e17f365b9f2c5ab0bed656a1ff8797b22b079a238a278674879b807bfd9dd4 python.pdf 2547987
-MD5 d49a2d2b942947074b268f1ab92f47b7 pythonG-2_1_4.tgz 396305
-RMD160 9bbbbf20c3f4770e1b0693cddd21593cb2132635 pythonG-2_1_4.tgz 396305
-SHA256 a80fa4991790dcd01a435724560e61abcd9e9770c0158dd241cb12eaaedd58e0 pythonG-2_1_4.tgz 396305
diff --git a/dev-python/pythong/pythong-2.1.4.ebuild b/dev-python/pythong/pythong-2.1.4.ebuild
deleted file mode 100644
index 2b1d4fa83097..000000000000
--- a/dev-python/pythong/pythong-2.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.4.ebuild,v 1.7 2005/03/23 14:34:58 blubb Exp $
-
-inherit python distutils
-
-MY_PN="pythonG"
-MY_PV=${PV/_/-}
-MY_PV=${MY_PV//\./_}
-
-DESCRIPTION="Nice and powerful spanish development environment for Python"
-SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/old/${MY_PN}-${MY_PV}.tgz
-	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
-HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-IUSE="doc"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-RDEPEND=">=dev-lang/python-2.2.2
-	>=dev-lang/tk-8.3.4
-	>=dev-python/pmw-1.2"
-
-pkg_setup() {
-	if ! python_mod_exists Tkinter; then
-		eerror "You need to Tk support in Python to continue. Try running:"
-		eerror "USE=\"tcltk\" emerge python"
-		die "Missing Tkinter support"
-	fi
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-
-	python_version
-
-	insinto /usr/lib/python${PYVER}/site-packages/
-	doins modulepythong.py
-	doins libpythong/fromidle.py
-
-	exeinto /usr/bin
-	doexe pythong.py
-
-	dodoc leeme.txt
-	cp -r ${S}/{LICENCIA,MANUAL,demos} ${D}/usr/share/doc/${PF}
-	rm -f ${D}/usr/share/doc/${PF}/demos/modulepythong.py
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins ${DISTDIR}/python.pdf
-	fi
-
-}
diff --git a/dev-python/pythong/pythong-2.1.5.ebuild b/dev-python/pythong/pythong-2.1.5.ebuild
index 8b531a6194fc..15a98779d21a 100644
--- a/dev-python/pythong/pythong-2.1.5.ebuild
+++ b/dev-python/pythong/pythong-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 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/pythong/pythong-2.1.5.ebuild,v 1.8 2006/04/01 18:59:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5.ebuild,v 1.9 2007/07/14 08:23:33 hawking Exp $
 
 inherit python distutils
 
@@ -33,6 +33,18 @@ pkg_setup() {
 	python_tkinter_exists
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	python_version
+
+	sed -i \
+		-e "s:^\(fullpath = \).*:\1'/usr/lib/python${PYVER}/site-packages/':" \
+		-e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \
+		pythong.py || die "sed in pythong.py failed"
+}
+
 src_compile() {
 	return
 }
@@ -41,9 +53,6 @@ src_install() {
 
 	python_version
 
-	sed -e  "s#^fullpath = .*#fullpath = '/usr/lib/python${PYVER}/site-packages/'#" \
-		-i pythong.py
-
 	insinto /usr/lib/python${PYVER}/site-packages/
 	doins modulepythong.py
 	dodir /usr/lib/python${PYVER}/site-packages/libpythong/