Version bump.

(Portage version: 14819-svn/cvs/Linux x86_64)

6 files changed, 20 insertions, 116 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index c2aa361f92c2..8a73d23d6ee8 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.88 2009/11/11 14:35:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.89 2009/11/13 00:37:35 arfrever Exp $
+
+*psycopg-2.0.13 (13 Nov 2009)
+
+  13 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -psycopg-2.0.2.ebuild, -files/psycopg-2.0.2-nodebug.patch,
+  -psycopg-2.0.8.ebuild, -files/psycopg-2.0.8-fbsd.patch,
+  -psycopg-2.0.11.ebuild, +psycopg-2.0.13.ebuild:
+  Version bump.
 
   11 Nov 2009; Fabian Groffen <grobian@gentoo.org> psycopg-2.0.12.ebuild:
   Marked ~x64-macos, thanks Matt Michalowski, bug #291936
diff --git a/dev-python/psycopg/files/psycopg-2.0.2-nodebug.patch b/dev-python/psycopg/files/psycopg-2.0.2-nodebug.patch
deleted file mode 100644
index 99a70b0fc2be..000000000000
--- a/dev-python/psycopg/files/psycopg-2.0.2-nodebug.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- psycopg2-2.0.2/setup.cfg.orig   2006-07-25 15:38:03.658499592 -0500
-+++ psycopg2-2.0.2/setup.cfg	2006-07-25 15:38:11.098395098 -0500
-@@ -1,5 +1,5 @@
- [build_ext]
--define=PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,PSYCOPG_NEW_BOOLEAN,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3,PSYCOPG_DEBUG
-+define=PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,PSYCOPG_NEW_BOOLEAN,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3
- # PSYCOPG_EXTENSIONS enables extensions to PEP-249 (you really want this)
- # PSYCOPG_DISPLAY_SIZE enable display size calculation (a little slower)
- # HAVE_PQFREEMEM should be defined on PostgreSQL >= 7.3
diff --git a/dev-python/psycopg/files/psycopg-2.0.8-fbsd.patch b/dev-python/psycopg/files/psycopg-2.0.8-fbsd.patch
deleted file mode 100644
index cfacfe67ab9f..000000000000
--- a/dev-python/psycopg/files/psycopg-2.0.8-fbsd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- psycopg/config.h.orig       2008-09-16 09:54:26.000000000 -0600
-+++ psycopg/config.h            2008-09-16 09:55:26.000000000 -0600
-@@ -129,7 +129,7 @@
- #define inline
- #endif
- 
--#if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
-+#if (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
- /* what's this, we have no round function either? */
- static double round(double num)
- {
diff --git a/dev-python/psycopg/psycopg-2.0.11.ebuild b/dev-python/psycopg/psycopg-2.0.13.ebuild
index 0c61e8d1f144..ed78393851ca 100644
--- a/dev-python/psycopg/psycopg-2.0.11.ebuild
+++ b/dev-python/psycopg/psycopg-2.0.13.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.11.ebuild,v 1.7 2009/09/07 13:55:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.13.ebuild,v 1.1 2009/11/13 00:37:35 arfrever Exp $
 
-NEED_PYTHON="2.4"
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils
+inherit distutils eutils
 
 MY_P=${PN}2-${PV}
 
@@ -12,21 +13,23 @@ DESCRIPTION="PostgreSQL database adapter for Python."
 SRC_URI="http://initd.org/pub/software/psycopg/${MY_P}.tar.gz"
 HOMEPAGE="http://initd.org/projects/psycopg2"
 SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 LICENSE="GPL-2"
 IUSE="debug doc examples mxdatetime"
 
 DEPEND=">=virtual/postgresql-base-8.1
 	mxdatetime? ( dev-python/egenix-mx-base )"
 RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
 
 S=${WORKDIR}/${MY_P}
 
-PYTHON_MODNAME=${PN}2
+PYTHON_MODNAME="${PN}2"
+DOCS="AUTHORS doc/HACKING doc/SUCCESS doc/TODO doc/async.txt"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.12-setup.py.patch"
+	epatch "${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
 
 	if use debug; then
 		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die "sed failed"
@@ -38,7 +41,6 @@ src_unpack() {
 }
 
 src_install() {
-	DOCS="AUTHORS doc/HACKING doc/SUCCESS doc/TODO doc/async.txt"
 	distutils_src_install
 
 	insinto /usr/share/doc/${PF}
diff --git a/dev-python/psycopg/psycopg-2.0.2.ebuild b/dev-python/psycopg/psycopg-2.0.2.ebuild
deleted file mode 100644
index 8233c5f03272..000000000000
--- a/dev-python/psycopg/psycopg-2.0.2.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/psycopg/psycopg-2.0.2.ebuild,v 1.12 2008/08/06 19:57:29 neurogeek Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="PostgreSQL database adapter for Python."
-SRC_URI="http://initd.org/pub/software/psycopg/${PN}2-${PV}.tar.gz"
-HOMEPAGE="http://initd.org/projects/psycopg2"
-
-DEPEND=">=dev-lang/python-2.4
-	>=virtual/postgresql-base-7.4"
-
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-LICENSE="GPL-2"
-IUSE="debug"
-
-S=${WORKDIR}/${PN}2-${PV}
-
-DOCS="AUTHORS ChangeLog CREDITS README"
-
-src_unpack() {
-	unpack ${A}
-	if ! use debug; then
-		epatch "${FILESDIR}/${P}"-nodebug.patch
-	fi
-}
-
-src_install () {
-	distutils_src_install
-	insinto /usr/share/doc/${PF}/examples
-	doins   examples/*
-}
diff --git a/dev-python/psycopg/psycopg-2.0.8.ebuild b/dev-python/psycopg/psycopg-2.0.8.ebuild
deleted file mode 100644
index e7ad79cb5cd8..000000000000
--- a/dev-python/psycopg/psycopg-2.0.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.8.ebuild,v 1.5 2009/05/07 14:16:41 fauli Exp $
-
-NEED_PYTHON=2.4
-
-inherit eutils distutils
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="PostgreSQL database adapter for Python."
-SRC_URI="http://initd.org/pub/software/psycopg/${MY_P}.tar.gz"
-HOMEPAGE="http://initd.org/projects/psycopg2"
-SLOT="2"
-KEYWORDS="alpha ~amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-IUSE="debug doc examples mxdatetime"
-
-DEPEND="virtual/postgresql-base
-	mxdatetime? ( dev-python/egenix-mx-base )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_MODNAME=${PN}2
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die "sed failed"
-	fi
-
-	if use mxdatetime; then
-		sed -i 's/\(use_pydatetime=\)1/\10/' setup.cfg || die "sed failed"
-	fi
-
-	# Fixes compilation issue in fbsd.
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
-
-src_install() {
-	DOCS="AUTHORS doc/HACKING doc/SUCCESS doc/TODO doc/async.txt"
-	distutils_src_install
-
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r examples
-
-	cd doc
-	use doc && dohtml -r .
-}