7 files changed, 20 insertions, 43 deletions
diff --git a/dev-db/pgpool/ChangeLog b/dev-db/pgpool/ChangeLog
index e6328f1034d9..a0219d060f0b 100644
--- a/dev-db/pgpool/ChangeLog
+++ b/dev-db/pgpool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgpool
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/ChangeLog,v 1.2 2003/12/25 04:49:37 nakano Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/ChangeLog,v 1.3 2004/05/01 12:16:44 nakano Exp $
+
+*pgpool-1.1 (01 May 2004)
+
+  01 May 2004; Masatomo Nakano <nakano@gentoo.org> -pgpool-0.1.5.ebuild,
+  -pgpool-0.1.6.ebuild, +pgpool-1.1.ebuild:
+  Version bump. Removed old ebuilds.
 
 *pgpool-0.1.6 (25 Dec 2003)
 
diff --git a/dev-db/pgpool/Manifest b/dev-db/pgpool/Manifest
index affff5344590..e4b9521e614b 100644
--- a/dev-db/pgpool/Manifest
+++ b/dev-db/pgpool/Manifest
@@ -1,7 +1,9 @@
-MD5 f2cdc63bba84d09ca5a880ff7ae99e62 files/pgpool.init 529
-MD5 d794dfe5841c5f91f4c6194b29c9afa6 files/digest-pgpool-0.1.5 63
-MD5 3387546eb2d648841a8b70b35466ae9f files/digest-pgpool-0.1.6 63
 MD5 cc956bd3b7113a95245f2a3fe5347eb1 pgpool-0.1.6.ebuild 792
 MD5 48b4cbe852e37eb9ea1ce1e92d3150a4 pgpool-0.1.5.ebuild 792
 MD5 2b670430adb71a63aa6bec4db99f2979 ChangeLog 481
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 b7ed7235f0caa6ce5d8b72055d2c31f3 pgpool-1.1.ebuild 811
+MD5 f2cdc63bba84d09ca5a880ff7ae99e62 files/pgpool.init 529
+MD5 d794dfe5841c5f91f4c6194b29c9afa6 files/digest-pgpool-0.1.5 63
+MD5 3387546eb2d648841a8b70b35466ae9f files/digest-pgpool-0.1.6 63
+MD5 75fe4b48bd39232cef761e1e5f79da70 files/digest-pgpool-1.1 61
diff --git a/dev-db/pgpool/files/digest-pgpool-0.1.5 b/dev-db/pgpool/files/digest-pgpool-0.1.5
deleted file mode 100644
index d53de01e5dd7..000000000000
--- a/dev-db/pgpool/files/digest-pgpool-0.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d884a4de446904d557f3246578a0c66 pgpool-0.1.5.tar.gz 62448
diff --git a/dev-db/pgpool/files/digest-pgpool-0.1.6 b/dev-db/pgpool/files/digest-pgpool-0.1.6
deleted file mode 100644
index be16c6a814c0..000000000000
--- a/dev-db/pgpool/files/digest-pgpool-0.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 81b30609f1261544ecba58540eeca6f8 pgpool-0.1.6.tar.gz 62524
diff --git a/dev-db/pgpool/files/digest-pgpool-1.1 b/dev-db/pgpool/files/digest-pgpool-1.1
new file mode 100644
index 000000000000..372ea8926234
--- /dev/null
+++ b/dev-db/pgpool/files/digest-pgpool-1.1
@@ -0,0 +1 @@
+MD5 7818c07d4acaff214252e26d2ad74ada pgpool-1.1.tar.gz 78073
diff --git a/dev-db/pgpool/pgpool-0.1.6.ebuild b/dev-db/pgpool/pgpool-0.1.6.ebuild
deleted file mode 100644
index df3f9b3999e3..000000000000
--- a/dev-db/pgpool/pgpool-0.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-0.1.6.ebuild,v 1.1 2003/12/25 04:49:37 nakano Exp $
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-SRC_URI="ftp://ftp.sra.co.jp/pub/cmd/postgres/pgpool/${P}.tar.gz"
-HOMEPAGE=""
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-db/postgresql"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf --with-pgsql=/usr/include/postgresql || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf
-	dosed "s:/tmp:/var/run:g" /etc/pgpool.conf
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PN}.init ${PN}
-}
diff --git a/dev-db/pgpool/pgpool-0.1.5.ebuild b/dev-db/pgpool/pgpool-1.1.ebuild
index 2fcf83c2c777..d32920d403bd 100644
--- a/dev-db/pgpool/pgpool-0.1.5.ebuild
+++ b/dev-db/pgpool/pgpool-1.1.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-0.1.5.ebuild,v 1.1 2003/10/13 00:21:25 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-1.1.ebuild,v 1.1 2004/05/01 12:16:44 nakano Exp $
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 SRC_URI="ftp://ftp.sra.co.jp/pub/cmd/postgres/pgpool/${P}.tar.gz"
-HOMEPAGE=""
-LICENSE="POSTGRESQL"
+HOMEPAGE="http://www2b.biglobe.ne.jp/~caco/pgpool/"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-
 DEPEND="dev-db/postgresql"
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	econf --with-pgsql=/usr/include/postgresql || die
 	emake || die
@@ -23,7 +20,9 @@ src_install () {
 	einstall || die
 	mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf
 	dosed "s:/tmp:/var/run:g" /etc/pgpool.conf
+	dosed "s:^logdir.*$:logdir = '/var/log':g" /etc/pgpool.conf
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/${PN}.init ${PN}
 }
+