Drop revbump and fix stable ebuild directly.

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

3 files changed, 8 insertions, 60 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index b3fccb7bf988..092d0cbea104 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.133 2011/12/14 10:05:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.134 2011/12/14 10:33:31 floppym Exp $
+
+  14 Dec 2011; Mike Gilbert <floppym@gentoo.org> -psycopg-1.1.21-r1.ebuild,
+  psycopg-1.1.21.ebuild:
+  Drop revbump and fix stable ebuild directly.
 
 *psycopg-1.1.21-r1 (14 Dec 2011)
 
diff --git a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
deleted file mode 100644
index a28471ca8c64..000000000000
--- a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/12/14 10:05:25 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit python
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://www.initd.org/software/psycopg"
-SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/egenix-mx-base-2.0.3
-	dev-db/postgresql-base"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix for bug #134873
-	sed -e '1245s/static //' -i cursor.c
-
-	sed -e 's:$(PY_MOD_DIR):$(D)&/$$mod:' -i Makefile.pre.in
-
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		econf \
-			--with-mxdatetime-includes="$(python_get_includedir)/mx" \
-			--with-postgres-includes="/usr/include/postgresql/server" || return 1
-		sed -e 's:$(BLDSHARED):& $(LDFLAGS):' -i Makefile
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install () {
-	python_src_install
-
-	dodoc AUTHORS ChangeLog CREDITS README NEWS RELEASE-1.0 SUCCESS TODO
-	docinto doc
-	dodoc doc/python-taylor.txt doc/README
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/examples/*
-}
diff --git a/dev-python/psycopg/psycopg-1.1.21.ebuild b/dev-python/psycopg/psycopg-1.1.21.ebuild
index 9f6fff3f5417..cbe78b16d8c5 100644
--- a/dev-python/psycopg/psycopg-1.1.21.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.18 2010/11/21 12:17:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.19 2011/12/14 10:33:31 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -50,7 +50,7 @@ src_install () {
 
 	dodoc AUTHORS ChangeLog CREDITS README NEWS RELEASE-1.0 SUCCESS TODO
 	docinto doc
-	dodoc doc/*
+	dodoc doc/python-taylor.txt doc/README
 	insinto /usr/share/doc/${PF}/examples
 	doins doc/examples/*
 }