Bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64

3 files changed, 81 insertions, 12 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index c7ab9b7e126f..6b4e6ab69024 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.205 2015/06/07 09:33:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.206 2015/06/18 06:54:06 patrick Exp $
+
+*psycopg-2.6.1 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +psycopg-2.6.1.ebuild:
+  Bump
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> psycopg-1.1.21-r1.ebuild:
   arm stable, bug #540290
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index ec2d1583ac09..5f73c084dbcd 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
@@ -9,6 +6,7 @@ DIST psycopg2-2.5.1.tar.gz 684504 SHA256 65a70c88a7e02d8bef57aab8636b5795389674c
 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
+DIST psycopg2-2.6.1.tar.gz 371373 SHA256 6acf9abbbe757ef75dc2ecd9d91ba749547941abaffbe69ff2086a9e37d4904c SHA512 00705f6b417acc89e2e66b7bdc25c31d92de7610173fe41b2b35728ebb6b55ef8c7df67032c2a2e3d908d8599a1d378578ade77bd19f5f186fbf2596290eda69 WHIRLPOOL 87ea72ed7ee762e7071a58a37a8b433d1ead28ab494100e790e01a602af41b4e5f04b3f27fd21bd3db3c74e5c35dc0d28ed42fa1e60925861a05bdfbada444d1
 DIST psycopg2-2.6.tar.gz 367972 SHA256 c00afecb302a99a4f83dec9b055c4d1cc196926d62c8db015d68432df8118ca8 SHA512 50618bef6372d9cf165bc9ee2f1c3d77727f359fdded825cdf9b6dfd513a9455fd5d935dfda203b2affa43c45cf86bb25b742db6f6b8228cc2fb293aa42bc4f1 WHIRLPOOL fee5180674ec60a6ade287a6f30efddaa8e4a830e8719a892c1aff22aa66ce4c5dd8fa5acf75f6cc17d8f65c104c79da129b664619f137f21618230d08308933
 EBUILD psycopg-1.1.21-r1.ebuild 1677 SHA256 8dbba78299e09b46316ffc48fb09037536c8baed1a78ee3a443eff1b6fbd7ea7 SHA512 51d210c8e374f240035d7ad492b540c6a11c0e7dfa1d188963aa08c68c3924d8f6b70aae15c51f01e06548a1d910bf8085b8963475a612b47aec4ee7971b0a85 WHIRLPOOL 4ea437e18d3692889c9bb64e74a91d60eb6b97aed7df28760edc78e4ca4666d01afeba5a4a3cc188c3acd406c43d75ad7a9ce42441eb1bc1fdc7ad05408a0b7e
 EBUILD psycopg-1.1.21.ebuild 1418 SHA256 add79a2262d9258b5e268939a5b2210c2e9ef5a1c41fb8be94a13e5dce088ce2 SHA512 e2ffd4f676e30d2437829809143067cbebca93df0e596e9fe8c81415a1e0b161e903b8592b78c2d857ee91f7422cfaf14eeb951c3315ea3331c93cdc3c074ea3 WHIRLPOOL 26db7a50fc8571ce429204010a949eaba6d21df124cdfe5765d4fa211afd9cf71112d72652c6a968eb1e3183c988fd4f0b9a48deb46a3320d5d48d2ee97e538b
@@ -16,13 +14,7 @@ EBUILD psycopg-2.5.1.ebuild 1647 SHA256 badaaf84a59c56504cfb04091f191bc87fc1e150
 EBUILD psycopg-2.5.2.ebuild 1659 SHA256 3ef3b3ca0cc5d62bba3af363c05df28139e6858167107e5914b23119e1a9b73c SHA512 c46722f9ee5bb74a84b88162cd57297449f663dd62ce03411059f50664a26f0b12dfaf5311a6c86f2603cdd8602224478c138a35defe49fa39f507e2e2717cbb WHIRLPOOL 139b7befec126848ab290e3fb7035e0e18d548484180563fcb2f8bb1e58849fa5ff67c8e94f427209f51c097cebdc365b9449694ff2163dd4ab432c6cab595a3
 EBUILD psycopg-2.5.3.ebuild 1562 SHA256 bf73e5f61d0c15fba32d8a348cdb17be2009136b0f6e426f07cce1c301d0e0e5 SHA512 e7fe2ae08b78e7f0747958a6358aa74148b29cff9e3aeb3d09a37cef0ec30761bc15663eed04f5ff0cf7901089b6baeb3b623bb397b3ace623374ac81f40ae72 WHIRLPOOL b29380080271dcac14c8fdc27d7f362afad0f2d79634898ea94abc49b6e234e28d511bcc8037e04cae5dfb6012a4e587b26ba596f637d9beda245fa8bcdba80f
 EBUILD psycopg-2.5.4.ebuild 2073 SHA256 994f3f8a703e89355b7f385e13fd2a80e02203b9d100fa7e0e596ee92ba57d2f SHA512 56c652a84e64698feb5427ef0c6ee4b5d10df03bfee6a5b7a9bdb11c7da22173288c0828c9eabdd455227e89f16c7882497038c209bb819b60b51807e93cfd2d WHIRLPOOL 3814f0e0fd362a92e8ce3ca14a884fc4600e99ade35574353a38ae4b65cec295c323667bc038b9901acab603f5b662db7fe8c0b67abf9146d8740034b942a575
+EBUILD psycopg-2.6.1.ebuild 2064 SHA256 c15e4c1842f8cc0274b975f89e2bd291f76ec93e44074d8becbe4d10e0d78e0d SHA512 4b30eebde17bfbd63a8c16b2631f17d86c90eea7adc8bab03624e50b0452a4c89fce79fca39166c08438041eea025ba887f92d1c79c21d6f13fdcdfd72c7e811 WHIRLPOOL eca88add727e9c3892961a24d0de57b1892e15b1066fe87f7a10d9f9ad8106502b602e2af62c8170ed50a8e626aa4f8bdb5c807000ddf88cd475c192e26bebf6
 EBUILD psycopg-2.6.ebuild 2061 SHA256 8ea93bb3b811bf55c8d063dff782aa7f1acdef5db55b256d9eacbc323c3d210a SHA512 92ae485ef95d4af49c7aab99fed09371a9a2276f5d8a2ee1524266d6a2e1a9ecc3ad2b02f7836d2e14412ab977c1c4f22a1501cf669bb376466b6ce4d86bacbf WHIRLPOOL 46b27ac6499905d410ab3c345ca45300528316ca98937b1e0537f3fb33f445fb92d87929a483c8cbca26c0799ef12152d2430c286cb8b1e206682742d32a0453
-MISC ChangeLog 26702 SHA256 1b52b2d0800e5e36d105278e4ec1bff4f81d81c3d99a9adfb0e0439c3b5fc8dc SHA512 f7c47b4c4e054fccc7c9248169f6eb3c00b0b6e273b9fc7b80678d29be2a71ee7411278b2a668bb8543dbac008ca03c728de24a1f05c4644d468c0984c5df5a4 WHIRLPOOL f671c396115c0227c7acff5e5d46ffc23ae205f6a2d358a3b0f083f9d1d531a7150657bf25a4be3f93efd551264f51b81023102fe99d9263b46bb356d4f6da79
+MISC ChangeLog 26814 SHA256 0a2db19e2c380b6b8a78ff1072ea6cedf460df56ae966f7a9bed1f65f9415b19 SHA512 a6c70078e53cd3858f4a7b9dad24b189ce69456dffc8f0b5624d15ba06587680bea60e136988e84d41b3b83ba6e8335618962d3c5d089417e3223826c97e6a42 WHIRLPOOL bf1c4455719164f7664f7c59bb5f4b11c9c4a6561e13cbd82b1734d797936f12ccf4df66a4d9b58a7f59d3e2e73162d8c34dee5c1959507bbcc5a71cfc98aca6
 MISC metadata.xml 236 SHA256 31e152a485c338f937a102a8fefb2251a897a6d4a4c232b6108dd0930494fd3d SHA512 6d1c6a927d16ff922f5fce8ec24c9fde125287212ee05b95fac135ad5dee8993195974a9d2d3800df25312c9578a9a1a2bfa8a44076c951b7fdf5180914c2e6b WHIRLPOOL 24463abeb2ef6bda8f9e8074080c2ec10eb91f055c193e6858a28ba527f7e6685fa352522df90e769bc7fece3059dcbf7d0d2c801127d2bdc36bcd4cc1cf417a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEUEAREIAAYFAlV0EAQACgkQkKaRLQcq0GKCPwCRAf8fz0W8BHW5C6oyWBsPRRjE
-dwCfYDyF9kxzvK/s8Q0p5MG10VyjKcM=
-=07Uy
------END PGP SIGNATURE-----
diff --git a/dev-python/psycopg/psycopg-2.6.1.ebuild b/dev-python/psycopg/psycopg-2.6.1.ebuild
new file mode 100644
index 000000000000..927ccb44553b
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.6.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.6.1.ebuild,v 1.1 2015/06/18 06:54:06 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 flag-o-matic
+
+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="LGPL-3+"
+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"
+
+RDEPEND=">=dev-db/postgresql-8.1"
+DEPEND="${RDEPEND}
+	doc? (  dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+RESTRICT="test"
+# Remove py3.2 entry from intersphinx setting
+PATCHES=( "${FILESDIR}/"${PN}-2.4.2-setup.py.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	# Source local copy of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "/^    'py3':/d" -i doc/src/conf.py || die
+		einfo "conf.py patched"
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r doc/src/_build/html/.
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}