version bump stable version, and introduce development version that is hard masked

Package-Manager: portage-2.0.53_rc7

7 files changed, 93 insertions, 10 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index 7a7b3a554f94..59184d90808f 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.28 2005/09/02 20:13:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.29 2005/11/06 01:32:06 liquidx Exp $
+
+*psycopg-2.0_beta5 (06 Nov 2005)
+*psycopg-1.1.21 (06 Nov 2005)
+
+  06 Nov 2005; Alastair Tse <liquidx@gentoo.org> psycopg-1.1.18.ebuild,
+  +psycopg-1.1.21.ebuild, +psycopg-2.0_beta5.ebuild:
+  version bump stable version, and also introduce hard-masked development
+  version.
 
   02 Sep 2005; <dang@gentoo.org> psycopg-1.1.18.ebuild:
   Marked ~amd64
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 1b4e3930ade4..e63359675943 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cbb87716199f2cec08b60677ae3ba26f psycopg-1.1.18.ebuild 1241
-MD5 361cb771c24b78365c12d537bc254d35 psycopg-1.1.15.ebuild 1233
-MD5 ca39e3d6849f0433fd9ef054f460ef64 ChangeLog 3704
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 2fae6247e783452341aa2e1046cace34 ChangeLog 3982
 MD5 8ebd6298fe5d6837e93909612aecf857 files/digest-psycopg-1.1.15 66
 MD5 54e5dba3d18c0154107fc72b20fdb16c files/digest-psycopg-1.1.18 66
+MD5 9d8d5b9e83c27d9aaa657531bc0fd326 files/digest-psycopg-1.1.21 66
+MD5 ad48f20eabd11d29c2c865e4f1dcf3d2 files/digest-psycopg-2.0_beta5 66
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 361cb771c24b78365c12d537bc254d35 psycopg-1.1.15.ebuild 1233
+MD5 534166d220b32935356e18070f34eaec psycopg-1.1.18.ebuild 1243
+MD5 754f0c3b59e031b5eeaf9b2d33cd076b psycopg-1.1.21.ebuild 1244
+MD5 91488878128e027bf5edfac937bbe142 psycopg-2.0_beta5.ebuild 755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDGLKlomPajV0RnrERAhMyAJwJ40DgucPdzu7h2T/T+K9XgDHUwACfQNXe
-gEgybKoX5Q3gHKGGhyT97to=
-=F0X7
+iD8DBQFDbV059ZFPrqoILX8RAiiEAJ93vTk2P13ddtVSY7IqcEyfPfhKwwCfd9Al
+ZKLPvWXmwstDT6tqxXOj+jY=
+=Jj07
 -----END PGP SIGNATURE-----
diff --git a/dev-python/psycopg/files/digest-psycopg-1.1.21 b/dev-python/psycopg/files/digest-psycopg-1.1.21
new file mode 100644
index 000000000000..dc8ec82d24df
--- /dev/null
+++ b/dev-python/psycopg/files/digest-psycopg-1.1.21
@@ -0,0 +1 @@
+MD5 a31f79f68d6d32898d6f24e11369a106 psycopg-1.1.21.tar.gz 213753
diff --git a/dev-python/psycopg/files/digest-psycopg-2.0_beta5 b/dev-python/psycopg/files/digest-psycopg-2.0_beta5
new file mode 100644
index 000000000000..f3c718a6baaf
--- /dev/null
+++ b/dev-python/psycopg/files/digest-psycopg-2.0_beta5
@@ -0,0 +1 @@
+MD5 42a935fbd2f32111bed98c6f955f201e psycopg2-2.0b5.tar.gz 174787
diff --git a/dev-python/psycopg/psycopg-1.1.18.ebuild b/dev-python/psycopg/psycopg-1.1.18.ebuild
index f51ebd7f752d..275fe64d1ee6 100644
--- a/dev-python/psycopg/psycopg-1.1.18.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.18.ebuild,v 1.3 2005/09/02 20:13:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.18.ebuild,v 1.4 2005/11/06 01:32:06 liquidx Exp $
 
 inherit python
 
@@ -13,7 +13,7 @@ DEPEND="virtual/python
 	>=dev-db/postgresql-7.1.3"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc x86"
 LICENSE="GPL-2"
 IUSE=""
 
diff --git a/dev-python/psycopg/psycopg-1.1.21.ebuild b/dev-python/psycopg/psycopg-1.1.21.ebuild
new file mode 100644
index 000000000000..2f10912d5d31
--- /dev/null
+++ b/dev-python/psycopg/psycopg-1.1.21.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.1 2005/11/06 01:32:06 liquidx Exp $
+
+inherit python
+
+DESCRIPTION="PostgreSQL database adapter for the Python" # best one
+SRC_URI="http://initd.org/pub/software/psycopg/${P}.tar.gz"
+HOMEPAGE="http://www.initd.org/software/psycopg"
+
+DEPEND="virtual/python
+	>=dev-python/egenix-mx-base-2.0.3
+	>=dev-db/postgresql-7.1.3"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+IUSE=""
+
+src_compile() {
+	python_version
+	econf \
+		--with-mxdatetime-includes=/usr/lib/python${PYVER}/site-packages/mx/DateTime/mxDateTime \
+		--with-postgres-includes=/usr/include/postgresql/server \
+		|| die "./configure failed"
+	emake || die
+}
+
+src_install () {
+	cd ${S}
+	sed -e 's:\(echo "  install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${D}\2/$$mod\3:' \
+		-e 's:\($(INSTALL)  -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${D}\2/$$mod\3:' \
+		-i Makefile
+	make install || die
+
+	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL README NEWS RELEASE-1.0 SUCCESS TODO
+	docinto doc
+	dodoc   doc/*
+	insinto /usr/share/doc/${PF}/examples
+	doins   doc/examples/*
+}
diff --git a/dev-python/psycopg/psycopg-2.0_beta5.ebuild b/dev-python/psycopg/psycopg-2.0_beta5.ebuild
new file mode 100644
index 000000000000..aced9cc96b52
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.0_beta5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0_beta5.ebuild,v 1.1 2005/11/06 01:32:06 liquidx Exp $
+
+inherit distutils
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="PostgreSQL database adapter for the Python."
+SRC_URI="http://initd.org/pub/software/psycopg/${PN}2-${MY_PV}.tar.gz"
+HOMEPAGE="http://initd.org/projects/psycopg2"
+
+DEPEND=">=dev-lang/python-2.4
+	>=dev-db/postgresql-7.1.3"
+
+SLOT="2"
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+IUSE=""
+
+S=${WORKDIR}/${PN}2-${MY_PV}
+
+DOCS="AUTHORS ChangeLog COPYING CREDITS INSTALL README NEWS docs/*"
+
+src_install () {
+	distutils_src_install
+	insinto /usr/share/doc/${PF}/examples
+	doins   doc/examples/*
+}