Removed old version. Fixed 1.1.21 to use $(python_get_dir) (See bug #232575). Thanks to Necoro <gentoo@necoro.eu>

Package-Manager: portage-2.1.4.4

4 files changed, 15 insertions, 55 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index 2c337126d4bb..1e6695065a04 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.64 2008/05/26 12:51:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.65 2008/08/06 05:21:53 neurogeek Exp $
+
+  06 Aug 2008; Jesus Rivero <neurogeek@gentoo.org> psycopg-1.1.21.ebuild,
+  -psycopg-2.0.5.1.ebuild:
+  Removed old version. Fixed 1.1.21 to use $(python_get_dir) (See bug
+  #232575). Thanks to Necoro <gentoo@necoro.eu>
 
   26 May 2008; Krzysiek Pawlik <nelchael@gentoo.org> psycopg-1.1.21.ebuild:
   Fix repoman warnings.
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 1be4623ab163..6bbc87ab0400 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -8,20 +8,18 @@ AUX psycopg-2.0.6-fbsd.patch 409 RMD160 48fe618d17c5dc04e69871673c0ca55e25351e1b
 AUX psycopg-2.0.7-fbsd.patch 409 RMD160 48fe618d17c5dc04e69871673c0ca55e25351e1b SHA1 9cd9ee4be9126aa9349f5fbfb3fdf1ba8519ce8f SHA256 e570c6c545bc71b35001007a6a5764cf2e7c35d59d12b93575a9d4b85494bf34
 DIST psycopg-1.1.21.tar.gz 213753 RMD160 de74a70b16353f69de7e898059a7a1d8418ad2ee SHA1 02d8a8b5dd682306117896c7c63a9a1b518997b6 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240
 DIST psycopg2-2.0.2.tar.gz 279200 RMD160 8a56c952eda241ebc000bd9455c3482ee5890345 SHA1 94c37b6cfdc7fa40cf5c9b4e1b6d2b774f7b1ee2 SHA256 544f8ee7a84cd8312d688a15c16f92129bcc7139e1d814c3602a448d969f0454
-DIST psycopg2-2.0.5.1.tar.gz 280775 RMD160 92970e9b4bf056c7d51602dc5a0c18cfa843259a SHA1 0187a06422e9572aadeaa4179dd898efa1b3d045 SHA256 aaf1e73dbc4c758246145e8e8291c5b22fd5bc209eade707e61e7b729f27e9cc
 DIST psycopg2-2.0.6.tar.gz 228129 RMD160 4b5ebd8b1f797a4c814c971df569a6fca081d47c SHA1 399c315a395c1930054bed13605d055cf6205278 SHA256 0810ea79a5013c8620dfe5af7092963b636ae63dc72b458a13c6d7bc5e1e5694
 DIST psycopg2-2.0.7.tar.gz 240073 RMD160 60360879d46682efe097c4687dede7502434faff SHA1 b4ebb56434828a209e59db26aa538c530c886be5 SHA256 d9d4f65f7de10244aa6f43b89aa3ee3a549617b0d2e0ac6c00ccf5ccfc9821ed
-EBUILD psycopg-1.1.21.ebuild 1328 RMD160 8144d5aaf63a6f40880f8deb1e836e316fc6606d SHA1 1dcb6169228dba0c9a0b67f02ffae47fac6bb0a2 SHA256 156e626ea16f46dbaa55cdf705877c9cbe7c67089429b02fd2f5d874f70a144e
+EBUILD psycopg-1.1.21.ebuild 1311 RMD160 ed7872e133ab7a3ab0acd29c25306b75051608f6 SHA1 29945934854d3cc3c8643a73025ec688e82a22c7 SHA256 81bbdd4f1ee242c87981e9da252f7c6bacc4967450be5868e11caf6cf8f52a81
 EBUILD psycopg-2.0.2.ebuild 836 RMD160 568a210413f342cdfa8ef101963448b83b20f929 SHA1 a8608271affa2e60c840e3cc6ce7f6682ea0dfbf SHA256 5edccb3ea049e2b9d67b92bb730c559ed0588096317629d26183f1755c53f473
-EBUILD psycopg-2.0.5.1.ebuild 1023 RMD160 7288f8e39ac8956225f36b6737293bba28e28c46 SHA1 506e6350dce1a49a3068969f68bd57e7e3235494 SHA256 2117ada99342e51f9e28c2da9272ec2aa8c05b094e8716e1b153e1c04b6f28b8
 EBUILD psycopg-2.0.6.ebuild 1237 RMD160 b38be828cb866f774c1005ecebda1221f3f3b2ff SHA1 3184c3936ef43d5d256154202f3525361ebed753 SHA256 257d77b250ec397a4dd043475c845fc3326ca766011d1045877983c0a598ab99
 EBUILD psycopg-2.0.7.ebuild 1237 RMD160 b26e7df0097010834940d590c83396b29291a64e SHA1 87beff95bff4cf39552a6f7cc4ce40ad5581b09a SHA256 a57dc18b5adb4d5f63690f383d71691f5c43cf4fe20eca5519852d64b5e04343
-MISC ChangeLog 8308 RMD160 aae345fa43f092000f3216772ff2661dbe29cc57 SHA1 e4770255be71aa9dcc038eecc313f3824a10c617 SHA256 068e7ca43ddebea2809e5c4d02cf6d01d56827ca4c02d4d2e296e4e484d4b798
+MISC ChangeLog 8529 RMD160 bd222cccd17ae5f0d3edfcbdf7b8c56cd7ceebb5 SHA1 bf9c6167e4f9f4e03cac36bdc9ceab0da522b08c SHA256 30b07f902a1a041f96739eeb72022216c7a2f576033042435968c74373126943
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iEYEARECAAYFAkg6sksACgkQgo/w9rxVVVET1wCgvFD6EWJshYQgIAJK55+GLdKw
-On0An2j/1XcpKGz4g4KtGHL4dsjyhYot
-=fbf9
+iD8DBQFImTT3dIssYB9vBoMRAku4AJ9X1+9NA2WwFC5eu32PZXm29i3npQCdFcho
+G7P9574f5HQxkhHD0crxtyA=
+=Yftr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/psycopg/psycopg-1.1.21.ebuild b/dev-python/psycopg/psycopg-1.1.21.ebuild
index c73f496aaef5..271d50ed2e25 100644
--- a/dev-python/psycopg/psycopg-1.1.21.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21.ebuild
@@ -1,11 +1,11 @@
 # 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-1.1.21.ebuild,v 1.13 2008/05/26 12:51:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.14 2008/08/06 05:21:53 neurogeek Exp $
 
 inherit python
 
 DESCRIPTION="PostgreSQL database adapter for Python" # best one
-SRC_URI="http://initd.org/pub/software/psycopg/${P}.tar.gz"
+SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.initd.org/software/psycopg"
 
 DEPEND="virtual/python
@@ -28,7 +28,7 @@ src_unpack() {
 src_compile() {
 	python_version
 	econf \
-		--with-mxdatetime-includes=/usr/lib/python${PYVER}/site-packages/mx/DateTime/mxDateTime \
+		--with-mxdatetime-includes=$(python_get_sitedir)/mx/DateTime/mxDateTime \
 		--with-postgres-includes=/usr/include/postgresql/server \
 		|| die "./configure failed"
 	emake || die
diff --git a/dev-python/psycopg/psycopg-2.0.5.1.ebuild b/dev-python/psycopg/psycopg-2.0.5.1.ebuild
deleted file mode 100644
index 0f632ed97950..000000000000
--- a/dev-python/psycopg/psycopg-2.0.5.1.ebuild
+++ /dev/null
@@ -1,43 +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.5.1.ebuild,v 1.3 2008/05/19 19:47:13 dev-zero 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"
-
-DEPEND=">=virtual/postgresql-base-7.4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use debug && epatch "${FILESDIR}/${P}-debug.patch"
-
-	# 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 .
-}