Version bump. Drop older.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

5 files changed, 28 insertions, 87 deletions

diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 78164cbb38a6..66a4ca085791 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2011/02/09 08:18:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.3 2011/02/28 17:29:04 scarabeus Exp $
+
+*pgpool2-3.0.2 (28 Feb 2011)
+
+  28 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/3.0.1-fix_md5_malloc.patch, -files/pgpool2-tmpdir.patch,
+  -pgpool2-3.0.1.ebuild, +pgpool2-3.0.2.ebuild:
+  Version bump. Drop older.
 
 *pgpool2-9999 (09 Feb 2011)
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 6d2a656b5caf..9d6335681f5a 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,8 +1,6 @@
-AUX 3.0.1-fix_md5_malloc.patch 481 RMD160 6b1ad6d1202d14ea08b2e5088838e2c59ba06359 SHA1 2afb8feb36ae6dbe7ebcbfe00a4e245e6a376f61 SHA256 7de41b015436367e25a4cf4b2da792e0b0543ce766e85ca2c008eab78920da79
-AUX pgpool2-tmpdir.patch 1806 RMD160 cfe4b124726f612953152c7cc40d028d8fef7800 SHA1 2dafdc37a24318b99bcdf8f983f12d048d8fd7f0 SHA256 431996a2d2e9acf99511c0315b51e478809b3b16818aefaf17bd9cb228975f2d
 AUX pgpool2.initd 823 RMD160 0aa71634f1fb2971c89273e859fd2a197c7e5b1e SHA1 f61ee62bcfdfd30ac0e7ecc9064d64582e40a0ee SHA256 8ff44a4bc1a557f25bd6d2f05ae6f651e04e439f1f45761d4655ba695ed1d3d2
-DIST pgpool-II-3.0.1.tar.gz 1226151 RMD160 3fa36d1d1d7c66dc6d291ba14905feb01342eb17 SHA1 1c72a271d65bd7b44b473b5020746808a056bf3d SHA256 3adfa1f92dee238abec2dd6880985da99b1e2d862e567994e9e2f2736a872ae0
-EBUILD pgpool2-3.0.1.ebuild 1355 RMD160 fffb4a0c4ec0e31ac02e62dc4d30bfaf5e4159bd SHA1 e3cfef29cc5df1314c2c8dffaff0322c274120ae SHA256 72d0360627ec2e04879c59fbded563f893f74b6224a4f1df1517c94676172684
+DIST pgpool-II-3.0.2.tar.gz 1234588 RMD160 1e1f5f391ecde46048db1807d7818bdb5497bcf8 SHA1 f408be89dd909a1d8971a8c2322dea0868ea3e8e SHA256 4d85737d62778d3b1265be95227d513366bbea2605d51761bac8c98fe7fa8fe6
+EBUILD pgpool2-3.0.2.ebuild 1474 RMD160 87a1e11d15ae3f02a2b383052865a9848a08eb7c SHA1 d3f82d1a1cbd5da6dcf064155e827ee7ba0813c1 SHA256 3500b0bcd8c57f75162ae770a9165b2eab8e13970992ed8822cdd71876144c37
 EBUILD pgpool2-9999.ebuild 1449 RMD160 39b970c10f24a14ad400191b358fd135c55f4bfc SHA1 dc06cb096d89f96182324cf314a56bce9c3cd694 SHA256 8da25ccccdb62bb2c602c8b18f2c814270c93378993d28a163e2c8d226f20700
-MISC ChangeLog 624 RMD160 f706151de58a8d5aa1869a9e06a8348f08cf9d4e SHA1 3b26a86d8cc865b6f6222160a9d90ca574349548 SHA256 92766babbf1f07b0ee7466e668fde0fea733a1b8a17ae8750e5b07515eba20a9
+MISC ChangeLog 852 RMD160 95849c6aae2ebc452ab4927182598f1d7c7dae46 SHA1 e2de565a4691130e60bdee2924007319222787c5 SHA256 f27130c0e515ec8fcba8d0229cfd37d442b966602fea82d7cb997190ee008cbf
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch b/dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch
deleted file mode 100644
index 818b2323294c..000000000000
--- a/dev-db/pgpool2/files/3.0.1-fix_md5_malloc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -burN pgpool-II-3.0.1/pool_auth.c pgpool-II-3.0.1.new/pool_auth.c
---- pgpool-II-3.0.1/pool_auth.c	2010-09-28 10:00:48.000000000 +0200
-+++ pgpool-II-3.0.1.new/pool_auth.c	2011-01-24 14:12:00.646197002 +0100
-@@ -987,7 +987,7 @@
- 
- 		backend->auth_kind = 5;
- 		backend->pwd_size = ntohl(size) - 4;
--		memcpy(backend->password, password, backend->pwd_size);
-+		memcpy(backend->password, password, sizeof(password));
- 		memcpy(backend->salt, salt, sizeof(salt));
- 	}
- 	return kind;
\ No newline at end of file
diff --git a/dev-db/pgpool2/files/pgpool2-tmpdir.patch b/dev-db/pgpool2/files/pgpool2-tmpdir.patch
deleted file mode 100644
index 8a6232765c29..000000000000
--- a/dev-db/pgpool2/files/pgpool2-tmpdir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Nur pgpool-II-1.0.2/pgpool.conf.sample pgpool-II-1.0.2.new/pgpool.conf.sample
---- pgpool-II-1.0.2/pgpool.conf.sample	2006-11-29 22:54:26.000000000 +0100
-+++ pgpool-II-1.0.2.new/pgpool.conf.sample	2007-02-28 15:38:36.000000000 +0100
-@@ -7,21 +7,21 @@
- listen_addresses = 'localhost'
- 
- # Port number for pgpool
--port = 9999
-+port = 5433
- 
- # Port number for pgpool communication manager
- pcp_port = 9898
- 
- # Unix domain socket path.  (The Debian package defaults to
- # /var/run/postgresql.)
--socket_dir = '/tmp'
-+socket_dir = '/var/run/postgresql'
- 
- # Unix domain socket path for pgpool communication manager.
- # (Debian package defaults to /var/run/postgresql)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/var/run/postgresql'
- 
- # Unix domain socket path for the backend. Debian package defaults to /var/run/postgresql!
--backend_socket_dir = '/tmp'
-+backend_socket_dir = '/var/run/postgresql'
- 
- # pgpool communication manager timeout. 0 means no timeout, but strongly not recommended!
- pcp_timeout = 10
-@@ -43,8 +43,8 @@
- # 0 means no exit.
- child_max_connections = 0
- 
--# Logging directory
--logdir = '/tmp'
-+# Logging directory (more accurately, the directory for the PID file)
-+logdir = '/var/run/postgresql'
- 
- # Replication mode
- replication_mode = false
-diff -Nur pgpool-II-1.0.2/pool.h pgpool-II-1.0.2.new/pool.h
---- pgpool-II-1.0.2/pool.h	2007-02-13 04:19:04.000000000 +0100
-+++ pgpool-II-1.0.2.new/pool.h	2007-02-28 15:39:07.000000000 +0100
-@@ -46,10 +46,10 @@
- #define PCP_PASSWD_FILE_NAME "pcp.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/var/run/postgresql"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/var/run/postgresql"
- 
- /* pid file name */
- #define PID_FILE_NAME "pgpool.pid"
diff --git a/dev-db/pgpool2/pgpool2-3.0.1.ebuild b/dev-db/pgpool2/pgpool2-3.0.2.ebuild
index bc1367437bcd..469a3b1632b9 100644
--- a/dev-db/pgpool2/pgpool2-3.0.1.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.0.2.ebuild
@@ -1,17 +1,15 @@
 # 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.1.ebuild,v 1.1 2011/01/26 16:49:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.2.ebuild,v 1.1 2011/02/28 17:29:05 scarabeus Exp $
 
-EAPI=3
-
-inherit autotools-utils
+EAPI=4
 
 MY_P="${PN/2/-II}-${PV}"
+inherit autotools-utils autotools
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
-SRC_URI="http://pgfoundry.org/frs/download.php/2841/${MY_P}.tar.gz"
-
+SRC_URI="http://pgfoundry.org/frs/download.php/2946/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -27,11 +25,6 @@ DEPEND="${DEPEND}
 
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-tmpdir.patch"
-	"${FILESDIR}/${PV}-fix_md5_malloc.patch"
-)
-
 DOCS=(
 	"NEWS"
 	"doc/where_to_send_queries.pdf"
@@ -41,7 +34,18 @@ HTML_DOCS=(
 	"doc/tutorial-en.html"
 )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/tmp/:/var/run/postgresql:g' \
+		pgpool.conf.sample pool.h || die
+	sed -i \
+		-e '/ACLOCAL_AMFLAGS/ d' \
+		Makefile.am || die
+	autotools-utils_src_prepare
+	eautoreconf
+}
 
 src_configure() {
 	local myeconfargs=(
@@ -60,5 +64,5 @@ src_install() {
 	# move misc data to proper folder
 	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 }