dev-db/plr: version bumped, cleaned out old versions that don't work with the postgresql's in portage

svn path=/sunrise/; revision=12803

5 files changed, 52 insertions, 144 deletions

diff --git a/dev-db/plr/ChangeLog b/dev-db/plr/ChangeLog
index 9b71efefd..6aa389eb2 100644
--- a/dev-db/plr/ChangeLog
+++ b/dev-db/plr/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/plr
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Mar 2012; Ian Stakenvicius <axs@gentoo.org> -plr-8.2.0.10.ebuild,
+  -plr-8.3.0.10.ebuild, +plr-8.3.0.13.ebuild:
+  version bumped, cleaned out old versions that don't work with the
+  postgresql's in portage
+
 *plr-8.3.0.10 (02 Jul 2010)
 
   02 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
diff --git a/dev-db/plr/Manifest b/dev-db/plr/Manifest
index 8c612d36d..63c468068 100644
--- a/dev-db/plr/Manifest
+++ b/dev-db/plr/Manifest
@@ -1,6 +1,4 @@
-DIST plr-8.2.0.10.tar.gz 232681 RMD160 37ba2448cfdacb9c75565670a0b47f30b8a018a0 SHA1 35d76ed1fa3564dc146afb197c846ea81370782c SHA256 899a4c3ba5244006fb47a7e1e891d408211a981020488554a45e18ec3bb60b07
-DIST plr-8.3.0.10.tar.gz 238174 RMD160 d469280df1825c39453a1b2385f4c66f0f49ea15 SHA1 fa0c766e4a31edf3ab2ae66fcc59a0a0a402ceaa SHA256 1fbf5a5ce1142a0070f0c29892ba960c83d2e52da5ddf81aa5cc87c08753ccca
-EBUILD plr-8.2.0.10.ebuild 1825 RMD160 eb85423a09d939509ee240d0770302ebe4313cfd SHA1 2e078d1fd563eb4700945661ffbe9dd42dd5e873 SHA256 9decd7863407a681cf269325ba474ab717811bf55206d21392d673db7801b1bb
-EBUILD plr-8.3.0.10.ebuild 1825 RMD160 00a73bf03a1b1f1915d87f52193840101442d5a7 SHA1 68be7e51ecfbfafbf9c20156008547eb04bb5a3f SHA256 b7f867806353ec0da561325a35be026695f9f8fabec1dc56fba95fd7d99c1ac0
-MISC ChangeLog 582 RMD160 6f32e6e09e7a6bd1d60f4d9c93ea6d48a2b20504 SHA1 a00c49338bffb3c1ab02c6e0caba4885a0ac31b4 SHA256 dcd0d14fe7cf84d4189f2259aa05f6b90880a2f649ae749bd60481a4b90b4d8c
+DIST plr-8.3.0.13.tar.gz 248862 RMD160 73820cb5db54afe87cb8debc8ac5866b56011c93 SHA1 9f8de516d03b550ac2c5cffb06ace81880b3b698 SHA256 39cfc2e7b7ec6e6ce29c00d412adf1247b4a583f8c21d02bebc6f82b88cab806
+EBUILD plr-8.3.0.13.ebuild 1076 RMD160 9aa0a66a834e948f9c2c697608f582c5993e883a SHA1 c71e380852caeb1e0ae7db06d364bbd2e6f86117 SHA256 8310ae084e6e1221413d4389ee443bc37ca6516cc74fab12356130367e375c5b
+MISC ChangeLog 794 RMD160 e9b3e29ccecb4e52abbef86ab4280e2dd20c0609 SHA1 b0325e2c18a5ea7d7c79e089b4c7120115c04c35 SHA256 b849f15e585c06f339022b11d11d9f833644f8942c75ab7124f25df0755c8fb7
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/dev-db/plr/plr-8.2.0.10.ebuild b/dev-db/plr/plr-8.2.0.10.ebuild
deleted file mode 100644
index e84acb694..000000000
--- a/dev-db/plr/plr-8.2.0.10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib
-
-DESCRIPTION="R language addon for postgresql database"
-HOMEPAGE="http://www.joeconway.com/plr/"
-SRC_URI="http://www.joeconway.com/plr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="8.2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/R
-	=dev-db/postgresql-server-${SLOT}*"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/contrib/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	# the build system wants 'contrib' to be part of the path
-	mkdir "${WORKDIR}/contrib"
-	mv "${WORKDIR}/${PN}" "${S}"
-}
-
-src_compile() {
-	if has_version "dev-db/postgresql-server:${SLOT}" ; then
-		export PG_CONFIG="/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config"
-	fi
-	USE_PGXS=1 emake -j1 || die "emake failed"
-}
-
-src_install() {
-	USE_PGXS=1 emake -j1 DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	local sharepath
-	if has_version "dev-db/postgresql-server:${SLOT}" ; then
-		sharepath="/usr/share/postgresql-${SLOT}/contrib"
-	else
-		sharepath="/usr/share/postgresql/contrib"
-	fi
-	einfo
-	einfo "To install PL/R to your database issue"
-	einfo
-	einfo "\t psql -d mydatabase -U pg_username < ${sharepath}/plr.sql"
-	einfo
-	einfo "You may have to login as database administrator."
-	einfo
-	einfo "You have to define PL/R as TRUSTED language to allow non-administrators"
-	einfo "to use it. Change the CREATE LANGUAGE statement in the plr.sql file"
-	einfo "into"
-	einfo
-	einfo "\t CREATE TRUSTED LANGUAGE plr HANDLER plr_call_handler;"
-	einfo
-	einfo "update the database as shown above and allow a specific user to"
-	einfo "use PL/R by"
-	einfo
-	einfo "\t GRANT USAGE ON LANGUAGE plr TO pg_username;"
-	einfo
-	einfo "For further information on PL/R have a look at"
-	einfo
-	einfo "\t http://www.joeconway.com/plr/"
-	einfo
-}
diff --git a/dev-db/plr/plr-8.3.0.10.ebuild b/dev-db/plr/plr-8.3.0.10.ebuild
deleted file mode 100644
index 71447c7f9..000000000
--- a/dev-db/plr/plr-8.3.0.10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib
-
-DESCRIPTION="R language addon for postgresql database"
-HOMEPAGE="http://www.joeconway.com/plr/"
-SRC_URI="http://www.joeconway.com/plr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="8.3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/R
-	=dev-db/postgresql-server-${SLOT}*"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/contrib/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	# the build system wants 'contrib' to be part of the path
-	mkdir "${WORKDIR}/contrib"
-	mv "${WORKDIR}/${PN}" "${S}"
-}
-
-src_compile() {
-	if has_version "dev-db/postgresql-server:${SLOT}" ; then
-		export PG_CONFIG="/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config"
-	fi
-	USE_PGXS=1 emake -j1 || die "emake failed"
-}
-
-src_install() {
-	USE_PGXS=1 emake -j1 DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	local sharepath
-	if has_version "dev-db/postgresql-server:${SLOT}" ; then
-		sharepath="/usr/share/postgresql-${SLOT}/contrib"
-	else
-		sharepath="/usr/share/postgresql/contrib"
-	fi
-	einfo
-	einfo "To install PL/R to your database issue"
-	einfo
-	einfo "\t psql -d mydatabase -U pg_username < ${sharepath}/plr.sql"
-	einfo
-	einfo "You may have to login as database administrator."
-	einfo
-	einfo "You have to define PL/R as TRUSTED language to allow non-administrators"
-	einfo "to use it. Change the CREATE LANGUAGE statement in the plr.sql file"
-	einfo "into"
-	einfo
-	einfo "\t CREATE TRUSTED LANGUAGE plr HANDLER plr_call_handler;"
-	einfo
-	einfo "update the database as shown above and allow a specific user to"
-	einfo "use PL/R by"
-	einfo
-	einfo "\t GRANT USAGE ON LANGUAGE plr TO pg_username;"
-	einfo
-	einfo "For further information on PL/R have a look at"
-	einfo
-	einfo "\t http://www.joeconway.com/plr/"
-	einfo
-}
diff --git a/dev-db/plr/plr-8.3.0.13.ebuild b/dev-db/plr/plr-8.3.0.13.ebuild
new file mode 100644
index 000000000..47880ce6e
--- /dev/null
+++ b/dev-db/plr/plr-8.3.0.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="R language addon for postgresql database"
+HOMEPAGE="http://www.joeconway.com/plr/"
+SRC_URI="http://www.joeconway.com/plr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/R
+	>=dev-db/postgresql-server-8.3"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/contrib/${PN}
+
+src_unpack() {
+	unpack ${A}
+	# the build system wants 'contrib' to be part of the path
+	mkdir "${WORKDIR}/contrib"
+	mv "${WORKDIR}/${PN}" "${S}"
+}
+
+src_compile() {
+	USE_PGXS=1 emake -j1
+}
+
+src_install() {
+	USE_PGXS=1 emake -j1 DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	elog "PL/R has been built against the currently eselected version of PostgreSQL."
+	ewarn "If you want to install PL/R for other versions of postgres, please use eselect"
+	ewarn "to select the other version and then re-emerge this package."
+	elog "For instructions on how to add PL/R to your postgresql database(s), please visit"
+	elog "http://www.joeconway.com/plr/"
+}