Version bump.

Package-Manager: portage-14819-svn/cvs/Linux x86_64

7 files changed, 23 insertions, 125 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/Manifest b/dev-python/psycopg/Manifest
index fd8d2419d8a9..8526e1dae56c 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,16 +1,10 @@
 AUX psycopg-2.0.12-setup.py.patch 412 RMD160 e41c9f6c00225ad9a498bf76768ec77c7fe0d6ed SHA1 a03211413db7aaf85283092684af280092d2cca9 SHA256 adf69fd37c12e2d6fe39fd9a785535108d409486835e2750430f97f4cb26c65d
-AUX psycopg-2.0.2-nodebug.patch 586 RMD160 c88f48fbfef3f8dfccea8ea9974964cc80615a33 SHA1 8b6822d843b376b4e2c00fae665d483a99292e2d SHA256 22cba939b6ea8490f7909577e9ccb8f4ed1f13fcd706bbe85668c36decf4d833
-AUX psycopg-2.0.8-fbsd.patch 458 RMD160 ba53af498a147c9ef1c565d462bce378a585558d SHA1 76e8555b952d56cceaec0b437e921a0534243f43 SHA256 404ffd9aae85776a915261bef14ef2c988042de29bd915600c6b4b711d8e3e28
 AUX psycopg-2.0.9-round-solaris.patch 449 RMD160 1915c539e6ed5341d4b198e404a97a2953edfc79 SHA1 837d650b0c296df3a80b0d6771cdaf2b1f8ba9cf SHA256 d7334adca500aea1b09d3ee809cedb0c719659db95398175f4354939e2dd5b55
 DIST psycopg-1.1.21.tar.gz 213753 RMD160 de74a70b16353f69de7e898059a7a1d8418ad2ee SHA1 02d8a8b5dd682306117896c7c63a9a1b518997b6 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240
-DIST psycopg2-2.0.11.tar.gz 255260 RMD160 dafa3946d9b7809e9f1846c5a43c08532e25d025 SHA1 0fc77b16b48f2c6c53c4f21e333eee1b9c2c33bb SHA256 e6b4e0e41df97441eff34e00065376414da6488e0d55848a45cd77551dbae434
 DIST psycopg2-2.0.12.tar.gz 256169 RMD160 eff28c1ab131ee55b42e0c129df88cebd79f38fd SHA1 a5649fced3ffc9968b21421023239f95a3a21ad3 SHA256 542c187531e756867fb60034c393b6f2beca34eeeb3ce2e0089a2b6fb8be1292
-DIST psycopg2-2.0.2.tar.gz 279200 RMD160 8a56c952eda241ebc000bd9455c3482ee5890345 SHA1 94c37b6cfdc7fa40cf5c9b4e1b6d2b774f7b1ee2 SHA256 544f8ee7a84cd8312d688a15c16f92129bcc7139e1d814c3602a448d969f0454
-DIST psycopg2-2.0.8.tar.gz 248072 RMD160 98ccf8f77b0f46d45e2510498924160fb5339eac SHA1 13d2be67e0d487266d770484f59ea5446f8d6ec5 SHA256 57d7d1589c9aa37f7b34ffb69e30765092bccc68270870c8e80977a6fc7f078f
+DIST psycopg2-2.0.13.tar.gz 258399 RMD160 6099f593ea1f05b78b6f2c3c4106b86cbcab7386 SHA1 859725d0c830dc3590cb5666c8465bd29ab167cc SHA256 a15e622e101b16aa8ad44813d8fb1eced91379396c054aacbfa3ad658352332b
 EBUILD psycopg-1.1.21.ebuild 1311 RMD160 ed7872e133ab7a3ab0acd29c25306b75051608f6 SHA1 29945934854d3cc3c8643a73025ec688e82a22c7 SHA256 81bbdd4f1ee242c87981e9da252f7c6bacc4967450be5868e11caf6cf8f52a81
-EBUILD psycopg-2.0.11.ebuild 1156 RMD160 379da72412b3da0cda1eedc6474e3608ceb3f7a3 SHA1 56799cc6672b9807902cf0edd865b77ee4e77242 SHA256 38f7591da490240ddf036df43d4de9f6da5b58eafe01f9a3d860723389510b65
 EBUILD psycopg-2.0.12.ebuild 1369 RMD160 edddc080346fb8acdd81138fa9dfb97036bb8ff2 SHA1 396eb912f011806188fd932243cd305400c84787 SHA256 8e812b08bd63568facd69c18c9354ecd147514595642810470e0ee7a1702705d
-EBUILD psycopg-2.0.2.ebuild 839 RMD160 c203b99408ba1448f7b36df06a169aeb076a9fe6 SHA1 28065797fa27cc26414d5efb16ec49e32dc03106 SHA256 121e04aa9edf94366a07d55400dee2b2d387a5723a099f45cad33185d7e61fcf
-EBUILD psycopg-2.0.8.ebuild 1230 RMD160 c057f347a67d324d7ed256b4e3706e337e63713b SHA1 d774d980918da78b5562a6ab243ee209960fa2c8 SHA256 c57d5e93acf862a54e3a8118deb6d5578ad5994c525af8069c3031326d9a1078
-MISC ChangeLog 11644 RMD160 ba69b8277db88747a2d289eceefe7db47feb5be2 SHA1 017ba19c8124c1d40dd176cd4e5fd53646f1a706 SHA256 278143ff5be126a7dc9758f9f8f3c22a304da02182d4dc0264bae6651e91bb0b
+EBUILD psycopg-2.0.13.ebuild 1365 RMD160 55dc43136692f23115541f37fc4889a4a4eb4515 SHA1 ac07926531df0fda0576eed71c6030eb9e965210 SHA256 12016b713bab95bf3da5ae1e9244925fedfd32ba9e3500e64498e778f56f41c1
+MISC ChangeLog 11935 RMD160 954cc8e1fb851d7300740d4f0b39c0d2057d004f SHA1 cd1e4f8335e254e60fb47afdd34a79134dfd6f27 SHA256 be11c241f3e64a28ff2bf91b829a7a7e650609c1a599c39b7f379da2cca63fc3
 MISC metadata.xml 291 RMD160 317ee3d63279acd6a3cbf6ef622d4b77a2044036 SHA1 0c71c2432c961aa486238f5de43d08d0696d8341 SHA256 9a4e3c2e6caca640df7a6d7b8accbdde21f715f0c98dc6bb09735b5463da7ad9
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 .
-}