From 1a6eafd75cbebd1b663729d398710328d42a029a Mon Sep 17 00:00:00 2001
From: Aaron Swenson <titanofold@gentoo.org>
Date: Wed, 10 Aug 2011 22:47:31 +0000
Subject: [PATCH] Fix LDFLAGS not being respected

Package-Manager: portage-2.1.10.3/cvs/Linux i686
---
 dev-db/slony1/ChangeLog              |  8 ++-
 dev-db/slony1/Manifest               | 10 ++--
 dev-db/slony1/files/ldflags.patch    | 29 +++++++++++
 dev-db/slony1/slony1-2.0.7-r1.ebuild | 74 ++++++++++++++++++++++++++++
 4 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 dev-db/slony1/files/ldflags.patch
 create mode 100644 dev-db/slony1/slony1-2.0.7-r1.ebuild

diff --git a/dev-db/slony1/ChangeLog b/dev-db/slony1/ChangeLog
index e65c3425a14c..74706ad00d4c 100644
--- a/dev-db/slony1/ChangeLog
+++ b/dev-db/slony1/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2011/08/08 09:38:04 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.25 2011/08/10 22:47:31 titanofold Exp $
+
+*slony1-2.0.7-r1 (10 Aug 2011)
+
+  10 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +slony1-2.0.7-r1.ebuild, +files/ldflags.patch:
+  Fix LDFLAGS not being respected
 
 *slony1-2.0.7 (08 Aug 2011)
 
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index ef5501f6c7ec..481bd8f04e8e 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ldflags.patch 972 RMD160 2ee7ad280f7a9ad8b4894f10ddf0a094d98f4a5c SHA1 13928fc01c52e648f2eee4663bcc88cffd277af3 SHA256 3f5bcb87a9dd92cf3e10b1b3dc347ec2a4214190ab5feab1da9cffcb9af695df
 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,13 +12,14 @@ DIST slony1-2.0.7.tar.bz2 1001021 RMD160 d5af118f1181bd303ff0d02ee3fffa1cb1168f8
 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
-MISC ChangeLog 3713 RMD160 3e08f9d8b1e08963acbcd77fd4621296e8d2c760 SHA1 fc64ebd7ed5e62d1147fd79fcc7b6471f005322d SHA256 77fe7532eff7105e9ef9e109ae1577e6ab57c59318f2b77062ef8d2c7c1102e6
+MISC ChangeLog 3885 RMD160 61f592c7ea0cc865e2a6fed4bad9cfb67ba4ca2f SHA1 4504d077528e996be8045041d858020ae918b26c SHA256 3d1d26c901063255341e0db0cb22b572f54c86342523aac9ff5f1245e0007df8
 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
+iF4EAREIAAYFAk5DCokACgkQCOhwUhu5AEmknQD8C7/Gtby6YqulCk2IOV3fuAZ0
+oTI80E2/gHaWfrNNk5oBAKEVMPeKIydIvoZmttb9cXISXyTzrFSvV12OGhr7zBBz
+=B7/C
 -----END PGP SIGNATURE-----
diff --git a/dev-db/slony1/files/ldflags.patch b/dev-db/slony1/files/ldflags.patch
new file mode 100644
index 000000000000..3aa486f10062
--- /dev/null
+++ b/dev-db/slony1/files/ldflags.patch
@@ -0,0 +1,29 @@
+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/slony1-2.0.7-r1.ebuild b/dev-db/slony1/slony1-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..b7efa3af25cc
--- /dev/null
+++ b/dev-db/slony1/slony1-2.0.7-r1.ebuild
@@ -0,0 +1,74 @@
+# 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-r1.ebuild,v 1.1 2011/08/10 22:47:31 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_prepare() {
+	epatch "${FILESDIR}/ldflags.patch"
+}
+
+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
+}
-- 
2.26.2