Version bump: cleanup, added doc use-flag. Dropped old versions.

(Portage version: 2.1.3_rc4)

6 files changed, 33 insertions, 62 deletions

diff --git a/dev-python/genshi/ChangeLog b/dev-python/genshi/ChangeLog
index f916b142352c..4db066e9d507 100644
--- a/dev-python/genshi/ChangeLog
+++ b/dev-python/genshi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/genshi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/ChangeLog,v 1.3 2007/05/22 16:20:02 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/ChangeLog,v 1.4 2007/06/21 05:50:36 lucass Exp $
+
+*genshi-0.4.2 (21 Jun 2007)
+
+  21 Jun 2007; Lukasz Strzygowski <lucass@gentoo.org> -genshi-0.4.ebuild,
+  -genshi-0.4.1.ebuild, +genshi-0.4.2.ebuild:
+  Version bump: cleanup, added doc use-flag. Dropped old versions.
 
 *genshi-0.4.1 (22 May 2007)
 
diff --git a/dev-python/genshi/files/digest-genshi-0.4 b/dev-python/genshi/files/digest-genshi-0.4
deleted file mode 100644
index 3ace95284945..000000000000
--- a/dev-python/genshi/files/digest-genshi-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 438805bc1af45b8a3dfbddea6b144a1a Genshi-0.4.tar.bz2 215268
-RMD160 9efe5eab28cddeae011043eeaa6a72ddb5d4e326 Genshi-0.4.tar.bz2 215268
-SHA256 c18e773ee9b413d72a1ef6bf74e85928ba8a03020f24c4aa26d098d69e580e50 Genshi-0.4.tar.bz2 215268
diff --git a/dev-python/genshi/files/digest-genshi-0.4.1 b/dev-python/genshi/files/digest-genshi-0.4.1
deleted file mode 100644
index 6ffa05bf8e68..000000000000
--- a/dev-python/genshi/files/digest-genshi-0.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb4e7e6702f90334febf176620ca4b13 Genshi-0.4.1.tar.bz2 220177
-RMD160 b766ee50c2dd085296dd1ebb2b58c918ed6745f4 Genshi-0.4.1.tar.bz2 220177
-SHA256 e6125cfe267d6922e5f792cb91d32587cadcc9e1c78458739035221114cb6216 Genshi-0.4.1.tar.bz2 220177
diff --git a/dev-python/genshi/files/digest-genshi-0.4.2 b/dev-python/genshi/files/digest-genshi-0.4.2
new file mode 100644
index 000000000000..aa71018ad22c
--- /dev/null
+++ b/dev-python/genshi/files/digest-genshi-0.4.2
@@ -0,0 +1,3 @@
+MD5 34ba9d69bf246cdf13a3a369ddb85049 Genshi-0.4.2.tar.bz2 228892
+RMD160 e59547708d1f34b8c8394c6d6cd5e5252aa7e5f3 Genshi-0.4.2.tar.bz2 228892
+SHA256 6ac86d4c407bd10782c72264e3e8d4ac1a8a767146e03d79218aacceab10ca63 Genshi-0.4.2.tar.bz2 228892
diff --git a/dev-python/genshi/genshi-0.4.1.ebuild b/dev-python/genshi/genshi-0.4.2.ebuild
index f9d08afd3bc4..3cc5de84b703 100644
--- a/dev-python/genshi/genshi-0.4.1.ebuild
+++ b/dev-python/genshi/genshi-0.4.2.ebuild
@@ -1,32 +1,45 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.4.1.ebuild,v 1.1 2007/05/22 16:20:02 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.4.2.ebuild,v 1.1 2007/06/21 05:50:36 lucass Exp $
 
 NEED_PYTHON=2.3
 
 inherit distutils
 
-KEYWORDS="~amd64 ~x86"
-
-MY_PN=Genshi
-MY_P=${MY_PN}-${PV}
+MY_P=Genshi-${PV}
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
 HOMEPAGE="http://genshi.edgewall.org/"
 SRC_URI="ftp://ftp.edgewall.com/pub/genshi/${MY_P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
 DEPEND=""
 RDEPEND=">=dev-python/setuptools-0.6_rc3"
-S=${WORKDIR}/${MY_P}
+
+S="${WORKDIR}/${MY_P}"
 DOCS="INSTALL.txt UPGRADE.txt"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e '/extras_require/, /},/d' \
+		setup.py || die "sed failed"
+}
+
 src_install() {
 	distutils_src_install
 
-	dohtml -r doc/*
-	dodoc doc/*.txt
+	if use doc; then
+		dodoc doc/*.txt
+		dohtml -r doc/*
+	fi
+
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
@@ -34,6 +47,5 @@ src_install() {
 }
 
 src_test() {
-	PYTHONPATH=. "${python}" setup.py test || die "test failed"
+	"${python}" setup.py test || die "test failed"
 }
-
diff --git a/dev-python/genshi/genshi-0.4.ebuild b/dev-python/genshi/genshi-0.4.ebuild
deleted file mode 100644
index 0b63eb961a6a..000000000000
--- a/dev-python/genshi/genshi-0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.4.ebuild,v 1.2 2007/05/22 16:20:02 pythonhead Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PN=Genshi
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/"
-SRC_URI="ftp://ftp.edgewall.com/pub/genshi/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-DEPEND=""
-RDEPEND=">=dev-python/setuptools-0.6_rc3"
-S=${WORKDIR}/${MY_P}
-DOCS="INSTALL.txt UPGRADE.txt"
-
-src_install() {
-	distutils_src_install
-
-	dohtml -r doc/*
-	dodoc doc/*.txt
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" setup.py test || die "test failed"
-}
-
-pkg_postinst() {
-	elog "If you're upgrading from 0.3.n to 0.4.n you may want to read:"
-	elog "/usr/share/doc/${PF}/UPGRADE.txt.bz2"
-}
-