Remove old

Fix writing to syslog properly

6 files changed, 12 insertions, 105 deletions

diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 72c3bc9..d0a8179 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,12 +1,9 @@
+AUX slony1.cfg 82 SHA256 fe5a4a2cb125fdacfba927a2be5cc61cb326cf40b608b9ed8d6899cf59e926c7 SHA512 24e2d57dac390fdf75b4e448769682ee1ce410c4e790126e7e97859c2b4c3b98bfb0eb48353f0f25391cbef6c8d843fb4ef12320f58d0c40f27c47b9dca453c7 WHIRLPOOL 9077d7cf2f72822fcaa3835be50670d56c4625b1ec88d6349b4e2761513f29dd551583b3d97a1f5772579de5c07bb3e4064b6929ebe9c563569f45f119d813f3
 AUX slony1.conf 311 SHA256 18ecdf98733d5074f840e63dc00eae7a7cf9a909185b3a2d9f97aecd4a502677 SHA512 1a0f0eeb6def99bcdfbae3bea171e57a570a7670c83ba3573d94e3250dc2a013324fa7754419e4b67fb78196b92da42d2ee0540f1cfb3eaf62db9f910e49f2d0 WHIRLPOOL deaae2fea0431aac8d4fa6282a4a541226a2554cd2a47f2896cd49f935b99a2b4bc2106b31e4cd9beb9e488b62b3dac7fb080af074e32caf56758c5a1d623d2a
-AUX slony1.init 727 SHA256 54e8c7dcc75beac01791c45f480452a3b3abebc20f50849b82a4714bffa310f5 SHA512 a0fa2d5ec6f38b9ec17df01084fe27811c2b165f1f4e68ba334d3e85b39d225240b258975c29dd34e8d18ceca1a4b9d306179822c51decfdd34d728260689f01 WHIRLPOOL ef1162b031d650e6b29f5498390d36e28afab1b262c8c44e4933c36c6e8e702a427688707ab463262ae51e74148cda61ecf508b2e7f464ad25686cd5ce8b990d
+AUX slony1.init 746 SHA256 3df102284568291cbdc646a5d502a02c99c31c51e76f007314ecc51562a2e214 SHA512 00d031a369ffe8593f354a236e5e2e14ed561958313c4b00c9153d050ced2fa5dc26bdb3a649dac005e5311869d1ef3af6983aaee11c53ad2f48cd1a2b89fe8e WHIRLPOOL da75cf2f8a626b86947d277424d995496b09daf8c1a02a0416159a82690bf6345df2f72a41943de3a08adbe637526e4518a796dd082c8095afdc7e9c3ceadc7e
 AUX slony1.logrotate 143 SHA256 05d08a06816c65d300ddfdd461052e106aa8a37a14f32fb89a2b8a53ca5878c1 SHA512 97a56d99c5b70aae2e8e74a0e3f2674a0b6acf7e75ad78fa2da81827218b022771ccc6bf39a82c033a7b4eab3f13f751f5e87f682bf68262ed0f80fabe8ff854 WHIRLPOOL f610f201efa0baa5c725bbc04484b1fe27e3153832d15e71b4801fbc29efaff019a5e671c4221c13c8a2d170f28dad0c9d38fa1a3c2fac233294252a8cfc21c5
-DIST slony1-2.1.1.tar.bz2 1483119 SHA256 eb89490731be0f53586e98ae39132a544cee8167dbee77b9ce92800ba9d3bd63 SHA512 4ace7e77602baadd0e2532ab4a4c9d9df95caf65670f81569ada385170b4ebfa0b23c5e49dc613346dc82769113d752e57551adf12585403da2080e3802660c4 WHIRLPOOL 0a1f1f38d676802ae63b787bdf854ad38108b48f780fed3560e0485cfe81740e68aa10af3fb25bba257ad78ef1910152be1e06dd44a66e7d859a9d415c1e7580
-DIST slony1-2.1.2.tar.bz2 1512301 SHA256 ae25f9b0ea91cf4884abf302b87c36effbc43e68be5b6665a31d03ed0cce182f SHA512 9c3669a12f893c832a82af43f8c9fe0637ec6266a0a938498c1ee397e62c9b18acd1c9331c11594a7e2aa574d14255e8cb5116038797854b12fd7b393f8866e3 WHIRLPOOL 8f65bbda3376e8d82d39cdca091118a8c0c82d4fa863e282fe02ab842dd214b3f461b80df7c9703e6921da3cb4e5f60bf1d578d6b1367a8d94fb625ef77fd2ba
 DIST slony1-2.1.3.tar.bz2 1512693 SHA256 048b94c990afceb892f8f6631268bb66e93a3c630afc694b3a09f051c338790b SHA512 f02320e3bb85848b93bc43a7d4e0dbb367afcb8af2100cda840888dcd219fead78bd1ac927493bd173cef2bc1195ba4f860679eed0606dd0a2cf9652d671b493 WHIRLPOOL 51641f4dfa78210ab0ecc2827932dc06389867c18df6dfb61d8b43c03ad00d2ac09c529e4171ece07139a803ef45f12c15ac14da39e6bb269bb5a0d7a0270943
 DIST slony1-2.2.0.b1.tar.bz2 1497681 SHA256 927a1ad5077ea109f5e8fae12a4c5004e9f6d648df49813e2cec611e9665b059
-EBUILD slony1-2.1.1.ebuild 1392 SHA256 293bbb33889b6b36f270c51844f80f1776d54084c3d5fe46a947e72225aec967 SHA512 0ef80a4655b6a6dedb5db4e715bd713f43d1cc0ed7311fb84e9b8decf3b3dcf3a884032504aaa0e28c413d22c2bcdf0f9ffc3896cdf970129ad93e78ac91bbe0 WHIRLPOOL 74b8177887581f00374a7e8e26aecfd983d2d4b5527b7c5f1b3a794a9438d3552af64188ae6342ddfb6cd484158531377d7ffe7c8ea318188e0565d6b3f93327
-EBUILD slony1-2.1.2.ebuild 1392 SHA256 d723a81dc0ce06b10fa618fbfd645495ce3b2c5cba281a33624159499fa9dab8 SHA512 cf4c60dad7c3949b123d9a2697fa1a98297d4bf9c50fd24178f4f0aa46d91556b3aef0682b9ecfa7a37efb8854bcdc9bb84fdd78f85e56cf9ac1e2fef700e3c4 WHIRLPOOL 853f7eb7633cc65ec7c0568cae8e23bac8c976fe2e8b95940e1f741c5784c8fafc514dc10e5f49492df1061dba9c81f9db19f4c0c4bf6bef36c6bb01ccb2dcfe
-EBUILD slony1-2.1.3.ebuild 1392 SHA256 9aedd064471769a45633bbe1baa9ca7de1dc8e2f2c7290ac87edf934eec8da6d SHA512 46297ac294f075a38d3c4ce3eaae9eb5ea8439081f85829df0d236042e3b2ab7cd85b564aa49c27a63c38760ae40f6c1daac98bf6cfd3bc08ce0b0d34eb7986d WHIRLPOOL fee8fa4277afd252a88e581c2c6d461f640ca4aa407382ebee16bc4dd37b31332da0613e0bfbc4d63420982992af6d406713fcab7083a682b860ea133b8d1440
+EBUILD slony1-2.1.3-r1.ebuild 1475 SHA256 033961551e17c5cdea38f49e7b2b32ce4fe2123ab7ad5869c62d55c5ddddc15c SHA512 47b20b6ba80afcf7567a0b2fc4037913b7c1226c3d0e3a38f4e315af20482d908560ed368546e4558a588288450c47441ebe59179094848735c8a2a9cc3700c6 WHIRLPOOL 78c50e11a7ead642768f04acfad737cbcb57eb0d41fcdc7d93d7abc57bb5fde9d3767ffefd5c2107722f07f71690db5235afb7abef7cea3a6641bc3a380843d7
 EBUILD slony1-2.2.0_beta1.ebuild 1151 SHA256 707adaa512038cda7bd391cfcba217b3d6a7d89e63447d3e6d4ee8c5d0a6aa70 SHA512 fb938238b862c0b4bf7f7d3acfa714411dc61e4a0f2ecbf43703f24e54e8c345238f2967e567025f5a944ec4a182078aa43bdfab5e85e1547d34d5badf6e8655 WHIRLPOOL 0e02fde3d33773e8303cc9deb7980f2d243747bbe4236429f6f4d55ec7ed6700561216625fcbcc655ab03dad76dca0ce397ebee1604be9f6702593991f6ebd91
 MISC metadata.xml 164 SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b SHA512 45b3f5ba6ebbeb2f990e5612b545bee41bb8c9f29e7f31de34021384760fcfc4694de0782fc0bdf556fe81ed3b334fc96c33563b0fddc2545484099a2cd76bb2 WHIRLPOOL 5fd1b0fc651f51ed3d1715cff87d86e7c0fe9c7825529069c7c3fed13641aee24bee1971b6e1057797b7b191ef0d50a1ea68c9f24588872d7d960787f9f02bfa
diff --git a/dev-db/slony1/files/slony1.cfg b/dev-db/slony1/files/slony1.cfg
new file mode 100644
index 0000000..2411644
--- /dev/null
+++ b/dev-db/slony1/files/slony1.cfg
@@ -0,0 +1,6 @@
+syslog = 2
+syslog_ident = slony1
+log_level = 0
+log_pid = 0
+log_timestamp = false
+
diff --git a/dev-db/slony1/files/slony1.init b/dev-db/slony1/files/slony1.init
index 110caa6..a6d0d8a 100755
--- a/dev-db/slony1/files/slony1.init
+++ b/dev-db/slony1/files/slony1.init
@@ -9,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting slony1"
-	/usr/bin/slon -p /var/run/slony1.pid -d $LOGLEVEL $CLUSTER "dbname=$DBNAME user=$DBUSER host=$DBHOST" 2>&1 | logger -t slony1 &
+	/usr/bin/slon -p /var/run/slony1.pid -d $LOGLEVEL -f /etc/slony1.cfg $CLUSTER "dbname=$DBNAME user=$DBUSER host=$DBHOST" 2>&1 | logger -t slony1 &
 
 	while :
 	do
diff --git a/dev-db/slony1/slony1-2.1.1.ebuild b/dev-db/slony1/slony1-2.1.1.ebuild
deleted file mode 100644
index 7a98e8c..0000000
--- a/dev-db/slony1/slony1-2.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.17.ebuild,v 1.2 2010/06/17 19:15:30 patrick Exp $
-
-inherit eutils
-
-IUSE="perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-SRC_URI="http://main.slony.info/downloads/2.1/source/slony1-2.1.1.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-db/postgresql-server
-	perl? ( dev-perl/DBD-Pg )"
-S="${WORKDIR}/slony1-2.1.1"
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql"
-	myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server"
-	if use perl ; then
-		myconf="${myconf} --with-perltools"
-	fi
-
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-
-	if use perl ; then
-		cd ${S}/tools || die
-		emake || die "emake tools failed!"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
-	dohtml doc/howto/*.html
-
-	newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!"
-	newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!"
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/slony1.logrotate slony1 || die "logrotate failed!"
-}
diff --git a/dev-db/slony1/slony1-2.1.2.ebuild b/dev-db/slony1/slony1-2.1.2.ebuild
deleted file mode 100644
index b7b8bdb..0000000
--- a/dev-db/slony1/slony1-2.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.2.17.ebuild,v 1.2 2010/06/17 19:15:30 patrick Exp $
-
-inherit eutils
-
-IUSE="perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-SRC_URI="http://main.slony.info/downloads/2.1/source/slony1-2.1.2.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-db/postgresql-server
-	perl? ( dev-perl/DBD-Pg )"
-S="${WORKDIR}/slony1-2.1.2"
-
-src_compile() {
-	local myconf=""
-
-	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql"
-	myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server"
-	if use perl ; then
-		myconf="${myconf} --with-perltools"
-	fi
-
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-
-	if use perl ; then
-		cd ${S}/tools || die
-		emake || die "emake tools failed!"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
-	dohtml doc/howto/*.html
-
-	newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!"
-	newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!"
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/slony1.logrotate slony1 || die "logrotate failed!"
-}
diff --git a/dev-db/slony1/slony1-2.1.3.ebuild b/dev-db/slony1/slony1-2.1.3-r1.ebuild
index e278813..a797384 100644
--- a/dev-db/slony1/slony1-2.1.3.ebuild
+++ b/dev-db/slony1/slony1-2.1.3-r1.ebuild
@@ -44,6 +44,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/slony1.init slony1 || die "newinitd failed!"
 	newconfd "${FILESDIR}"/slony1.conf slony1 || die "newconfd failed!"
+	insinto /etc/
+	newins "${FILESDIR}"/slony1.cfg slony1.cfg || die "config failed!"
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/slony1.logrotate slony1 || die "logrotate failed!"
 }