Sync live and release ebuild. Bump to 3.0.4. Remove older.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

3 files changed, 48 insertions, 33 deletions

diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 291f29f9c1c3..9a6401b34797 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgpool2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.7 2011/05/19 15:34:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.8 2011/06/19 18:50:43 scarabeus Exp $
+
+*pgpool2-3.0.4 (19 Jun 2011)
+
+  19 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pgpool2-3.0.3-r1.ebuild, +pgpool2-3.0.4.ebuild, pgpool2-9999.ebuild:
+  Sync live and release ebuild. Bump to 3.0.4. Remove older.
 
   19 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -pgpool2-3.0.3.ebuild:
   remove old
diff --git a/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild b/dev-db/pgpool2/pgpool2-3.0.4.ebuild
index 5606fe67e388..e177bbebc1b6 100644
--- a/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.0.4.ebuild
@@ -1,18 +1,24 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild,v 1.1 2011/04/17 14:00:57 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.4.ebuild,v 1.1 2011/06/19 18:50:43 scarabeus Exp $
 
 EAPI=4
 
-MY_P="${PN/2/-II}-${PV}"
-inherit autotools-utils autotools
+[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
+
+ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
+ECVS_MODULE="pgpool-II"
+[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
+inherit base autotools ${SCM_ECLASS}
+unset SCM_ECLASS
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
-SRC_URI="http://pgfoundry.org/frs/download.php/2958/${MY_P}.tar.gz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://pgfoundry.org/frs/download.php/3076/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="pam ssl static-libs"
 
 RDEPEND="
@@ -32,11 +38,12 @@ DOCS=(
 	"doc/where_to_send_queries.pdf"
 )
 HTML_DOCS=(
-	"doc/pgpool-en.html" "doc/pgpool.css"
+	"doc/pgpool-en.html"
+	"doc/pgpool.css"
 	"doc/tutorial-en.html"
 )
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -i \
@@ -45,24 +52,22 @@ src_prepare() {
 	sed -i \
 		-e '/ACLOCAL_AMFLAGS/ d' \
 		Makefile.am || die
-	autotools-utils_src_prepare
+	base_src_prepare
 	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		"--sysconfdir=${EROOT}/etc/${PN}"
-		"--disable-dependency-tracking"
-		"--disable-rpath"
-		$(use_with ssl openssl)
+	econf \
+		--sysconfdir=${EROOT}/etc/${PN} \
+		--disable-rpath \
+		$(use_enable static-libs static) \
+		$(use_with ssl openssl) \
 		$(use_with pam)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
+	base_src_install
+	find "${ED}" -name '*.la' -exec rm -f {} +
 	# move misc data to proper folder
 	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
 
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 2964688e4840..c1d066d7f1fc 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.2 2011/04/17 14:00:57 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.3 2011/06/19 18:50:43 scarabeus Exp $
 
 EAPI=4
 
+[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
+
 ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
 ECVS_MODULE="pgpool-II"
-inherit autotools-utils cvs autotools
+[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
+inherit base autotools ${SCM_ECLASS}
+unset SCM_ECLASS
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="http://pgfoundry.org/frs/download.php/3076/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 IUSE="pam ssl static-libs"
 
 RDEPEND="
@@ -33,11 +38,12 @@ DOCS=(
 	"doc/where_to_send_queries.pdf"
 )
 HTML_DOCS=(
-	"doc/pgpool-en.html" "doc/pgpool.css"
+	"doc/pgpool-en.html"
+	"doc/pgpool.css"
 	"doc/tutorial-en.html"
 )
 
-S="${WORKDIR}/pgpool-II/"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -i \
@@ -46,24 +52,22 @@ src_prepare() {
 	sed -i \
 		-e '/ACLOCAL_AMFLAGS/ d' \
 		Makefile.am || die
-	autotools-utils_src_prepare
+	base_src_prepare
 	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		"--sysconfdir=${EROOT}/etc/${PN}"
-		"--disable-dependency-tracking"
-		"--disable-rpath"
-		$(use_with ssl openssl)
+	econf \
+		--sysconfdir=${EROOT}/etc/${PN} \
+		--disable-rpath \
+		$(use_enable static-libs static) \
+		$(use_with ssl openssl) \
 		$(use_with pam)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
+	base_src_install
+	find "${ED}" -name '*.la' -exec rm -f {} +
 	# move misc data to proper folder
 	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die