Version bump.

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

4 files changed, 116 insertions, 5 deletions

diff --git a/dev-db/slony1/ChangeLog b/dev-db/slony1/ChangeLog
index 288a435b68fb..f3bb9a92712e 100644
--- a/dev-db/slony1/ChangeLog
+++ b/dev-db/slony1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/slony1
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.26 2012/01/30 11:45:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.27 2012/02/22 11:28:13 titanofold Exp $
+
+*slony1-2.1.1 (22 Feb 2012)
+
+  22 Feb 2012; Aaron W. Swenson <titanofold@gentoo.org> +slony1-2.1.1.ebuild,
+  +files/slony1-2.1.1-ldflags.patch:
+  Version bump.
 
 *slony1-2.1.0 (30 Jan 2012)
 
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index b99641fa115e..674bda098473 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX ldflags.patch 972 RMD160 2ee7ad280f7a9ad8b4894f10ddf0a094d98f4a5c SHA1 13928fc01c52e648f2eee4663bcc88cffd277af3 SHA256 3f5bcb87a9dd92cf3e10b1b3dc347ec2a4214190ab5feab1da9cffcb9af695df
+AUX slony1-2.1.1-ldflags.patch 974 RMD160 69f917d9842f6e1d4e2bba1d6ed997a92e839ab6 SHA1 b1f148ad017abafdc2442d93fd95930032f0b187 SHA256 a412b1d77fcb715aa0840b5ea7063363eb14a1a6cba850d7852914f9eb3d52b8
 AUX slony1.conf 355 RMD160 179bcde2acbe09e96118058444087f8fc1dad0dd SHA1 9490aabdc897568e5898a6fd0dffaa602a4a38ac SHA256 f722568539e1dbb3a86aa65a2c44582780841823dbc6957ff9861a48ec38a0e3
 AUX slony1.init 720 RMD160 c906625e844bafe8e5bdd87d7348f56cdb03181d SHA1 0eb3b399da339b6cb2301f6de7db956c310aa15d SHA256 e25c1e302d6e578c56ae88a7c24cdb1042f7dc986f00565b5e7d933d8224e08a
 DIST slony1-1.2.10.tar.bz2 846038 RMD160 14758713a5c58548326d5285868b9fa41bbd480d SHA1 1fef4cdd9440c5f1078fb815511970c854e51d6a SHA256 b4e63e122053f07bbe6f7f6b39dd113ad5b98bc2d249b73041f6800ce6c87101
@@ -11,18 +12,21 @@ DIST slony1-2.0.7-docs.tar.bz2 231708 RMD160 19cf13b5ac36e54c8564d8a141c3966551e
 DIST slony1-2.0.7.tar.bz2 1001021 RMD160 d5af118f1181bd303ff0d02ee3fffa1cb1168f82 SHA1 4f9fb4a78c2492498e40db2a6e15159681576474 SHA256 5a25769192941cb307af7c9d1960e882a622b4dc54d860b99932fc39d843fb47
 DIST slony1-2.1.0-docs.tar.bz2 257650 RMD160 cccbdfbd742ea89a557ec522a6eb306feb13c697 SHA1 e3407b0e9212b0588dbe8d60bfc3152a9ad5466b SHA256 76382892e59b35c1b9a0a24da13ab8869c68e514b5818b9209796958ca631586
 DIST slony1-2.1.0.tar.bz2 1442289 RMD160 2a7acf8cf48f7d2e3c5a84423ff512471d58b238 SHA1 a4c488c1a41aef080fb0c8ed9cbf8264fe34c20d SHA256 74526828ef1913c438536c7e943e2214d45d8976d1325c50f4e9d1db67a57b5d
+DIST slony1-2.1.1-docs.tar.bz2 1314445 RMD160 aea586de6f8fd55a6a9667350583727b721f4cbf SHA1 941244b5a14ce5027c2f48e2d1fd74fe32fa4ea2 SHA256 1569d3b36289708648c69743880c8a76a7bbbada63d15699b36296f3d970143e
+DIST slony1-2.1.1.tar.bz2 1483119 RMD160 ce8d0d7da61314759ba809787572cffc822187b4 SHA1 fc7446fa51057fb3cae21a67e74ddad7b84c1b0f SHA256 eb89490731be0f53586e98ae39132a544cee8167dbee77b9ce92800ba9d3bd63
 EBUILD slony1-1.2.10.ebuild 1234 RMD160 8ff59658d1871fcdccc7622543755af9f52b029f SHA1 6292c9cac821f8fa0f4b5a234ff79fcc45fe07f8 SHA256 d3deec5ec509ae9f435e98ab3bb70de4baf18311327e72f03f5b521652e88e74
 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
 EBUILD slony1-2.0.7-r1.ebuild 1933 RMD160 e8a2f9b8f75aafbedb2c5d13a44ba9781b27b2e1 SHA1 44c7ac76b666d7a726a29f3a78b0873fa3e6a0e3 SHA256 6df189b1969bd9b37f581ac1de1acb9a0f6fc599f4aaf675b11ef58149b33a9a
 EBUILD slony1-2.0.7.ebuild 1876 RMD160 d89234603a3bad7d4863e67860d9b0e8487c492e SHA1 ce044eadf921d396a724590c1b46c83b7871a10d SHA256 8140b770e68ae8a66abdda67d0d7d92f09bb04531237dc5d569ff26b40024874
 EBUILD slony1-2.1.0.ebuild 1904 RMD160 c9e8253fa55f6298a2b1c99d852d68386255c850 SHA1 17f234fc87f338072c8b6e005524d735ab7b086a SHA256 474b8dcc687f1d776e949b231d3fc22f4dee03387ac0b0b18a134ce9c6c657f9
-MISC ChangeLog 4027 RMD160 7699cece7df4dd7843c6ee41875a6efd72ec6bd0 SHA1 d82d5d61ef94552c7dcca413cdc2c1e1f054decd SHA256 27e7bedc816f9141a53ab4f89d9d432a9844d64e5703dfc534d31e73513eff4c
+EBUILD slony1-2.1.1.ebuild 1916 RMD160 68ee0ef2d9463af15d4b56cf1261e62e44858f38 SHA1 46f9150066ce39aff1faa0f5435ecd21b19c40f5 SHA256 f73a60001757a7705e2a69a47e9df5325a587f328de8cc44de8d66e8d51ecebd
+MISC ChangeLog 4188 RMD160 0a503c66679c1e731785df1e239a896d29788f0f SHA1 e8aafc0333b1d5b3088fc29ecad1dc0418b07858 SHA256 61c8d51e94aefe5b4b97286e378c2da7b5c2df4c7a8a10013b5a7217b99bc22b
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8mgskACgkQVxOqA9G7/aB27gD/Y4yiIm+TrTxMF7f19amC4GiE
-+ISTuZ3a97T1+5jJLnAA/iUTy0DfXdsdol8oAPuRonaEl9w6vNINCmR/vVIgSoZ9
-=yEs+
+iF4EAREIAAYFAk9E0VMACgkQVxOqA9G7/aASKQEAhYaL7XrfbqEEENqAYXt4JWmJ
+AVdNdr2leYmcFgnCongBAJwzdSUxBPQaiW9HM6cq9nBq1GhDRXsk3pFgGdmWfT+J
+=ko2q
 -----END PGP SIGNATURE-----
diff --git a/dev-db/slony1/files/slony1-2.1.1-ldflags.patch b/dev-db/slony1/files/slony1-2.1.1-ldflags.patch
new file mode 100644
index 000000000000..35452ad3b852
--- /dev/null
+++ b/dev-db/slony1/files/slony1-2.1.1-ldflags.patch
@@ -0,0 +1,29 @@
+diff -Naur a/Makefile.global.in b/Makefile.global.in
+--- a/Makefile.global.in	2012-01-25 14:13:40.000000000 -0500
++++ b/Makefile.global.in	2012-02-22 06:14:05.240047000 -0500
+@@ -80,7 +80,7 @@
+ subdir=$(slony_subdir)
+ 
+ override CPPFLAGS := -I${pgincludeserverdir} -I${pgincludedir} $(CPPFLAGS)
+-LDFLAGS =   -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
++override LDFLAGS  += -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
+ 
+ ifeq ($(GCC), yes)
+     CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
+diff -Naur a/makefiles/Makefile.linux b/makefiles/Makefile.linux
+--- a/makefiles/Makefile.linux	2012-01-25 14:13:40.000000000 -0500
++++ b/makefiles/Makefile.linux	2012-02-22 06:15:45.652523000 -0500
+@@ -12,9 +12,9 @@
+ endif
+ 
+ %.so: %.o
+-	$(CC) -shared -o $@ $<
++	$(CC) $(LDFLAGS) -shared -o $@ $<
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -o $@ $<
+ 
+-sqlmansect = 7
+\ No newline at end of file
++sqlmansect = 7
diff --git a/dev-db/slony1/slony1-2.1.1.ebuild b/dev-db/slony1/slony1-2.1.1.ebuild
new file mode 100644
index 000000000000..3caa4bb39d74
--- /dev/null
+++ b/dev-db/slony1/slony1-2.1.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-2.1.1.ebuild,v 1.1 2012/02/22 11:28:13 titanofold Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+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
+MAJ_PV=$(get_version_component_range 1-2)
+SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
+		 http://main.slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="|| (
+			dev-db/postgresql-server:9.1
+			dev-db/postgresql-server:9.0
+			dev-db/postgresql-server:8.4
+			dev-db/postgresql-server:8.3
+		)
+		dev-db/postgresql-base[threads]
+		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_prepare() {
+	epatch "${FILESDIR}/${PN}-${PV}-ldflags.patch"
+}
+
+src_configure() {
+	local myconf
+	use perl && myconf='--with-perltools'
+	econf ${myconf}
+}
+
+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
+}