re-add 1.1.21 to appease old rev deps with SLOT 0, rm more old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 70 insertions, 247 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index 330570082224..a4d34a75f458 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.179 2014/10/21 12:07:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.180 2014/10/22 08:21:49 idella4 Exp $
+
+*psycopg-1.1.21 (22 Oct 2014)
+
+  22 Oct 2014; Ian Delaney <idella4@gentoo.org> +psycopg-1.1.21.ebuild,
+  -psycopg-2.4.1.ebuild, -psycopg-2.4.2.ebuild, -psycopg-2.4.4.ebuild:
+  re-add 1.1.21 to appease old rev deps with SLOT 0, rm more old
 
   21 Oct 2014; Jeroen Roovers <jer@gentoo.org> psycopg-2.5.3.ebuild:
   Stable for HPPA (bug #525508).
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 9d55d8a60b21..e4afe65d043c 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -4,30 +4,26 @@ Hash: SHA256
 AUX psycopg-2.0.9-round-solaris.patch 449 SHA256 d7334adca500aea1b09d3ee809cedb0c719659db95398175f4354939e2dd5b55 SHA512 d17b253a000a69e379441edc921df4bc47db422a81a25e923d6d4686919fb20b1450177869bf326345dc4db4de40ca6f06fd1934c46b9442d06c9af39dd0455a WHIRLPOOL a270a5fccab13423e89588a9996f1397770b9c4437e275aef35af182217b659a68e1bb28404dd5ce7b03e6924c2aa11473953b0817137d8fb8a6beab6917dfd6
 AUX psycopg-2.4.2-begin-segfault.patch 1370 SHA256 83566d6bb66fd09acb0bdb8982c60d8f4e98e5065fdf9380718c0d51fe237278 SHA512 47494d68a22be382a4db2150198bb8251492e4c913576c364cabee5f9d5d3fadb664b7baa1e039b351d1b8b27cc78c787d931cccb6c01578029aa44afb9570c0 WHIRLPOOL 13cc3ef83aa99c3be4dca72f09b2462a64d16d832a0f5b3927bb2121770a76aa9d6c6b886c9b6c46282c4ff6c1028fb0b0895e3d88d91ac83aa8e031f157ffb7
 AUX psycopg-2.4.2-setup.py.patch 568 SHA256 9dbdab62bf2018efe48afe72170daff494d6fbcace00da911b44066e2b31b847 SHA512 9111df177d89559b0e397bc0ca9844636f981552d4bac3ae04abfdae5c68bc4f9efc553829da9c3a653536ddb18f01a3049e9ece746d0fe3328684a6ef6b6976 WHIRLPOOL f7a5054b1daffc82e37893592a1444708ebf1e91519b5a47d9d7ae2c962e0883d95141b5dcf558fac8042357759513cfc249f038681b6db6d3f5e9caed2c55cf
-DIST psycopg2-2.4.1.tar.gz 398200 SHA256 f8ee9a4004afbd1ff1a1db8df7910475d6ec26e102aa92c9214cbeb1ef39ff49 SHA512 0c7ec304ca0d572dcf56d572fe4c4fce6356b8b210dc76e9f9b571e5d56beb3c1f77b1480ac530258313355488a2c7a9a459af2b7455be0632b8eb8b4f1c0b3e WHIRLPOOL aeb0741b270c48109697f7d929a0f4518224caeb2a8178336298d064c9d70e68493bd82bc85ceb2eb1994a677f77dd785cabfaa6383c65907f0f885f389c4dfa
-DIST psycopg2-2.4.2.tar.gz 667192 SHA256 c5f0f853aeeefc7b2aa73b08579e5d74c4c32ad5fca87e058bf04e08273a41a1 SHA512 887c642f78ae58c8a0f876ad5c24a84a7c3acc2af3dbc88c0778f485ed12e07184af3c03fdec5209a674cc51b3b0485960e45eb71e3b3a0b3cde8e3d57c97fec WHIRLPOOL 8ac5e059bfc852a613010f7f0bdee3b91ed6fb59be7b1412dfd68d409c4ab5b31d5d59f13d658fc5c13e623360a271672b74b3bab6d1f09a04ae29d81ac71e5f
-DIST psycopg2-2.4.4.tar.gz 648954 SHA256 0c55b059d33f6b2cbb52f254320832c0ca30498ae06f4f4df2a2b38af989127e SHA512 c480e03f5a144c45bde3b04becf9d199d63460108e1040bfb6b56651d2b35e7e4118319655c6c735625f206e7b00c05a115b4a132f30e45bbd7c78c45cdd651b WHIRLPOOL 4600dcbbd8049b9b32a388e03f34760dcc41569c27ece66b467b7d84bc8db0af3f60fd3498526ea91ac6f3581886d61e149184bb71db467dbb93a23dedbd3fa4
+DIST psycopg-1.1.21.tar.gz 213753 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240 SHA512 2681e8b3c4873f69a1a07aa4d3908a42f8e8be9392adbed189fe72c1a601699ac08643d24454622baf4b26153ef3a687f27a941308368e2227cb98ff948322eb WHIRLPOOL 022a4e1a01ac30338f2be14e549a9f35028c7bef7bb8f8a6e4602425ddff07d89e049d362a9b49f760e89afb52f153f3f0a197b828b79f75245f26fcf48a9c4b
 DIST psycopg2-2.4.5.tar.gz 719343 SHA256 48b702a7ca479e1bc2c1a7b81875a07d474298132605993e2cb979f5e08277d7 SHA512 b3ba6a822834d09f4e4dad5684a9ec3244877cbe5950f1454d7efcc536f10198a779ac7ac5b3f08100fc13ae061f4b4eddafbaff552254609f6f0e3d30a7dc6a WHIRLPOOL 08ab86534af59b25ed2dc0c2a076c817d193967b65fdcb06a1c40492c741af7d3f0dd683911b57352e31527e2d325ac3d73ec0a5436e36918cd36ff83868fda0
 DIST psycopg2-2.4.6.tar.gz 667783 SHA256 4edcb40b0a039b4b559a6bc887b2155db8b6c53d0f55b00af8338c77b725621f SHA512 da23264f66b4054f26b7029b97856cdab91870e8a6c72cd5dabe37b36c96b3cb19a9adebf49844f5330ae3009f1ff4a81cc28eba1c4baf18e099ca7a10c808ad WHIRLPOOL 3896ff4227f4dec22288d70aec792c2df114df00e387d7f1f37a36f91bf7bc0eb5ae3cb5503a180ec1e6a8be15c510d098aa60eac7076b437ae64a76a6e5b521
 DIST psycopg2-2.5.1.tar.gz 684504 SHA256 65a70c88a7e02d8bef57aab8636b5795389674c3205fd88ec46a4dffffa7efec SHA512 5e5e867dd10d404831275e0b0fafeeb186e1d39e4de04a16d279f14db921f46bc2e2b7cf92deaec849cabe5b4e6f5d61b928952fc2a4c8d6d86a521035c3bab8 WHIRLPOOL 7adc7cf8efa535dc5cb87efa36a82f2b6bcb9f4572ee23755bea7ab70ea3d58453dc99e4b5f21f45fff6a99fdbfab329e19ee2085ba167e2cec1cee96d6bfbbe
 DIST psycopg2-2.5.2.tar.gz 685762 SHA256 50382d8703a16c3c615f328c2676f002787095925c99f0afb125a59962a5bd2e SHA512 8bba8f2f70918c787bd4968212a6f72e77b21be37f264e7a59f581f494444b3acb123f3fad05558fbf9ec8c876a031393d79dc850257a6d9f6b0a425ff01cf62 WHIRLPOOL 5d8e9399baeefa3e4eeafef489355d6b5ea714cce158925dbed5977603529aa47943c10662455f4d8de552a00c2ff1d95e641b0029a574b9e9e154864b3bdeb5
 DIST psycopg2-2.5.3.tar.gz 690689 SHA256 3a2df3bb113187227aa97d0dd3d06e0f26be3d50dcdeeaef67fac59ed51a030a SHA512 88590c37be839e8cf5025b7ac40411c4682269700795c5f8f1b762966d906faf3f1ee85de35fc734a2d10c6a68d7fef569891bd96919bab809b9500625e2a41a WHIRLPOOL dccd694dfb2192992731e982b085ba4feb3b2b89d56c9e69ec88e0efbd14ec7367841849958aa1e9f190179b300ce511532d6b23e51b4f96babc302f37efcf4f
 DIST psycopg2-2.5.4.tar.gz 682578 SHA256 24ba3f328aba08d8d505bc2a8f68a94ebe24a85e8483640b667221bc0efd3b1e SHA512 24e7f7940cb55ad686d93c5baa3286be56a5c21376868403248fff919e54cfa57c039623c1b8c10947fa206aabb9eb865e051520a5a0445be133962eed016854 WHIRLPOOL bce35d47eb2025cf01ea9b7597318d56fcdf84b0cd29e251068f3f20c1f2c5b6ee5050fef6360c690c27d84f334b73a29553389f5e8a28b416151eb32c4b37f9
-EBUILD psycopg-2.4.1.ebuild 2044 SHA256 1b506d3d3843d1478197317a045dda0c2dcbbf8aa460baa8648328f0f0deb26a SHA512 8e5ba9e769542283ba7c59a19de94f438d6bd7442066a141d37c958c144adf1d62c3af95e65dd88d9ddb36023969a4f4d2d34602f9db2589edc7baa69fb6218f WHIRLPOOL 8cfff5a36c7893096a6b0255bef8474b3a7c60f5a9984836e5dae423f591c88fd805b170a1cdfe6f4435380835f0bb2b207fd67eab1c32730d7b0932e5f22ab3
-EBUILD psycopg-2.4.2.ebuild 2084 SHA256 527c50cae12b8aca702e7452ac7707cdc94350ad8c35bb608c6dc05ffa84b129 SHA512 2ad89e458f6e3bf1efefbf560b22f0019e6db6572b2ac2db5c0b384f1d624c78919d992c8ccf2fb8c96b2f1ebbf288ac1f266914f5a392caba0acbb187778f42 WHIRLPOOL 6751638e5be44673a36845ab7913d21948b6f3d8849ddd3b5b1f3a04272ee1a4ea4138e79205a3f38737ad1509d8f33808ac4da432c4ce54bddda984ab3a3366
-EBUILD psycopg-2.4.4.ebuild 2050 SHA256 2b02f8883b960295ccedeb40a9e0a3cf8a57b1bea0016a76f0839751eb85f4d1 SHA512 8fb613b12203c47f3f66dba94e43ede405bbbd9b9f18266472f39302944d2bac0608944b8e61e31d97f8d4e000adbe83456fd2816b65d91744c77db110e9d67d WHIRLPOOL 8992ffc606c74153308ec1276d5adb36689a3b4fc5bc94a590d296d14c5b67704987b1f05570c42323c6794c5ab5dbfdafa675fbd2ca1041d294f40d1c41d4eb
+EBUILD psycopg-1.1.21.ebuild 1420 SHA256 22ce3c52a71f15cfdbe753e453bbd50fc849617052a49791a69baf015f4c50c0 SHA512 8db8c381a53bafa4d969b5f6ab3118a660fbc941c71ad81fb26ac0001cdcc526352c6dd281c2e53fd3cb14bcd020a857801afd61b26b6e552b317976f79dd271 WHIRLPOOL e9fe8ac557cbd6e6df2da3602bf2567a4b603aac0eb696e4adca24bd815023deefa6f6c3680487996c64e3bf7dabf78bd886d977131f30154beaa46dbd390bb1
 EBUILD psycopg-2.4.5.ebuild 2037 SHA256 4b1014473a9a4c023984cb6dd23da66a31302260aec1ac1b1eeeff79e5f483d2 SHA512 62adb6cb1e82aa72083bdcf46039584a40804f0011f63946653a5bcd9a0c62c027c32f626ddd1f04170a2662f098b117817c69aa7ac4c45a93dc380804f4289a WHIRLPOOL b1a7fec44b42314a2c8674b259220b67d3bc963b01703b3157c3df01a3364fcacceec5697acf9831a57f0f81c88fb411d3cfb7d7d90c973aafd9d0d517e2932c
 EBUILD psycopg-2.4.6.ebuild 2050 SHA256 d484f84b7e43b0338a0d1ec6aa1cf72bd21a4d30ed7cb41c68f5591b225fe193 SHA512 23a0b7054f9fd545b62a694f4bd460dbcfb67166cf421277a826aa605e7ef83c66568834b0bddde4af9c26cd6c3296fa4d75ceb7196aab67b434be4a64f96bad WHIRLPOOL 564beb6222697605dc91e1df5cb4f1bbcfb5f887071ab1212d378675b20ad05c82fee94a5e17322a19d996fac069a5fce5b830758dc46a5af2346bad25d20cde
 EBUILD psycopg-2.5.1.ebuild 1658 SHA256 31c44aa85d272b3d4444d077be1ea8e8e8c0cb6f2bb1c54a521447afc9919bc9 SHA512 3576406566586f4fb243d376f21b735579ad50c54e4fe95418986a99de398bea52e21e0b54f389f008452e910e4a6ead1081d8f5b7fd88974c891be3d3923e89 WHIRLPOOL e00791ca782aa1f70c0603c531710e4531d431d56451d6bde8ee8a72faa9e27eb028b2959da8a4c375f297f1a37d3850ea0e85e1adb73d5174f43710e876cc63
 EBUILD psycopg-2.5.2.ebuild 1673 SHA256 8f86733e0c600fa5dc9275e180f2a1ec90ac803eea5ccc760175a3618f8281a5 SHA512 29d90943a0afb689f1c648e8582227670322f0afe5ed7b9fff8dfe384df4868c04afb338b02f2d2e4e04e7551ad2c51d1d0fb8403c9d758465d44303233d67c0 WHIRLPOOL 92f4439605cdf9c4ba7a63d5a9d9bd3b8b6e3ec5c035cf76d96d8769caec7fab336153b07b7e1e654551563d9e502a23199fec11bea51e8e669db54100ba06be
 EBUILD psycopg-2.5.3.ebuild 1577 SHA256 0ffe44b3ebad82cff9aadae7612792c685da90c8b748891121c066eedec59ccf SHA512 e61909d2623a86920c2a9c72f589867475651a6e17c2fc087ae5edf707f8218afbf811d9f70e1de47f8ae5538556c7c796c0cd209c8fdbe4e9ec8c1532b09030 WHIRLPOOL a1c466b226b3917ede44c418b55ac8345a13dc9de4848b41cc084e27ae7b7811c27e4b09235d44438fc71172255ccf62928bc0aeb39e3e4f353d5cb03ff57fb4
 EBUILD psycopg-2.5.4.ebuild 2081 SHA256 719af4721913be6273a03a0238f8cae3b39ee6b6852a0f0639801f52732aa859 SHA512 5460b831543589305a9b9ce0e3df34a16d3ec47ea84d386010aebc0eb76f2151dc2512a148740a9a1da2b2e226afafd323f4da940285e34abe56701211ef1df3 WHIRLPOOL 9875e4b8c6dc4a7b0f1362bc4e4df994e938ec63dadebdeaa9a41ae7e98318cb25243131b85486bf47005e373a9c1521de1f59eb2a7bf6957cc0faa2f99f320f
-MISC ChangeLog 23145 SHA256 b4962432d45bb95e642a5f6de8b9b0e46086790026a51bf2f8293009e2eadf48 SHA512 9039e3ba55946fed7f3123ee4390ba29d1bffce18bfa16312c83080ad41b9a04828c022d61e6e61596b213b4a1e50d3c66fb6ad61ed308501eaaee5699abd135 WHIRLPOOL 8d4649ca2a2912100950216a898db7f9bf13a21715f262657567e3b99be936f32afedb12fc7b1f8d9f0adcd8b25c9be0d58793a7836c56fcba97a811e4b1606b
+MISC ChangeLog 23389 SHA256 b95590a62291db7711a943d8b45cba4097b13c61215290e2e107b987c05a84ac SHA512 8b84f42c78cfe605999bd3f5fd5c4958e9789cddd99eec6df4487dde49495cf9e87e1c4de6be107414db79466d280b861cdff3f2d31520b8f8135998c6c59889 WHIRLPOOL f7c9b42946c4162fcd498fa83efc1d4dfc525c5398b87d5ea9a94963d518ada065c413c0963078305f67acfe245fce8027d70851e9405bfe66062a118540e83b
 MISC metadata.xml 366 SHA256 3c1239649781491e78ba63077192460561be54da50d7527d593ad5bc1e74a04c SHA512 43884ab75f4e267af02cd0dae3e3b853232e6b059973b9e821da262beaea95aa0a06ad34fa4f88a5727dfaa56dfc06618a4f92675c3ce89fcbefbad9b638c6d5 WHIRLPOOL 9a0a2eaa778b6c059f0392603f6aa3e983037f9a94a4dda029431d22816306b6cf0c84cd209654a8afb76fb126abebd7238009011d0eac6576ae028a9bce9289
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlRGTIoACgkQVWmRsqeSphMpswCdHTPY3O4zzO395mjYUIGGtqFx
-FtUAnR3VUnbdRM6s4Zbmpvl8Gu7vbfF/
-=mkJB
+iEYEAREIAAYFAlRHaS0ACgkQso7CE7gHKw0R5ACglm6B7ZyoxnrGkU4Y2i0uEOAY
+fuoAn2koZsY/rqS7XL1Ngvr2dn5maU1B
+=p+lv
 -----END PGP SIGNATURE-----
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..420ea0dba2ab
--- /dev/null
+++ b/dev-python/psycopg/psycopg-1.1.21.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 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.23 2014/10/22 08:21:49 idella4 Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
+
+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-2.4.1.ebuild b/dev-python/psycopg/psycopg-2.4.1.ebuild
deleted file mode 100644
index 171d3c56f7e7..000000000000
--- a/dev-python/psycopg/psycopg-2.4.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.1.ebuild,v 1.9 2012/09/30 16:54:18 armin76 Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-* *-jython"
-
-inherit distutils eutils
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc examples mxdatetime"
-
-RDEPEND=">=dev-db/postgresql-base-8.1
-	mxdatetime? ( dev-python/egenix-mx-base )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="AUTHORS doc/HACKING doc/SUCCESS"
-PYTHON_MODNAME="${PN}2"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.12-setup.py.patch"
-	epatch "${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
-
-	python_convert_shebangs 2 doc/src/tools/stitch_text.py
-
-	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
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd doc > /dev/null
-		emake -j1 html text || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dodoc doc/psycopg2.txt || die "dodoc failed"
-
-		pushd doc/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/psycopg/psycopg-2.4.2.ebuild b/dev-python/psycopg/psycopg-2.4.2.ebuild
deleted file mode 100644
index e27f1d9a9144..000000000000
--- a/dev-python/psycopg/psycopg-2.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.2.ebuild,v 1.9 2012/09/30 16:54:18 armin76 Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-* *-jython"
-
-inherit distutils eutils
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc examples mxdatetime"
-
-RDEPEND=">=dev-db/postgresql-base-8.1
-	mxdatetime? ( dev-python/egenix-mx-base )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="AUTHORS doc/HACKING doc/SUCCESS"
-PYTHON_MODNAME="${PN}2"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-setup.py.patch"
-	epatch "${FILESDIR}/${P}-begin-segfault.patch"
-	epatch "${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
-
-	python_convert_shebangs 2 doc/src/tools/stitch_text.py
-
-	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
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd doc > /dev/null
-		emake -j1 html text || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dodoc doc/psycopg2.txt || die "dodoc failed"
-
-		pushd doc/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/psycopg/psycopg-2.4.4.ebuild b/dev-python/psycopg/psycopg-2.4.4.ebuild
deleted file mode 100644
index 05ba17d26285..000000000000
--- a/dev-python/psycopg/psycopg-2.4.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.4.ebuild,v 1.4 2012/09/30 16:54:18 armin76 Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-* *-jython"
-
-inherit distutils eutils
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc examples mxdatetime"
-
-RDEPEND=">=dev-db/postgresql-base-8.1
-	mxdatetime? ( dev-python/egenix-mx-base )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="AUTHORS doc/HACKING doc/SUCCESS"
-PYTHON_MODNAME="${PN}2"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.2-setup.py.patch"
-	epatch "${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
-
-	python_convert_shebangs 2 doc/src/tools/stitch_text.py
-
-	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
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd doc > /dev/null
-		emake -j1 html text || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dodoc doc/psycopg2.txt || die "dodoc failed"
-
-		pushd doc/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
-	fi
-}