Fix html path (bug 96507), drop old

(Portage version: 2.1.3_rc8)

4 files changed, 19 insertions, 71 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/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/