Version bump. Fixes bug 289228 and 482704.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

3 files changed, 89 insertions, 7 deletions

diff --git a/dev-db/pygresql/ChangeLog b/dev-db/pygresql/ChangeLog
index 7d240b8e71f5..b42714d91445 100644
--- a/dev-db/pygresql/ChangeLog
+++ b/dev-db/pygresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pygresql
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/ChangeLog,v 1.59 2012/11/28 21:07:38 titanofold Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/ChangeLog,v 1.60 2014/01/16 11:26:06 titanofold Exp $
+
+*pygresql-4.1.1 (16 Jan 2014)
+
+  16 Jan 2014; Aaron W. Swenson <titanofold@gentoo.org> +pygresql-4.1.1.ebuild:
+  Version bump. Fixes bug 289228 and 482704.
 
   28 Nov 2012; <titan@gentoo.org> pygresql-3.8.1.ebuild, pygresql-4.0.ebuild:
   Changed license from "as-is" to "POSTGRESQL". Fixes bug 444746.
diff --git a/dev-db/pygresql/Manifest b/dev-db/pygresql/Manifest
index 28e3a80e0094..9ded537fd7bb 100644
--- a/dev-db/pygresql/Manifest
+++ b/dev-db/pygresql/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST PyGreSQL-3.8.1.tgz 81186 SHA256 5638e1f12c8dd4f1ea8c9db4f92a98d19e66dbef2e25ab45ede190c3fcac816d SHA512 041381dbf60d277d0ad87f9d1975c4d5301ebe084fdbacbf7697013cf62cfebf29f5482f0bd9338c42cf2014f8fd8615dd38c87a0bdc6428daa7afe65c906fec WHIRLPOOL 34ea465a957d486b3e16453d92b4516288f255ba8eb92583de2c866bb3a1ae4dd112319e22fd35de476d145e8deeb3d99245d9fbdf3aa0a5e0fa6e08862986e9
 DIST PyGreSQL-4.0.tgz 89528 SHA256 c57e93835de8a881e714baf217d7ab012297d6f0450454e3cde508937bf6bc9b SHA512 da5b3ffd304533ce92b0cce8c80aa86aaf7514499d7b7b87b0794470bdc9c09b4397ee8d59c714269a0e52ded817b30e26214c84a32f353c57f01315144dede8 WHIRLPOOL 0d3a372a96a0f3bb2003075db13755ebe1a66216df009c4185ee16d7504dfc3589963748f98cde1147dd99a156405830d1d98b9e7d36999867777ce9233afb4d
+DIST PyGreSQL-4.1.1.tgz 100883 SHA256 bb14092f97c66ed13b8faf71471b8c156c6b46d915858447f3a63e9abe48eef7 SHA512 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f WHIRLPOOL 323bfd1b72341be6b14d71fd4f05f5005a0f8a387f9b050ef3c786531ea19e057aa67fb5737b5aa0c4ca0912ad697a39d8957d70bb6bb4056e81f406ade5a6b9
 EBUILD pygresql-3.8.1.ebuild 961 SHA256 607edbb4f25e08261f0ea161de2696adb418eb87e0c1600a65a907dce2dd1ef5 SHA512 170d83e7e4f151b8ead92ad2cf7f9f12a37966deff783a0cbff663096c5e96bc26c11bd1508ba5b96460d8f15cf34e764b7a50695a9e8766a2b38e15a38de46f WHIRLPOOL 1c102948d5397b45b046c288e7750294ebe424a4ac1594c2189474725adea072609ae161371d74293e1464e0e2bd5f863ba92656ccb70ad834e1fc157651c6e6
 EBUILD pygresql-4.0.ebuild 937 SHA256 ce2d506ec347dcd56ed29fdb8685e2fe3b17b12839478c5c17cc5ba0efe863d6 SHA512 3aae6cf08b191d48e6c8e0ac698c624d20ac7e62b43eb3f90eacc14cf4c498f6b1ca7f3429e277fd601c361fafae6850eae0dd76a16aff16b041868fbc4be619 WHIRLPOOL d1ef9d42055b8ed461616fe7f655e231feff5cf0631b5de2e11c9fd81492ca24c3186d0a4e3dd0be7602714cdbf30f4279522b36738f40aeefe9519676e5cb70
-MISC ChangeLog 7375 SHA256 95115ee045377cc5633b5076fc5558a273392a04be48eed106f764bcdd1f3566 SHA512 ace7f353c6423da0fbf640900ac7f507375deb3cce563cc6d3ef858d84006e12f6c559b5d4cb7faa0af00bd2c12d51c562850df0459446fd58e7b93a2528ec59 WHIRLPOOL 883f9e6519cd99bc98eff8574d5ce7477d0e20eaa1d35f2e9a4303e35ea07a25e82ec574bca9f1544e4271bb21bb823d29d73ad8b38b7328214796578b7b7db4
+EBUILD pygresql-4.1.1.ebuild 1726 SHA256 8e03243c129862ab79417c2d913a3093881c9b5ba236f28d4d02a9b447bdc97c SHA512 1dbc0a27d75793c4239565b9afeddf2435ec102d0946055578b1d664feb4724a8024b4176328175d1b27a9a2681abb08361045fcf216427a380178ff0e4a932f WHIRLPOOL d07e026742d414917f8dcab30e7b444a8c6ceba032b6adf5cfa8ba2d33f81b3d8a76f5e98ff40d272e487af161904d87c9553e6ae921fc3950996440133c2e6f
+MISC ChangeLog 7532 SHA256 8bafce2868269b2fa8f2eae8db064c2e61351626552f111f6a53303f11e7f577 SHA512 b89caa49476c554cf93b5ecadb19ec1cd1b5f85be8c0e2cb54f5de1eb8cb50cb3eebec5c9b9f3795cf8acb597e68bbf54445a96954079e7ab89575faf9f07886 WHIRLPOOL 1ee20deefc45408bc8b6e0508ed7435ff9cff7945387b80429d107f38b8f318d174d03369ee7b6397b8bec3f37591206919bd9bfca2d99117773b2a8c5c7557e
 MISC metadata.xml 163 SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891 SHA512 b8dea0d79b67ec69ca908fa0e8fcbd5edf1c9e37fb2a8c00621239dba6e9e8c7a5270e9914863460faabb0b96bbbc796aa75cb5374542ee519742f4889f91701 WHIRLPOOL 254c018c32b2a35bb47fd8c01e1ed3649dc78001f40fc8a76d10416358e928a67d7142825c00056eafb6f329901ebc9ae87c88cbc2f14d1ae21a6f7419f0a038
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlC2fR8ACgkQVxOqA9G7/aDYZgD+IJwpeK0dtuawI/p7wzlzTVty
-jqQ2Gnk1AA8q1R0dYfMA/3PJB1SscNbfp0T/h4Ds2EaRaVK744csAssDqjfcMnhj
-=fZNq
+iF4EAREIAAYFAlLXwdYACgkQVxOqA9G7/aDVxwEAm7vwuFwv2ZdPuSpeGX9gzoLd
+mHDFITp4KmgX//JQKekA/R3JEFXP/CQ6XFLxTYxwVm/02ZcPPQXLoDAQAlEC90ly
+=DCIU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pygresql/pygresql-4.1.1.ebuild b/dev-db/pygresql/pygresql-4.1.1.ebuild
new file mode 100644
index 000000000000..90b673f09fe2
--- /dev/null
+++ b/dev-db/pygresql/pygresql-4.1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 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.ebuild,v 1.1 2014/01/16 11:26:06 titanofold Exp $
+
+EAPI=5
+
+POSTGRES_COMPAT=( 8.{3,4} 9.{0,1,2} )
+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-base:8.3
+	dev-db/postgresql-base:8.4
+	dev-db/postgresql-base:9.0
+	dev-db/postgresql-base:9.1
+	dev-db/postgresql-base:9.2
+)"
+
+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
+}