Version bump fixing bug 433509. Remove unreferenced patch.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)

4 files changed, 98 insertions, 31 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/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
+}