dev-db/slony1: reworked for experimental multislot hydra

svn path=/experimental/; revision=284

5 files changed, 70 insertions, 66 deletions

diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 6b5a877..3bc3277 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,30 +1,16 @@
-AUX slony1.conf 355 RMD160 179bcde2acbe09e96118058444087f8fc1dad0dd SHA1 9490aabdc897568e5898a6fd0dffaa602a4a38ac SHA256 f722568539e1dbb3a86aa65a2c44582780841823dbc6957ff9861a48ec38a0e3
-MD5 27fe1a24fcab45c0e3ad4dd3e53287cf files/slony1.conf 355
-RMD160 179bcde2acbe09e96118058444087f8fc1dad0dd files/slony1.conf 355
-SHA256 f722568539e1dbb3a86aa65a2c44582780841823dbc6957ff9861a48ec38a0e3 files/slony1.conf 355
-AUX slony1.init 720 RMD160 c906625e844bafe8e5bdd87d7348f56cdb03181d SHA1 0eb3b399da339b6cb2301f6de7db956c310aa15d SHA256 e25c1e302d6e578c56ae88a7c24cdb1042f7dc986f00565b5e7d933d8224e08a
-MD5 a4d6b16ff6f23fbb578af35472f1ec97 files/slony1.init 720
-RMD160 c906625e844bafe8e5bdd87d7348f56cdb03181d files/slony1.init 720
-SHA256 e25c1e302d6e578c56ae88a7c24cdb1042f7dc986f00565b5e7d933d8224e08a files/slony1.init 720
-AUX slony1_remove_jave.patch 1431 RMD160 8533996992fe6ab806b5f06dce013362187eafd0 SHA1 e1d2e5a21352f83397fc9563f83ffef11d2c42a5 SHA256 11db488c15e155893c784520f2ec0bf23c56d2af84b230848d6890b951d15976
-MD5 1e14c40195d02127e32f8369db843873 files/slony1_remove_jave.patch 1431
-RMD160 8533996992fe6ab806b5f06dce013362187eafd0 files/slony1_remove_jave.patch 1431
-SHA256 11db488c15e155893c784520f2ec0bf23c56d2af84b230848d6890b951d15976 files/slony1_remove_jave.patch 1431
-DIST slony1-1.1.5.tar.bz2 610569 RMD160 207e81a8f30366810cb63ddb256f324415cad1f1 SHA1 19f42fbd3c92f299b65803adcebfed5b508c236b SHA256 6e216eb121cbb2c195b4a3ee557a606f4ba815049f781c996a58a9946530e1f0
+AUX slony1.conf 286 RMD160 d6c7b54837e1a26fe8f92a9a0ece5ac64eab7d32 SHA1 d1cef6b14bdecde6a8b898a12619d531505d97fc SHA256 58c10d9d9122c299d9337d37d119ffa964da36fccdd722ddafcbbba8ce52b7f2
+MD5 98324ab632f314b9ac78ae986d4e6ae1 files/slony1.conf 286
+RMD160 d6c7b54837e1a26fe8f92a9a0ece5ac64eab7d32 files/slony1.conf 286
+SHA256 58c10d9d9122c299d9337d37d119ffa964da36fccdd722ddafcbbba8ce52b7f2 files/slony1.conf 286
+AUX slony1.init 597 RMD160 b57c0ce3cb4227c5871a983ac6c290a841e9b9ae SHA1 c50a846e3b529a35528a98af396adbdfb2b039d9 SHA256 90b2a257a4d5201a677381434bd42d2bbc0b44df0d5fbdeecf96e6b82328b3a9
+MD5 30a7478c78e19690aeba42bf7bde468f files/slony1.init 597
+RMD160 b57c0ce3cb4227c5871a983ac6c290a841e9b9ae files/slony1.init 597
+SHA256 90b2a257a4d5201a677381434bd42d2bbc0b44df0d5fbdeecf96e6b82328b3a9 files/slony1.init 597
 DIST slony1-1.2.10.tar.bz2 846038 RMD160 14758713a5c58548326d5285868b9fa41bbd480d SHA1 1fef4cdd9440c5f1078fb815511970c854e51d6a SHA256 b4e63e122053f07bbe6f7f6b39dd113ad5b98bc2d249b73041f6800ce6c87101
-DIST slony1-1.2.9.tar.bz2 837293 RMD160 e73f824b68c8f7c7a746b91d37990259bf9d0f94 SHA1 0dbfce131416ca19bfe72dbb900070c15e4e8520 SHA256 5ee2a05d8395473fb90c9689032af8d13bc8ee8e61af73785852c3dc7f485098
-EBUILD slony1-1.1.5.ebuild 1286 RMD160 d8eff940099a62d8a82cd5505755acb123788299 SHA1 216f6f77e0614d0070877e3df4df361b0301f70d SHA256 80d44a81613df1ac38da7685f38c9081aeb865dcd90a6360fdf1b3a54af2aeeb
-MD5 4e8fb367a48ebfe41b5626361d163ef3 slony1-1.1.5.ebuild 1286
-RMD160 d8eff940099a62d8a82cd5505755acb123788299 slony1-1.1.5.ebuild 1286
-SHA256 80d44a81613df1ac38da7685f38c9081aeb865dcd90a6360fdf1b3a54af2aeeb slony1-1.1.5.ebuild 1286
-EBUILD slony1-1.2.10.ebuild 1106 RMD160 1b9ee9f7b3a354b69baa21299423095e15c57d0b SHA1 dd6d8adc57da75c8e3ef8fde67fa70a1bfa820f4 SHA256 0cc562a957e21e6b87c818e64ce622b8aabe4547784d4aa7605757113259366d
-MD5 bc59028bc51c7819614d0c80fdaf64de slony1-1.2.10.ebuild 1106
-RMD160 1b9ee9f7b3a354b69baa21299423095e15c57d0b slony1-1.2.10.ebuild 1106
-SHA256 0cc562a957e21e6b87c818e64ce622b8aabe4547784d4aa7605757113259366d slony1-1.2.10.ebuild 1106
-EBUILD slony1-1.2.9.ebuild 1105 RMD160 97c0753d9c29bdc0f51e06c72c70f99b134c47cb SHA1 6ef3040d4d40b39c5f8fc9174a1baf91441d98b4 SHA256 357ec80e390c23e3adaea524143d50601a6b3c39247f7adf130ab8cec7a2a37d
-MD5 dc03dfe3b1e76fc2786880c70fd7db3e slony1-1.2.9.ebuild 1105
-RMD160 97c0753d9c29bdc0f51e06c72c70f99b134c47cb slony1-1.2.9.ebuild 1105
-SHA256 357ec80e390c23e3adaea524143d50601a6b3c39247f7adf130ab8cec7a2a37d slony1-1.2.9.ebuild 1105
+EBUILD slony1-1.2.10.ebuild 2136 RMD160 2746e83f3eb59613ba8b047470df65fe4dda95ee SHA1 399be5112f0409b9427f7a82abf7866c164d8d64 SHA256 f9ecd963d84e2882aee5538b8173c277647d72356e821b4d8b243b2832eca438
+MD5 82b774b0e9cd2ca0b7393126409c7b8e slony1-1.2.10.ebuild 2136
+RMD160 2746e83f3eb59613ba8b047470df65fe4dda95ee slony1-1.2.10.ebuild 2136
+SHA256 f9ecd963d84e2882aee5538b8173c277647d72356e821b4d8b243b2832eca438 slony1-1.2.10.ebuild 2136
 MISC ChangeLog 1990 RMD160 bd004efbc853a181ded294c74edede74f4f5c43e SHA1 07432f95adb67ec6c482252c03e31b7cd62c73db SHA256 a806eeebdd3a43319e20c5baa875c85aafcd8facff709e34045a46d00abbbc2c
 MD5 5e0d3a4379d203f727e77ae492cfbcf0 ChangeLog 1990
 RMD160 bd004efbc853a181ded294c74edede74f4f5c43e ChangeLog 1990
@@ -33,12 +19,6 @@ MISC metadata.xml 225 RMD160 3585b114a3676fa4fc74546f7280f2fcbb7b2206 SHA1 390ba
 MD5 f69c1922a46b3d715bb0a27f380c8118 metadata.xml 225
 RMD160 3585b114a3676fa4fc74546f7280f2fcbb7b2206 metadata.xml 225
 SHA256 c81eec1218e98b6867d87c20c9ea8b233563ebd14606171e747a32f30b2d8473 metadata.xml 225
-MD5 1c97469b992c4de78a96955a28ceca69 files/digest-slony1-1.1.5 241
-RMD160 6da39a4b7188f59570f9e4b9e2477755a33251e8 files/digest-slony1-1.1.5 241
-SHA256 a2d318becc78b4ba35a465b998572824aa6cf04d512f512cc5acddfac251ce8e files/digest-slony1-1.1.5 241
 MD5 d4d397c7980dc4edf155d09ebdfd975e files/digest-slony1-1.2.10 244
 RMD160 8546c55d76e5f97b230961d8b4eb51ca0ce7e6ac files/digest-slony1-1.2.10 244
 SHA256 749a8b8f98cadc28618e8ba266ea897c12441f9aba429b3b51f1d614f8ae1b74 files/digest-slony1-1.2.10 244
-MD5 9a50b88b56044b1c7a6bf826e8f341c6 files/digest-slony1-1.2.9 241
-RMD160 21622658c6545622af19bffd1dad7dbf9b7e2d37 files/digest-slony1-1.2.9 241
-SHA256 f0561a50fb010bcd28450d60c74081b85d8fae822460e9af18a81e235ec6aba0 files/digest-slony1-1.2.9 241
diff --git a/dev-db/slony1/files/digest-slony1-1.2.10 b/dev-db/slony1/files/digest-slony1-1.2.10
new file mode 100644
index 0000000..e9c6141
--- /dev/null
+++ b/dev-db/slony1/files/digest-slony1-1.2.10
@@ -0,0 +1,3 @@
+MD5 80ab5608c070028134072e4ecba5817f slony1-1.2.10.tar.bz2 846038
+RMD160 14758713a5c58548326d5285868b9fa41bbd480d slony1-1.2.10.tar.bz2 846038
+SHA256 b4e63e122053f07bbe6f7f6b39dd113ad5b98bc2d249b73041f6800ce6c87101 slony1-1.2.10.tar.bz2 846038
diff --git a/dev-db/slony1/files/slony1.conf b/dev-db/slony1/files/slony1.conf
index 0782232..3d68c70 100644
--- a/dev-db/slony1/files/slony1.conf
+++ b/dev-db/slony1/files/slony1.conf
@@ -1,12 +1,11 @@
 # /etc/conf.d/slony1:
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/files/slony1.conf,v 1.2 2007/03/07 23:18:21 nakano Exp $
+# $Header: $
 
 # Configuration file for /etc/init.d/slony1
 
-USER=postgres
-CLUSTER=your_cluster_name
-DBUSER=postgres
-DBNAME=your_database_name
-DBHOST=localhost
-LOGFILE=/var/lib/postgresql/data/slony1.log
-LOGLEVEL=1   # 1(minimum)..4(maximum)
+#DBCONNINFO="dbname=yourdatabase user=postgres host=localhost"
+# CLUSTER=your_cluster_name
+# LOGFILE=/var/lib/postgresql/data/slony1.log
+# LOGLEVEL=1   # 1(minimum)..4(maximum)
+
+RC_NEED=@postgres_service@
diff --git a/dev-db/slony1/files/slony1.init b/dev-db/slony1/files/slony1.init
index 4f1469d..f9c3409 100755
--- a/dev-db/slony1/files/slony1.init
+++ b/dev-db/slony1/files/slony1.init
@@ -1,20 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/files/slony1.init,v 1.2 2007/03/07 23:18:21 nakano Exp $
+# $Header: $
 
-depend() {
-	need postgresql
-}
+PIDFILE="/var/run/slony1-@SLOTSLOT@.pid"
+SLONBIN="@bindir"
 
 start() {
 	ebegin "Starting slony1"
-	/usr/bin/slon -p /var/run/slony1.pid -d $LOGLEVEL $CLUSTER "dbname=$DBNAME user=$DBUSER host=$DBHOST" >> $LOGFILE 2>&1 &
+	${slonbin}/slon -p $PIDFILE -d $LOGLEVEL $CLUSTER "$DBCONNINFO" >> $LOGFILE 2>&1 &
 
 	while :
 	do
 		cnt=$(($cnt + 1))
-		if [ -f "/var/run/slony1.pid" ]; then
+		if [ -f "$PIDFILE" ]; then
 			ret=0
 			break
 		fi
@@ -31,7 +30,7 @@ start() {
 
 stop() {
 	ebegin "Stopping slony1"
-	kill `cat /var/run/slony1.pid`
+	kill $(cat $PIDFILE)
 	eend $?
 }
 
diff --git a/dev-db/slony1/slony1-1.2.10.ebuild b/dev-db/slony1/slony1-1.2.10.ebuild
index a106aa1..32855aa 100644
--- a/dev-db/slony1/slony1-1.2.10.ebuild
+++ b/dev-db/slony1/slony1-1.2.10.ebuild
@@ -1,45 +1,68 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.10.ebuild,v 1.1 2007/07/08 01:55:20 nakano Exp $
+# $Header: $
 
-inherit eutils
+WANT_POSTGRES_SLOTS="7.4 8.2"
+inherit eutils versionator postgresql-ext
 
 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"
+SRC_URI="http://main.slony.info/downloads/$(get_version_component_range 1-2)/source/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="dev-db/postgresql
+DEPEND="
+	$(postgresql-ext_pg_slots_depend)
 	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
-	emake || die
+pgslot_src_compile() {
+	# need to override sharedir for slots below 8.1
+	local extraconf
+	if [[ "${SLOTSLOT#7}" != "${SLOTSLOT}" ]] || [[ "${SLOTSLOT#8.0}" != "${SLOTSLOT}" ]] ; then
+		extraconf="--with-pgsharedir=$(postgresql_get_datadir_for_slot $SLOTSLOT)"
+	fi
+	local bs="$(postgresql_get_bindir_for_slot $SLOTSLOT)"
+	econf \
+		--prefix="$(postgresql_get_prefix_for_slot $SLOTSLOT)" \
+		--sysconfdir="/etc/slony1-$SLOTSLOT" \
+		--with-pgconfigdir="$bs" \
+		$(use_with perl perltools) \
+		$extraconf \
+		|| die "econf failed"
+	emake || die "emake failed"
 
 	if use perl ; then
-		cd ${S}/tools
-		emake || die
+		cd "${S}/tools"
+		emake || die "emake in tools failed"
 	fi
 }
 
+pgslot_src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodir /usr/lib/eselect-postgresql/slots/$SLOTSLOT
+	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+		postgres_ebuilds="\${postgres_ebuilds} $PF"
+		slony1_service="slony1-$SLOT"
+	__EOF__
+
+	newinitd "${FILESDIR}/slony1.init" slony1-$SLOTSLOT || die "failed to do init.d for slot $SLOTSLOT"
+	dosed "s:@SLOTSLOT@:${SLOTSLOT}:g" /etc/init.d/slony1-$SLOTSLOT
+	dosed "s:@bindir@:$(postgresql_get_bindir_for_slot $SLOTSLOT):g" /etc/init.d/slony1-$SLOTSLOT
+	newconfd "${FILESDIR}/slony1.conf" slony1-$SLOTSLOT || die "failed to do conf.d for slot $SLOTSLOT"
+	dosed "s:@postgres_service@:$(postgresql_get_service_for_slot $SLOTSLOT):g" /etc/conf.d/slony1-$SLOTSLOT
+}
+
 src_install() {
-	make DESTDIR=${D} install || die
+	multislot_src_install
 
 	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
 	dohtml doc/howto/*.html
+}
 
-	newinitd ${FILESDIR}/slony1.init slony1 || die
-	newconfd ${FILESDIR}/slony1.conf slony1 || die
-
+pkg_postinst() {
+	eselect postgresql update
 }