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

Package-Manager: portage-2.1.3_rc4

7 files changed, 45 insertions, 92 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/Manifest b/dev-python/genshi/Manifest
index 8068080f8f76..da059df9aa56 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST Genshi-0.4.1.tar.bz2 220177 RMD160 b766ee50c2dd085296dd1ebb2b58c918ed6745f4 SHA1 52ac9927c438e5d7f429fdcaa8b55e12ebe3a556 SHA256 e6125cfe267d6922e5f792cb91d32587cadcc9e1c78458739035221114cb6216
-DIST Genshi-0.4.tar.bz2 215268 RMD160 9efe5eab28cddeae011043eeaa6a72ddb5d4e326 SHA1 c365d3a141111e6d3e0dc2465ee9ec2e81b48e2a SHA256 c18e773ee9b413d72a1ef6bf74e85928ba8a03020f24c4aa26d098d69e580e50
-EBUILD genshi-0.4.1.ebuild 873 RMD160 f253ed9bf2cdf40a0eeaa688b6fc2dbc39e8a5e5 SHA1 b949ccda794f6ee69a489e5273d4d26e06fdc575 SHA256 bc442022988f6bf8e97c2b39423d4225aba56e3d2be903611cd4d2f0d95f924d
-MD5 df8baf16b1be21cb10ec70d98b180dbf genshi-0.4.1.ebuild 873
-RMD160 f253ed9bf2cdf40a0eeaa688b6fc2dbc39e8a5e5 genshi-0.4.1.ebuild 873
-SHA256 bc442022988f6bf8e97c2b39423d4225aba56e3d2be903611cd4d2f0d95f924d genshi-0.4.1.ebuild 873
-EBUILD genshi-0.4.ebuild 1006 RMD160 1dbb731309467951bb317765327e4666aeeb51a7 SHA1 2cf50a588a8a0e8c1497ea9629eeea94bab14e09 SHA256 456c90b08c06c5b41792865c2afd1b391b21c4693f26d7bebeab418e9311bbe4
-MD5 f7e898369a3b6003f96af835846b2d0a genshi-0.4.ebuild 1006
-RMD160 1dbb731309467951bb317765327e4666aeeb51a7 genshi-0.4.ebuild 1006
-SHA256 456c90b08c06c5b41792865c2afd1b391b21c4693f26d7bebeab418e9311bbe4 genshi-0.4.ebuild 1006
-MISC ChangeLog 979 RMD160 f402fa098c20083960a7888afcada5a0104cb58a SHA1 2c27d24a7c71883078454684699e822b74238cf3 SHA256 8f63ae1d0070ba854fbeabaaf77f61e32c4a4bcaf66a20d40d8ae7280120825c
-MD5 20a8884d17bd85f6e06ef482a2e9a6ba ChangeLog 979
-RMD160 f402fa098c20083960a7888afcada5a0104cb58a ChangeLog 979
-SHA256 8f63ae1d0070ba854fbeabaaf77f61e32c4a4bcaf66a20d40d8ae7280120825c ChangeLog 979
+DIST Genshi-0.4.2.tar.bz2 228892 RMD160 e59547708d1f34b8c8394c6d6cd5e5252aa7e5f3 SHA1 6245451e3ee4b79b1c295fdac6d2d89c9ea9490f SHA256 6ac86d4c407bd10782c72264e3e8d4ac1a8a767146e03d79218aacceab10ca63
+EBUILD genshi-0.4.2.ebuild 990 RMD160 23b495ef01c8cecd384d2a41ca6aaa89172c362b SHA1 a21f34fed2c1d6d5f8e6407b83d1bfb7d72c47d1 SHA256 36b84c311c3cb5af797efb66b4a677f448572d209a7fbeb5b0422bd381296257
+MD5 7b3b5641794329aefe33ede1372dfb34 genshi-0.4.2.ebuild 990
+RMD160 23b495ef01c8cecd384d2a41ca6aaa89172c362b genshi-0.4.2.ebuild 990
+SHA256 36b84c311c3cb5af797efb66b4a677f448572d209a7fbeb5b0422bd381296257 genshi-0.4.2.ebuild 990
+MISC ChangeLog 1192 RMD160 69226920396f639294f24bae65a3a75593eceba0 SHA1 ec1beb0b71a3b800c3b2a6d9914273c5aa767cc8 SHA256 83d9959fa7c3b6b85cab9cd015af97d2642fdf79e79c5b98aad3b98046cb13e6
+MD5 0a990dae20028ab5f7bb4bb9c84e4ead ChangeLog 1192
+RMD160 69226920396f639294f24bae65a3a75593eceba0 ChangeLog 1192
+SHA256 83d9959fa7c3b6b85cab9cd015af97d2642fdf79e79c5b98aad3b98046cb13e6 ChangeLog 1192
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 a05573360faf5a24ce1a3826e6eaf38e files/digest-genshi-0.4 235
-RMD160 11900726ae8ef4ce490d938ef6456271c85aa97c files/digest-genshi-0.4 235
-SHA256 4d378f4740e04fed34836f0895bfbe07e80392e79ab515d2c6091aaca6f5e6ce files/digest-genshi-0.4 235
-MD5 6037c7f7d4f6c9e55ee84bd91165a262 files/digest-genshi-0.4.1 241
-RMD160 c0fae4e7bb7926906d5200cdb0352294ef7714ba files/digest-genshi-0.4.1 241
-SHA256 f254ff390a515ec98dbe2d025354a8fd0943917829c31ef219d91403c2b12a1d files/digest-genshi-0.4.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGUxhE96cFzIajWwkRAlF2AJwOcgrFGghhH7oNzd4Ex/juBQg84ACcCwV1
-gIp/At5QRQq40Vl1kmTV11w=
-=hqqE
------END PGP SIGNATURE-----
+MD5 292ab9244c90e7042183be6ac737f022 files/digest-genshi-0.4.2 241
+RMD160 f73c93863e5b92b73c29533c4c0d3a8e4fe8f981 files/digest-genshi-0.4.2 241
+SHA256 2f5475f2dffc98f7bc8c46eb1907159a05f90754355af54a417fbf7466d83025 files/digest-genshi-0.4.2 241
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"
-}
-