Update pygresql for more postgresql slots

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

3 files changed, 84 insertions, 12 deletions

diff --git a/dev-db/pygresql/ChangeLog b/dev-db/pygresql/ChangeLog
index a89b5e13edca..68bc248c234c 100644
--- a/dev-db/pygresql/ChangeLog
+++ b/dev-db/pygresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pygresql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/ChangeLog,v 1.76 2015/01/13 16:51:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/ChangeLog,v 1.77 2015/01/22 02:55:41 patrick Exp $
+
+*pygresql-4.1.1-r2 (22 Jan 2015)
+
+  22 Jan 2015; Patrick Lauer <patrick@gentoo.org> +pygresql-4.1.1-r2.ebuild:
+  Update pygresql for more postgresql slots
 
   13 Jan 2015; Jeroen Roovers <jer@gentoo.org> pygresql-4.1.1-r1.ebuild:
   Stable for HPPA (bug #534946).
diff --git a/dev-db/pygresql/Manifest b/dev-db/pygresql/Manifest
index bce76f666af6..fddd67ceff98 100644
--- a/dev-db/pygresql/Manifest
+++ b/dev-db/pygresql/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST PyGreSQL-4.1.1.tgz 100883 SHA256 bb14092f97c66ed13b8faf71471b8c156c6b46d915858447f3a63e9abe48eef7 SHA512 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f WHIRLPOOL 323bfd1b72341be6b14d71fd4f05f5005a0f8a387f9b050ef3c786531ea19e057aa67fb5737b5aa0c4ca0912ad697a39d8957d70bb6bb4056e81f406ade5a6b9
 EBUILD pygresql-4.1.1-r1.ebuild 1665 SHA256 7c52e0dc039a5707fbeb216b0ffb4c2f03492480b5464db59da353ffd0507d97 SHA512 fd0e71dfd2cdc6401e94b7277f4118bd799aa883c5a5093edfa4d2638af176eafbd0f76cb6a5ac442d951f0c3c5c6dc3b45257c3d07ab561eb23d67e167e3c9c WHIRLPOOL d36cd76d62c9ade7e2b09b02fba30b1e9251b4482a5b30713afd88f7fb6dbe821c0ae757c872bcac0d358cb51e9664fb87091f6a7e12b9e6b719200f1531a79e
+EBUILD pygresql-4.1.1-r2.ebuild 1721 SHA256 b057d7b23296c48174283cc779141ad0ff4731e997f626f90b8d03ca5c3e95d6 SHA512 b89e79387338139aadbbb96bc005e0ca563cdd6e3d5e1434ef17a39293a2a638a7eae3fc29983d85aded9edf671c033f672a32c155595840932e2116e97c8071 WHIRLPOOL 3a4880a5a085afeb59e57b1d68fa08b397b7821f7a67a943d27a72c60d52bdeac0da5f230af9e9a8a4bf1419f53a0cf409286f29d0d5d00d23b0d926d16e5052
 EBUILD pygresql-4.1.1.ebuild 1694 SHA256 9eb98e62b4255b57f33d2d782ee9d780541725aa68d76be7fe5e15398ea6116b SHA512 d5ef333fb048e48fc2c37f2f2fe1a2f8a9a41c4865951318405231590b3b62a914ba657b42bf36bc072b0c3a22dc7a06cdcaaa3deac07a863ea3600fdb559f1f WHIRLPOOL 36b7d6d609f2b473f25114a6ff1335ae019f064ceeb8665d77d531e14baf48872365b9b7ea2161ca9301d7f52c25658bdf618f31947ad26ce9af6a9bc57d4413
-MISC ChangeLog 9565 SHA256 3982d84453194f67c2b055bd9e0ef19f5450423b3bbbf3c12153bbb98daa2fab SHA512 7eff5f254d6b331437304a869cd325b212e8a450bd240805d2a5ed487ba356cd07c73251de5d7052ff6ad5ac256748f10edf0c2cd7d3244d3e2621d3af73b5a6 WHIRLPOOL f82f46be624d8e9b381bfecde27415ce3290fc43d6c9820c6b97bb121fb4f136dfd6a5f6217a1d93f8215c81b888af15fd75e7c1d7cd84c2acc84bfc86d2b2ee
+MISC ChangeLog 9725 SHA256 7d9fdf9b4df14d7815e772ef49c86fd5b697e31755a6dc30243d871a9b860f3f SHA512 e2e98d35bad5fc0dfb117e39bc3a166304d11e20f19a7545e955dd3243e2e9974439f2132b702bb9089d17ad83e0ebb6d615c704b48b531afd1be6b234dd8f28 WHIRLPOOL 7d46b88e985108326ee9b625c5ba15328e0f8ca7ad2260e778b6dd7866c614a3741d31c3c30c2b16fededa4664f493e2854e638b578f0f8cbb3cc870ab5c5b9a
 MISC metadata.xml 163 SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891 SHA512 b8dea0d79b67ec69ca908fa0e8fcbd5edf1c9e37fb2a8c00621239dba6e9e8c7a5270e9914863460faabb0b96bbbc796aa75cb5374542ee519742f4889f91701 WHIRLPOOL 254c018c32b2a35bb47fd8c01e1ed3649dc78001f40fc8a76d10416358e928a67d7142825c00056eafb6f329901ebc9ae87c88cbc2f14d1ae21a6f7419f0a038
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlS1TS0ACgkQVWmRsqeSphOA5wCeNM7aCU4GOINsF5jvY/8nuS3s
-VbIAnRs5tagg+IX+t9/qZSUBRRw/7zx7
-=dvcj
------END PGP SIGNATURE-----
diff --git a/dev-db/pygresql/pygresql-4.1.1-r2.ebuild b/dev-db/pygresql/pygresql-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..48aff941ecd1
--- /dev/null
+++ b/dev-db/pygresql/pygresql-4.1.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1-r2.ebuild,v 1.1 2015/01/22 02:55:41 patrick Exp $
+
+EAPI=5
+
+POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="http://www.pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tgz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="|| (
+	dev-db/postgresql:9.5
+	dev-db/postgresql:9.4
+	dev-db/postgresql:9.3
+	dev-db/postgresql:9.2
+	dev-db/postgresql:9.1
+	dev-db/postgresql:9.0
+)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Verify that the currently selected PostgreSQL slot is set to one of
+# the slots defined in POSTGRES_COMPAT.
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \
+	&& return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+}
+
+python_install_all() {
+	local DOCS=( docs/*.txt )
+	distutils-r1_python_install_all
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/tutorial
+		doins tutorial/*
+		dohtml docs/*.{html,css}
+	fi
+}