Version bump fixing bug 433509. Remove unreferenced patch.

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

5 files changed, 106 insertions, 36 deletions

diff --git a/dev-db/slony1/ChangeLog b/dev-db/slony1/ChangeLog
index b858d8c001e3..bc79a70bfbc2 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.37 2012/07/28 12:24:08 titanofold Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.38 2013/01/12 21:37:19 titanofold Exp $
+
+*slony1-2.1.2 (12 Jan 2013)
+
+  12 Jan 2013; Aaron W. Swenson <titanofold@gentoo.org> +slony1-2.1.2.ebuild,
+  +files/slony1-2.1.2-ldflags.patch, -files/ldflags.patch:
+  Version bump fixing bug 433509. Remove unreferenced patch.
 
   28 Jul 2012; Aaron W. Swenson <titanofold@gentoo.org> slony1-2.1.1.ebuild:
   Add GPL-2 to $LICENSE. Fixes bug 425926.
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index d7449d5c9e9d..9ea803ce85ab 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ldflags.patch 972 SHA256 3f5bcb87a9dd92cf3e10b1b3dc347ec2a4214190ab5feab1da9cffcb9af695df SHA512 90d1d381b54d0195c5c7420879a331acacbdd1f3c2898e6206fea906355ff7eea16b349a721fdda1d1dce84cb714cfd9eb569151630258966a4ff948d62f6ed6 WHIRLPOOL f966b1875efd9d2a5c3842f4281a4d852d38d7cb76888d9224f5f65638cc92104e6fd3781b447b050f95b628db9f60097f7f5d7511628912d14908dc1b5f0e03
 AUX slony1-2.1.1-ldflags.patch 974 SHA256 a412b1d77fcb715aa0840b5ea7063363eb14a1a6cba850d7852914f9eb3d52b8 SHA512 0b5d317dc6d198f314000bf6a9de2936f0ad7512eaefc65a3c88cb549db19def46b2ec673fd33602f80732aa1fcbb6ea5b8b6bf4ab085ce221f4d472651a486e WHIRLPOOL 5b814eb7d9612ba98a55cca2489987fda32bb43d31247ca796d63aebfb5df4b826eabe08cf6e8e5ad626513dd8bce933d694b08c70c68a6da7ae38d6f030fa9a
+AUX slony1-2.1.2-ldflags.patch 467 SHA256 92b688972b183656d9b1c2f0a85873727e52c70c1be7d7bf49e3b566f6ffd935 SHA512 202570d6ac0563789a20cdb529d5d1e0f9a8bade99ae30d9aa8f61e76db78d56b2617ce414fcae31b4a2b9518e8f21cf7161accee93a4dd4681397f88117426c WHIRLPOOL 3b598aca98744bc2082948689bfe7eb2063e369a97be1187ffade172e20e8f38547dad9a5cd4c6d6fe4d96d1ddc202ae8dca4324fe48a5e2877a0bcf2bb99baf
 AUX slony1.conf 355 SHA256 f722568539e1dbb3a86aa65a2c44582780841823dbc6957ff9861a48ec38a0e3 SHA512 769c47812dbc27b2d688e262b9287cbf975fbb5bbcbed8ccf65781edc1437e13e4be5c923f3b77b47fc81589bb429018489bec5235d03361e1032b356ad638ae WHIRLPOOL 25e0dd3924075f35fa6abaa51172076f3ab2480b8abc98229fb10f66331a5f555dcf753dfa9d45c445a565093145e63a3a27cdc92b82a48b5f271a44196ea5ef
 AUX slony1.init 720 SHA256 e25c1e302d6e578c56ae88a7c24cdb1042f7dc986f00565b5e7d933d8224e08a SHA512 5c83eff781c2c3bfcadf26f657fc6420b6934a4531a10b2fc08a490a96b663aebac4f3cfc533e05ad87b300cb8a0f5ad577b4326bac538082dd549b10b7a80f6 WHIRLPOOL 20c47887b77165f22ff6599f81e44b165d703b3da44b1ea8c7f43bbf54cc5403abcceda4890082e024b3f23d16880f7af74eac252ba95b06412d2bf30235e4e6
 DIST slony1-2.1.1-docs.tar.bz2 1314445 SHA256 1569d3b36289708648c69743880c8a76a7bbbada63d15699b36296f3d970143e SHA512 826b0d4c2345c44cb49654894a7095c8ab59b94883cdb4c33ae7494806d290aaf79953e00c6416e895dad1590fa741356ca9b7610629432fe356c931e4dc7291 WHIRLPOOL e94ca18b87a73a5398db63d4a470faa56795a57e9fbcfef071b3b674925f34c6553b09e3d7229d14b704df94c446e9792d0a6415b3295f603aafa9f40b2ef499
 DIST slony1-2.1.1.tar.bz2 1483119 SHA256 eb89490731be0f53586e98ae39132a544cee8167dbee77b9ce92800ba9d3bd63 SHA512 4ace7e77602baadd0e2532ab4a4c9d9df95caf65670f81569ada385170b4ebfa0b23c5e49dc613346dc82769113d752e57551adf12585403da2080e3802660c4 WHIRLPOOL 0a1f1f38d676802ae63b787bdf854ad38108b48f780fed3560e0485cfe81740e68aa10af3fb25bba257ad78ef1910152be1e06dd44a66e7d859a9d415c1e7580
+DIST slony1-2.1.2-docs.tar.bz2 1314286 SHA256 6f99ec5fbc218a7edf7923c1fd8a3b5f68e07c267df09c67db10259a43d26954 SHA512 fa6240fe70fc485ca6d88ebfe8883942cce8cd9d6847a0e3737fecd939012aec6ad924bd128af7f7a78c3f8c1ac5772b83ef91230a30d6f6d1c495f2922912d1 WHIRLPOOL 4b278fb22612ba3de34c7712110319896dfa782f740bd52688bc9cb4da8d9523ad5a0aa4c869389c4d5befb78ded85170b215fd1a111244bc7d2da8bd7d0f7f0
+DIST slony1-2.1.2.tar.bz2 1512301 SHA256 ae25f9b0ea91cf4884abf302b87c36effbc43e68be5b6665a31d03ed0cce182f SHA512 9c3669a12f893c832a82af43f8c9fe0637ec6266a0a938498c1ee397e62c9b18acd1c9331c11594a7e2aa574d14255e8cb5116038797854b12fd7b393f8866e3 WHIRLPOOL 8f65bbda3376e8d82d39cdca091118a8c0c82d4fa863e282fe02ab842dd214b3f461b80df7c9703e6921da3cb4e5f60bf1d578d6b1367a8d94fb625ef77fd2ba
 EBUILD slony1-2.1.1.ebuild 1919 SHA256 86c7fba178835300a1c3d0952bd51b78f29e105c666ace760bb31421e882d25f SHA512 47af675e1c02030f388a121e9a42efe95d7d76a54eebbb070193a2a4554c53c3d8d206ab593dbc345434419577ab1b3e770a2993b48360d283f2c86d7f38aab3 WHIRLPOOL c2f96a90a927c5bb4e5803f60659ffb78a0d0aab4f47c1ec8bad30636a0fa7a1cf464b0d7fc44efc98d9a6a3c465450d8bbe11e6ad3efe5b5446f412e9ce25df
-MISC ChangeLog 5304 SHA256 e31bec96c6d5cac7650a665e87e01ce0a355d1a315bd74320d3c2ac25c87646d SHA512 59c801ed82c0c03cc89b1e951d2cb35b17123cc2efb3723b8d240011c8537de63fea8c61a881be3c66ea77f82e9df0d079ccfef6949436bba559aa6d570f0de8 WHIRLPOOL d152516c8a00ed528fef32c7cc920093d13e0a1dab02880b6379cbfabb3c43d1955d7693ea9be6bae8c152bcb353733b670aa1fa69ac556ec8569865353b6bad
+EBUILD slony1-2.1.2.ebuild 1954 SHA256 d67cff885824e327b04f8665a82d82e0b6ba8d442217ad559aea5d56031245a2 SHA512 2e76a633aca984d1e63e526a16b3eaa7ae09b529aec9cd5197081a1af874557e325e9f225906a2c88cb92307b0e3bc020bbc13282f94bfd33592ae22ab1a2a77 WHIRLPOOL 72aba40dcd87a003edab8551b7d68b1db1d1b52329ffb5a6d87b563b09c723267b87364b25a3b6b2125cc3f87fae781b2c9dc83bdcbd50aa56cd38a7948d1893
+MISC ChangeLog 5532 SHA256 a13cb5df87edc1baa88deb2b9561072eb666748a3313b685de99361d71af2648 SHA512 a958928a290780a292ca23d5f5b79673b6362f270dc3a1b22bcfb18d9bcb57a2f5e80270d97dd150e7d9df9aa6490561abd95fc98cb8287d7e1bf463b3bb06e2 WHIRLPOOL 29acbb1d208fcbc197970d7975b93800387aab15a948848e05cdb3908804285a042683a8ad868f9d16695a0b566e9233d0c675cb74066b00cbc17e824ff76f6c
 MISC metadata.xml 164 SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b SHA512 45b3f5ba6ebbeb2f990e5612b545bee41bb8c9f29e7f31de34021384760fcfc4694de0782fc0bdf556fe81ed3b334fc96c33563b0fddc2545484099a2cd76bb2 WHIRLPOOL 5fd1b0fc651f51ed3d1715cff87d86e7c0fe9c7825529069c7c3fed13641aee24bee1971b6e1057797b7b191ef0d50a1ea68c9f24588872d7d960787f9f02bfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAT2dkACgkQVxOqA9G7/aB2JQD+OaO5K2M3prvTtQAtyziOMthW
-6iwVkHOX/ba+8odSENoA/3sAvN26GT8/v7C6UE+W2HEdn6lzgY3TGQfX3ljXMsoj
-=gToL
+iF4EAREIAAYFAlDx15QACgkQVxOqA9G7/aCjhgD/QQ+eGHYZowchlwd2yfT6Ruyf
+bb/ushsE0gVS5repXCsA/i210g1wOZI8VAQXPf2XJGScJEsai7+67vJR+6YKOKXI
+=3PCi
 -----END PGP SIGNATURE-----
diff --git a/dev-db/slony1/files/ldflags.patch b/dev-db/slony1/files/ldflags.patch
deleted file mode 100644
index 3aa486f10062..000000000000
--- a/dev-db/slony1/files/ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur a/Makefile.global.in b/Makefile.global.in
---- a/Makefile.global.in	2011-07-11 17:19:57.000000000 -0400
-+++ b/Makefile.global.in	2011-08-08 18:28:58.654658951 -0400
-@@ -85,7 +85,7 @@
- subdir=$(slony_subdir)
- 
- override CPPFLAGS := -I${pgincludedir} -I${pgincludeserverdir} $(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	2011-07-11 17:19:57.000000000 -0400
-+++ b/makefiles/Makefile.linux	2011-08-09 07:52:47.071130982 -0400
-@@ -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/files/slony1-2.1.2-ldflags.patch b/dev-db/slony1/files/slony1-2.1.2-ldflags.patch
new file mode 100644
index 000000000000..038b2ee20fb5
--- /dev/null
+++ b/dev-db/slony1/files/slony1-2.1.2-ldflags.patch
@@ -0,0 +1,17 @@
+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.2.ebuild b/dev-db/slony1/slony1-2.1.2.ebuild
new file mode 100644
index 000000000000..3c89b088bcef
--- /dev/null
+++ b/dev-db/slony1/slony1-2.1.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-2.1.2.ebuild,v 1.1 2013/01/12 21:37:18 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 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="|| (
+			dev-db/postgresql-server:9.2
+			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
+}