Fixing installation of docs, removing old

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 23 insertions, 44 deletions

diff --git a/dev-python/werkzeug/ChangeLog b/dev-python/werkzeug/ChangeLog
index 4144cc9deff0..559447fc6610 100644
--- a/dev-python/werkzeug/ChangeLog
+++ b/dev-python/werkzeug/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/werkzeug
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/ChangeLog,v 1.3 2008/07/20 13:31:12 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/ChangeLog,v 1.4 2008/08/04 12:02:26 hoffie Exp $
+
+*werkzeug-0.3.1-r1 (04 Aug 2008)
+
+  04 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -werkzeug-0.2.ebuild,
+  -werkzeug-0.3.1.ebuild, +werkzeug-0.3.1-r1.ebuild:
+  Fixing installation of docs (they went to /usr/docs/ directly), cleaning
+  old
 
 *werkzeug-0.3.1 (20 Jul 2008)
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 30805346a1f1..3f258565b301 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST Werkzeug-0.2.tar.gz 139010 RMD160 abbf3d7ce45dfd745251f94d29b145be0dea5033 SHA1 80b1c51813f52818d6a779e5401b131374c0f53e SHA256 5c0bfcc1b2539d348ea3a6353a699fc7861bc9b2c4082b4a471be40720b843b3
 DIST Werkzeug-0.3.1.tar.gz 581629 RMD160 25503269a4eeae624c6ba259d1251ec4922240a5 SHA1 79752e3eb2da1810e867d87832363efeddd33709 SHA256 b148bf58be3eadc0d128a959b14a4b629c6185eb02de3fdc39b32c03ce680e53
-EBUILD werkzeug-0.2.ebuild 809 RMD160 828d3e33240ebf5257130796d02a44c7b35dd6c3 SHA1 201cc58a0393255e809b04187ac7c84f8ae61a99 SHA256 34558fc7000372b438966d0aa1633441d0eda4ddd19534f2d34bdd7dbc762387
-EBUILD werkzeug-0.3.1.ebuild 809 RMD160 86d700c61a7d98865c6e0341d3c6d5cbcc982afd SHA1 30e429d3ea3891198d067737cc2390fb1f464dab SHA256 e4f58e806a0df2e3f6592c4735fa1f68c2936e469e689595c18fc2afb3e7a215
-MISC ChangeLog 737 RMD160 018e1993c7f6c92cdcb7870edf993599fbce97fd SHA1 efbab26eea08798cd536caa7514d280de0fcb94e SHA256 b3a92c2fae91c50dd3081a8984342cd4ba8b95a5e019355499e9665ff1308b9e
+EBUILD werkzeug-0.3.1-r1.ebuild 940 RMD160 299a6935e551ed2239baf2bf027d8ea94bdd7274 SHA1 c55b384184fe063f3c302ae71085727df8f22628 SHA256 533d1c374789899c68d7b650fbf0359f92e8c2646e77356aafa1cff9320970ad
+MISC ChangeLog 982 RMD160 ccbf8955263474e69ca5b15e307dc19932f77533 SHA1 80e5752ef68c373dc1688a38761601604bdd8438 SHA256 d409038cc89a4b3db03c1961277febaa82db45a683a0b0927947d5c9dd575bb1
 MISC metadata.xml 221 RMD160 94ba04938aeae695e3489291391ed803a7b24fbf SHA1 7dab0a51d3f7802265942a1120b8aca3ab6b5ef9 SHA256 58bcee3b5f820e8d5e913a39b7e8c9c554abfea9f56bc31030b52f6be60e19ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiDPioACgkQV6E0EIywUuVxLACgqee7Z4u0wORXepbh8lsRLYmo
-y7YAn1MN4sTY0h2zVBQSlcRV+2Tgnjc8
-=4vA3
+iEYEARECAAYFAkiW79sACgkQV6E0EIywUuWSOQCg0gY88h1+q6gMkwRaZCGDX9d6
+4J4An2Uaif5bCKfo7FzpJP7hK5HPbnI9
+=B0Gs
 -----END PGP SIGNATURE-----
diff --git a/dev-python/werkzeug/werkzeug-0.2.ebuild b/dev-python/werkzeug/werkzeug-0.3.1-r1.ebuild
index 24b526ae92bc..28f3095c64d8 100644
--- a/dev-python/werkzeug/werkzeug-0.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.2.ebuild,v 1.2 2008/03/15 23:23:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.3.1-r1.ebuild,v 1.1 2008/08/04 12:02:26 hoffie Exp $
 
 NEED_PYTHON="2.4"
 
@@ -24,7 +24,15 @@ DEPEND=">=dev-python/setuptools-0.6_rc5
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS="CHANGES"
+src_install() {
+	DOCS="CHANGES"
+	distutils_src_install
+
+	# Rearraning the docs
+	rm -rf "${D}/usr/docs"
+	dodoc docs/src/*
+	dohtml docs/html/*
+}
 
 src_test() {
 	distutils_python_version
diff --git a/dev-python/werkzeug/werkzeug-0.3.1.ebuild b/dev-python/werkzeug/werkzeug-0.3.1.ebuild
deleted file mode 100644
index 0e15629fc3bc..000000000000
--- a/dev-python/werkzeug/werkzeug-0.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.3.1.ebuild,v 1.1 2008/07/20 13:31:12 hoffie Exp $
-
-NEED_PYTHON="2.4"
-
-inherit distutils
-
-MY_P="Werkzeug-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/"
-SRC_URI="http://pypi.python.org/packages/source/W/Werkzeug/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND=">=dev-python/setuptools-0.6_rc5
-	test? ( dev-python/py
-		dev-python/lxml
-		dev-python/simplejson )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_test() {
-	distutils_python_version
-	# path gets set correctly in conftest.py
-	cd tests
-	py.test || die "tests failed"
-}