version bumps, bug #169030 and #206507

Package-Manager: portage-2.1.4.4

8 files changed, 107 insertions, 23 deletions

diff --git a/dev-python/quixote/ChangeLog b/dev-python/quixote/ChangeLog
index ecce998b562b..514ed906ede3 100644
--- a/dev-python/quixote/ChangeLog
+++ b/dev-python/quixote/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/quixote
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/ChangeLog,v 1.22 2008/01/17 18:38:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/ChangeLog,v 1.23 2008/02/23 23:04:32 hollow Exp $
+
+*quixote-2.5 (23 Feb 2008)
+*quixote-1.2 (23 Feb 2008)
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  quixote-0.6.1.ebuild, quixote-1.0.ebuild, +quixote-1.2.ebuild,
+  quixote-2.4.ebuild, +quixote-2.5.ebuild:
+  version bumps, bug #169030 and #206507
 
   17 Jan 2008; Fabian Groffen <grobian@gentoo.org> quixote-1.0.ebuild,
   quixote-2.4.ebuild:
diff --git a/dev-python/quixote/Manifest b/dev-python/quixote/Manifest
index 8593e430df15..38be55651857 100644
--- a/dev-python/quixote/Manifest
+++ b/dev-python/quixote/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Quixote-0.6.1.tar.gz 194802 RMD160 52def6034a87d8a8c5836b46259472ba3e0fadeb SHA1 dc7c74db444c3a53b866767a9799dbe4b9c535dd SHA256 47c71b895b0de8585db269b1775cbb0d7b555f62f857ef4e2e02011afd687162
 DIST Quixote-1.0.tar.gz 192523 RMD160 6a8cbba37bfc8dd1a5a5e61a6f7ca71d83f2cf53 SHA1 42ad06860712005ea9eb7af4f56ccae6391b42da SHA256 aea2ab2f1e0032d88e9384c7e8a31198d77cf023640c3b80f9016080826e422f
+DIST Quixote-1.2.tar.gz 193427 RMD160 bac7cde88f8154cb25069f6c85958341dd9fd7cf SHA1 47149d5c1bf755cad46e54fe64dd3842351c3d60 SHA256 0db162390e8f82f5a49a8489cd297cf76102c4a7202562a7a1b58fd8558be34b
 DIST Quixote-2.4.tar.gz 192388 RMD160 628f0f601740d754df645273bb7b73aba1489825 SHA1 539fefbcc2afc46192f6b7950de24d2d59d8b036 SHA256 a44acc9e7ec6610f057b216f2382b0267d419166619d472484b1961cadb04a21
-EBUILD quixote-0.6.1.ebuild 753 RMD160 ae9a5a756d4e4b3f6470973cd3e987f0c8ed92fd SHA1 a45017f270f1d74ee369878c4f371e91f9a219dc SHA256 bf8d24870bcc4fc5c2ad737582b4342adc622cba31ffcd30d7a70f003fbab59d
-EBUILD quixote-1.0.ebuild 747 RMD160 80bdbda126981569588f9c6ca871d2c4c5dbbdf2 SHA1 e461fef6bdef571d1a430c4fbfeab4e3dc953b1e SHA256 946b2669300fd01b93438f8db36e118368cc068bf3e5d1adb58391382ab31709
-EBUILD quixote-2.4.ebuild 697 RMD160 48db5fd3e3845e67d4f089569e681987f0b2a56b SHA1 7abb014bc1840c676c7df240c8bca2e981bfd6a1 SHA256 1c61c53e23c018d5af8a32c7f4c672dbd7e85fce0b7383bac38b042ca5be98b8
-MISC ChangeLog 3256 RMD160 6cc05e4084ec50a703967e9503622185b1359623 SHA1 cc595ddd1092724e4dc2baa71600d8b2082a65ac SHA256 7a8329871f8aaac5f9e4b473503104d909d9f41b3e121aa2c6c276dc2c7703f1
-MISC metadata.xml 181 RMD160 a18c51c0b1a258a448902e366264b24157b6d034 SHA1 4c10547cee73f6e539015cb86790d3cf5d31e51e SHA256 e96c16aa9d6cdacd2820b31f002a46f8855a1cc00c59f1f1348bcaac3a2ea390
+DIST Quixote-2.5.tar.gz 176192 RMD160 6365e139d0fdb2a4f38ed06a6a5b399825e480e9 SHA1 48bdfb91c26d01f1e7e2aa2a9791fcd67d65104a SHA256 03cedc25f3f5ee85cc3da63c4eb6a694e06e9fc40067797748d3fb4005f99ed1
+EBUILD quixote-0.6.1.ebuild 717 RMD160 7cac6db87cfa1a2eae56ff1de7db91a53ce78909 SHA1 0b3dcec3485cde4834e4fa04eeaeea10d2ccf63d SHA256 d5cc2cbe88880f5df894b7434da1432b3053bf78cfa2c27ab0168fe72f0f4914
+EBUILD quixote-1.0.ebuild 669 RMD160 d3b2ec18653b05b81ee0869fb3e8ed1f8ccd72e9 SHA1 84d98e661136e216901dc4ed5a287ea21d758618 SHA256 aa301a0a7c5cf30cdcb293b6872c54ad3dac2126b8453a1d1b0827f3a3cf6cf7
+EBUILD quixote-1.2.ebuild 676 RMD160 6c73f11d6004eeea53e69a36716448f9aa478e95 SHA1 516f4f8af2aa1c1d15a6f8ed0f208a794e7343f2 SHA256 98832d3d658f983ded03079a8c74642301bc4c30c169c3baf94f9284880f0080
+EBUILD quixote-2.4.ebuild 649 RMD160 6de78ca3b3f72b45909a827ae4080063fe859b74 SHA1 4231201c4dfffb431d47b8d20ee08c18f49a9eed SHA256 f5db5975fca501df240228901252611836a6e30d7ea053c2865069b3bba4b9df
+EBUILD quixote-2.5.ebuild 649 RMD160 c33e76ce67c26c7a10ab17984c6d1cdb52179fab SHA1 9f067dcae73dc94b3a82bbefef0c31df55bbdb53 SHA256 d3f12ee966ffa36f2d092959f11f18ec52fdcd4e438f144fabd82ab6a877a863
+MISC ChangeLog 3524 RMD160 67e514415fb2edf9558037bf64e8893457c5739c SHA1 5a890872be0a40088d1655c29a444e9a8fcf061c SHA256 9636e8d4cac4781c8904fc807b8feaf43a224b9e6d0b72c05b62271fa04a0058
+MISC metadata.xml 183 RMD160 941e443c399a375de5f4c4d00dc76dd75d3a26f3 SHA1 152b186082211b59aa104f43e5af23ad7373a4ca SHA256 aa31bee8f91e1695ed9e7fd6b5d7fce119a5211d720ea979ea932f37f6e73775
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfApokACgkQmPFBzbX68WE7QwCeMQJ9F9jvu5X1dMyM0iMWjT6s
+L7kAn0sz/Zie3Sh3SET1vpb32PBLbdnl
+=iBVJ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/quixote/metadata.xml b/dev-python/quixote/metadata.xml
index 8178b028e752..8dd6d62f0de2 100644
--- a/dev-python/quixote/metadata.xml
+++ b/dev-python/quixote/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<herd>python</herd>
+	<herd>python</herd>
+	<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/dev-python/quixote/quixote-0.6.1.ebuild b/dev-python/quixote/quixote-0.6.1.ebuild
index 4a6be3651db4..352b2dd3c598 100644
--- a/dev-python/quixote/quixote-0.6.1.ebuild
+++ b/dev-python/quixote/quixote-0.6.1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-0.6.1.ebuild,v 1.7 2007/07/05 01:22:01 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-0.6.1.ebuild,v 1.8 2008/02/23 23:04:32 hollow Exp $
 
 inherit distutils
 
-PN0="Quixote"
+MY_P=${P/q/Q}
+
 DESCRIPTION="Python HTML templating framework for developing web applications."
-HOMEPAGE="http://www.mems-exchange.org/software/quixote/"
-SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${PN0}-${PV}.tar.gz"
+HOMEPAGE="http://quixote.ca"
+SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="CNRI"
 SLOT="0"
@@ -15,7 +16,8 @@ KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2"
-S=${WORKDIR}/${PN0}-${PV}
+
+S="${WORKDIR}"/${MY_P}
 
 src_install() {
 	DOCS="ACKS CHANGES"
diff --git a/dev-python/quixote/quixote-1.0.ebuild b/dev-python/quixote/quixote-1.0.ebuild
index 5ac99712aa95..6916c99e6fb1 100644
--- a/dev-python/quixote/quixote-1.0.ebuild
+++ b/dev-python/quixote/quixote-1.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-1.0.ebuild,v 1.7 2008/01/17 18:38:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-1.0.ebuild,v 1.8 2008/02/23 23:04:32 hollow Exp $
 
 inherit distutils
 
 MY_P=${P/q/Q}
+
 DESCRIPTION="Python HTML templating framework for developing web applications."
-HOMEPAGE="http://www.mems-exchange.org/software/quixote/"
-SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://quixote.ca"
+SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
 
 LICENSE="CNRI"
 SLOT="0"
@@ -15,14 +16,14 @@ KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2"
-S=${WORKDIR}/${MY_P}
+
+S="${WORKDIR}"/${MY_P}
 
 src_install() {
 	DOCS="ACKS CHANGES"
 	distutils_src_install
 	dodoc doc/*.txt
 	dohtml doc/*.html
-	dodir /usr/share/${PN}/demo
 	insinto /usr/share/${PN}/demo
 	doins demo/*
 }
diff --git a/dev-python/quixote/quixote-1.2.ebuild b/dev-python/quixote/quixote-1.2.ebuild
new file mode 100644
index 000000000000..36890d9dd12d
--- /dev/null
+++ b/dev-python/quixote/quixote-1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-1.2.ebuild,v 1.1 2008/02/23 23:04:32 hollow Exp $
+
+inherit distutils
+
+MY_P=${P/q/Q}
+
+DESCRIPTION="Python HTML templating framework for developing web applications."
+HOMEPAGE="http://quixote.ca"
+SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2"
+
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	DOCS="ACKS CHANGES"
+	distutils_src_install
+	dodoc doc/*.txt
+	dohtml doc/*.html
+	insinto /usr/share/${PN}/demo
+	doins demo/*
+}
diff --git a/dev-python/quixote/quixote-2.4.ebuild b/dev-python/quixote/quixote-2.4.ebuild
index 846a9793ae56..5c1e9d3d2eae 100644
--- a/dev-python/quixote/quixote-2.4.ebuild
+++ b/dev-python/quixote/quixote-2.4.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-2.4.ebuild,v 1.5 2008/01/17 18:38:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-2.4.ebuild,v 1.6 2008/02/23 23:04:32 hollow Exp $
 
 inherit distutils
 
 MY_P=${P/q/Q}
+
 DESCRIPTION="Python HTML templating framework for developing web applications."
-HOMEPAGE="http://www.mems-exchange.org/software/quixote/"
-SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://quixote.ca"
+SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
+
 LICENSE="CNRI-QUIXOTE-2.4"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
+
 DEPEND=">=dev-lang/python-2.3"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_install() {
 	DOCS="ACKS CHANGES"
diff --git a/dev-python/quixote/quixote-2.5.ebuild b/dev-python/quixote/quixote-2.5.ebuild
new file mode 100644
index 000000000000..b565cf0d3257
--- /dev/null
+++ b/dev-python/quixote/quixote-2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-2.5.ebuild,v 1.1 2008/02/23 23:04:32 hollow Exp $
+
+inherit distutils
+
+MY_P=${P/q/Q}
+
+DESCRIPTION="Python HTML templating framework for developing web applications."
+HOMEPAGE="http://quixote.ca"
+SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
+
+LICENSE="CNRI-QUIXOTE-2.4"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	DOCS="ACKS CHANGES"
+	distutils_src_install
+	dodoc doc/*.txt
+	dohtml doc/*.html
+}