Fixes bug 376013 and bug 377839. Removed unnecessary patch and old ebuilds.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

7 files changed, 92 insertions, 199 deletions

diff --git a/dev-db/slony1/ChangeLog b/dev-db/slony1/ChangeLog
index 565eedd4f2ca..e65c3425a14c 100644
--- a/dev-db/slony1/ChangeLog
+++ b/dev-db/slony1/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/slony1
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.23 2011/04/11 09:54:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.24 2011/08/08 09:38:04 titanofold Exp $
+
+*slony1-2.0.7 (08 Aug 2011)
+
+  08 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  -files/slony1_remove_jave.patch, -slony1-1.1.5.ebuild, -slony1-1.2.12.ebuild,
+  -slony1-1.2.17.ebuild, +slony1-2.0.7.ebuild:
+  Fixes bug 376013 and bug 377839. Removed unnecessary patch and old ebuilds.
 
 *slony1-2.0.6 (11 Apr 2011)
 *slony1-1.2.22 (11 Apr 2011)
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index b72eb383afa3..ef5501f6c7ec 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,17 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX slony1.conf 355 RMD160 179bcde2acbe09e96118058444087f8fc1dad0dd SHA1 9490aabdc897568e5898a6fd0dffaa602a4a38ac SHA256 f722568539e1dbb3a86aa65a2c44582780841823dbc6957ff9861a48ec38a0e3
 AUX slony1.init 720 RMD160 c906625e844bafe8e5bdd87d7348f56cdb03181d SHA1 0eb3b399da339b6cb2301f6de7db956c310aa15d SHA256 e25c1e302d6e578c56ae88a7c24cdb1042f7dc986f00565b5e7d933d8224e08a
-AUX slony1_remove_jave.patch 1431 RMD160 8533996992fe6ab806b5f06dce013362187eafd0 SHA1 e1d2e5a21352f83397fc9563f83ffef11d2c42a5 SHA256 11db488c15e155893c784520f2ec0bf23c56d2af84b230848d6890b951d15976
-DIST slony1-1.1.5.tar.bz2 610569 RMD160 207e81a8f30366810cb63ddb256f324415cad1f1 SHA1 19f42fbd3c92f299b65803adcebfed5b508c236b SHA256 6e216eb121cbb2c195b4a3ee557a606f4ba815049f781c996a58a9946530e1f0
 DIST slony1-1.2.10.tar.bz2 846038 RMD160 14758713a5c58548326d5285868b9fa41bbd480d SHA1 1fef4cdd9440c5f1078fb815511970c854e51d6a SHA256 b4e63e122053f07bbe6f7f6b39dd113ad5b98bc2d249b73041f6800ce6c87101
-DIST slony1-1.2.12.tar.bz2 872677 RMD160 0eeba14b620ae8bde21dd78d3e14a9736ef3d197 SHA1 fbdbbd76ee4e20c46ee53de8922ceca3ef8de8ac SHA256 2b69f8dbfeecbc8de9408ba5d59bcf78ce3ba1e5446e7b25deea51efbe344a81
-DIST slony1-1.2.17.tar.bz2 881035 RMD160 403e7bfd54a1392ae20103322e055d7fc238cb0c SHA1 8c323023a920b2db96b3d3a80ababf512fabb5f2 SHA256 0cfcf6853168bc1ea76ff0cf860bff48b769fb4bdbb9ecc20c838063cbaa15f9
 DIST slony1-1.2.22.tar.bz2 935026 RMD160 9f62bb9a6d45422a53b14d07ddf5d3cde1be86bb SHA1 631c6f48e335daa6301a9a6ffa4faa76f0ec48e4 SHA256 10a792d844f4a17d8d96af24f7111dd9ff5043736160ff4fefc0a9ed26ec4c1a
 DIST slony1-2.0.6.tar.bz2 979208 RMD160 39ceec9fc823903e6e2c6080558ab5e00a476697 SHA1 6e3c8d9bb8ae138c089782836f9b303cadc82b97 SHA256 7630ce45c3ff64d032de0a519a0992fadee8887ce0a728c13a2fbe23371f324f
-EBUILD slony1-1.1.5.ebuild 1416 RMD160 1ffc49c460606acc800b3fe48cf0dd0470359869 SHA1 faa1faaf9db08c123921639a49302372eeacd966 SHA256 80e5bf4103e7eceb3d89c3f0de09eb276fe13a38bfc954aca726074c0a7cfc0c
+DIST slony1-2.0.7-docs.tar.bz2 231708 RMD160 19cf13b5ac36e54c8564d8a141c3966551ed476c SHA1 d8209b7dc748933b4d68e9e820a6e9ec6678f2bd SHA256 ed0d728b06d896ec6e738d42ba6cbf298297bc54993437e419dcb83ec7e325d9
+DIST slony1-2.0.7.tar.bz2 1001021 RMD160 d5af118f1181bd303ff0d02ee3fffa1cb1168f82 SHA1 4f9fb4a78c2492498e40db2a6e15159681576474 SHA256 5a25769192941cb307af7c9d1960e882a622b4dc54d860b99932fc39d843fb47
 EBUILD slony1-1.2.10.ebuild 1234 RMD160 8ff59658d1871fcdccc7622543755af9f52b029f SHA1 6292c9cac821f8fa0f4b5a234ff79fcc45fe07f8 SHA256 d3deec5ec509ae9f435e98ab3bb70de4baf18311327e72f03f5b521652e88e74
-EBUILD slony1-1.2.12.ebuild 1236 RMD160 d51f5c8bb299ae78ed6559e31a51dbc00d057893 SHA1 8842ce5c27a5b58dd3b2095b6a0bf773852adcab SHA256 7e7bf3e3fde0f905f1856cbff0db3fe5a65b32f7f084c51d9e2c8b21ba67ea25
-EBUILD slony1-1.2.17.ebuild 1236 RMD160 253c6a6bca59a7c9c532b8a0992b72ff811651dd SHA1 8ce10562dc5e9c76a7e1214e55f0f54b523abbd4 SHA256 e77af1c6831ed77d384da0e13fe83bbf1dac20753c7d2d01880928a34b52d832
 EBUILD slony1-1.2.22.ebuild 1236 RMD160 c2f673f7c68f450ccedc6d5695398ccaf18aa0e3 SHA1 a24e31f34135ef5d3b6124f3e8d37c843a7baaad SHA256 13ef3ca38ca6d7d9751d07af23ce37e3fddfe4206a5fad1e48c4d2c8b7163a8c
 EBUILD slony1-2.0.6.ebuild 1235 RMD160 5582030d0793d40cf22ecbae772ecbce11c87eba SHA1 eec522c466ab5aa060845c676351377919a1a462 SHA256 6d1dee6fa2a38a8adf10fbcc16b0c3cc861cf50bd4666695ad00f49c40882312
-MISC ChangeLog 3419 RMD160 c819c217f0aedc514290defb3b726cd68e1757df SHA1 ecb2cbd4f10d8eec3bebc9c1cc95c65167ff1619 SHA256 413e2a4e2389177fcaf2b1117f444e85c8fcdea5aa4ca8d3a4266f35199bfc0f
+EBUILD slony1-2.0.7.ebuild 1876 RMD160 d89234603a3bad7d4863e67860d9b0e8487c492e SHA1 ce044eadf921d396a724590c1b46c83b7871a10d SHA256 8140b770e68ae8a66abdda67d0d7d92f09bb04531237dc5d569ff26b40024874
+MISC ChangeLog 3713 RMD160 3e08f9d8b1e08963acbcd77fd4621296e8d2c760 SHA1 fc64ebd7ed5e62d1147fd79fcc7b6471f005322d SHA256 77fe7532eff7105e9ef9e109ae1577e6ab57c59318f2b77062ef8d2c7c1102e6
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4/roIACgkQCOhwUhu5AEm8NAD/bvlUg/aESq28LiULE47lP3LU
+j3w1MfQ9b5SWSwuBEh4A/iKLJe4godmv623uzptEgpJ5HafAGXBjX3MvNwyVV/C2
+=B+13
+-----END PGP SIGNATURE-----
diff --git a/dev-db/slony1/files/slony1_remove_jave.patch b/dev-db/slony1/files/slony1_remove_jave.patch
deleted file mode 100644
index a33568299466..000000000000
--- a/dev-db/slony1/files/slony1_remove_jave.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naru slony1-1.1.0.beta4.org/configure slony1-1.1.0.beta4/configure
---- slony1-1.1.0.beta4.org/configure	2005-04-06 20:00:54.000000000 +0100
-+++ slony1-1.1.0.beta4/configure	2005-05-11 20:44:49.000000000 +0100
-@@ -9563,46 +9563,6 @@
-   test -n "$NSGMLS" && break
- done
- 
--for ac_prog in openjade jade
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_JADE+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$JADE"; then
--  ac_cv_prog_JADE="$JADE" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_JADE="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--JADE=$ac_cv_prog_JADE
--if test -n "$JADE"; then
--  echo "$as_me:$LINENO: result: $JADE" >&5
--echo "${ECHO_T}$JADE" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  test -n "$JADE" && break
--done
--
- 
- echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
- echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6
diff --git a/dev-db/slony1/slony1-1.1.5.ebuild b/dev-db/slony1/slony1-1.1.5.ebuild
deleted file mode 100644
index 09ff993fb4e2..000000000000
--- a/dev-db/slony1/slony1-1.1.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.1.5.ebuild,v 1.4 2010/06/17 19:15:30 patrick Exp $
-
-inherit eutils
-
-IUSE="perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-SRC_URI="http://developer.postgresql.org/~wieck/slony1/download/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-db/postgresql-server
-	perl? ( dev-perl/DBD-Pg )"
-#	snmp? ( >=net-analyzer/net-snmp-5.1 )
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql"
-	myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server"
-	myconf="${myconf} $(use_with perl perltools)"
-#	myconf="${myconf} $(use_with doc docs)"
-#	myconf="${myconf} $(use_with snmp netsnmp)"
-
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-
-	if use perl ; then
-		cd "${S}"/tools
-		emake || die "emake tools failed!"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
-	dohtml doc/howto/*.html
-
-	newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!"
-	newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!"
-}
diff --git a/dev-db/slony1/slony1-1.2.12.ebuild b/dev-db/slony1/slony1-1.2.12.ebuild
deleted file mode 100644
index 1664987e68c5..000000000000
--- a/dev-db/slony1/slony1-1.2.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.12.ebuild,v 1.4 2010/06/17 19:15:30 patrick Exp $
-
-inherit eutils
-
-IUSE="perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-SRC_URI="http://main.slony.info/downloads/1.2/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-db/postgresql-server
-	perl? ( dev-perl/DBD-Pg )"
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql"
-	myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server"
-	myconf="${myconf} $(use_with perl perltools)"
-
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-
-	if use perl ; then
-		cd "${S}"/tools
-		emake || die "emake tools failed!"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
-	dohtml doc/howto/*.html
-
-	newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!"
-	newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!"
-}
diff --git a/dev-db/slony1/slony1-1.2.17.ebuild b/dev-db/slony1/slony1-1.2.17.ebuild
deleted file mode 100644
index e64318bfac4c..000000000000
--- a/dev-db/slony1/slony1-1.2.17.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.17.ebuild,v 1.2 2010/06/17 19:15:30 patrick Exp $
-
-inherit eutils
-
-IUSE="perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-SRC_URI="http://main.slony.info/downloads/1.2/source/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-db/postgresql-server
-	perl? ( dev-perl/DBD-Pg )"
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql"
-	myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server"
-	myconf="${myconf} $(use_with perl perltools)"
-
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-
-	if use perl ; then
-		cd "${S}"/tools
-		emake || die "emake tools failed!"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
-	dohtml doc/howto/*.html
-
-	newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!"
-	newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!"
-}
diff --git a/dev-db/slony1/slony1-2.0.7.ebuild b/dev-db/slony1/slony1-2.0.7.ebuild
new file mode 100644
index 000000000000..3055002f7fce
--- /dev/null
+++ b/dev-db/slony1/slony1-2.0.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-2.0.7.ebuild,v 1.1 2011/08/08 09:38:04 titanofold Exp $
+
+EAPI="4"
+
+#inherit eutils
+
+IUSE="doc perl"
+
+DESCRIPTION="A replication system for the PostgreSQL Database Management System"
+HOMEPAGE="http://slony.info/"
+
+# ${P}-docs.tar.bz2 contains man pages as well as additional documentation
+SRC_URI="http://main.slony.info/downloads/2.0/source/${P}.tar.bz2
+		 http://main.slony.info/downloads/2.0/source/${P}-docs.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="|| (
+			dev-db/postgresql-base:9.0[threads]
+			dev-db/postgresql-base:8.4[threads]
+			dev-db/postgresql-base:8.3[threads]
+			dev-db/postgresql-base:9.1[threads]
+		)
+		|| (
+			dev-db/postgresql-server:9.0
+			dev-db/postgresql-server:8.4
+			dev-db/postgresql-server:8.3
+			dev-db/postgresql-server:9.1
+		)
+		perl? ( dev-perl/DBD-Pg )
+"
+
+pkg_setup() {
+	local PGSLOT="$(postgresql-config show)"
+	if [[ ${PGSLOT//.} < 83 ]] ; then
+		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
+		eerror "Set an appropriate slot with postgresql-config."
+		die "postgresql-config not set to 8.3 or higher."
+	fi
+
+	if [[ ${PGSLOT//.} > 90 ]] ; then
+		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
+		ewarn "This is neither supported here nor upstream."
+		ewarn "Any bugs you encounter should be reported upstream."
+	fi
+}
+
+src_configure() {
+	econf $(use_with perl perltools)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
+
+	doman "${S}"/doc/adminguide/man{1,7}/*
+
+	if use doc ; then
+		cd "${S}"/doc
+		dohtml -r *
+	fi
+
+	newinitd "${FILESDIR}"/slony1.init slony1
+	newconfd "${FILESDIR}"/slony1.conf slony1
+}