Fixed #122933.

(Portage version: 2.1_pre4-r1)

10 files changed, 46 insertions, 117 deletions

diff --git a/dev-db/phppgadmin/ChangeLog b/dev-db/phppgadmin/ChangeLog
index 2215e057ce2f..9c8093fb3e5d 100644
--- a/dev-db/phppgadmin/ChangeLog
+++ b/dev-db/phppgadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phppgadmin
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.54 2005/11/29 01:04:26 rl03 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.55 2006/02/15 22:32:54 rl03 Exp $
+
+  15 Feb 2006; Renat Lumpau <rl03@gentoo.org> phppgadmin-3.5.4.ebuild,
+  -phppgadmin-3.5.5.ebuild, -phppgadmin-3.5.6.ebuild,
+  phppgadmin-4.0.1.ebuild:
+  Fixed #122933.
 
 *phppgadmin-4.0.1 (29 Nov 2005)
 
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index 85d29e38a135..c2130fffe0ee 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -1,21 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 09f0448705577e30e8272b5e8daf4b30 phppgadmin-3.5.4.ebuild 1081
-MD5 52eb5b1ab5f4299862f0d42ba2b781ba phppgadmin-4.0.1.ebuild 1066
-MD5 0edf1a6673a3f2bcd7a70a4df750ab0a phppgadmin-3.5.6.ebuild 1072
-MD5 d96912846fb0220e202dedbdfc51b944 phppgadmin-3.5.5.ebuild 1072
 MD5 2501d34f777d0d7fb385a69654519d53 ChangeLog 6494
-MD5 8c05332043586029d9d1417154cda2fc metadata.xml 185
+RMD160 447030f68974001461008bc339b2b3ab378f487a ChangeLog 6494
+SHA256 07d4c42293ae527bfc359cd0af00600c54d615b091511a40c009d177f7749239 ChangeLog 6494
+MD5 8c81138ba047391c8c45f44d03766f06 files/digest-phppgadmin-3.5.4 253
+RMD160 bc2f71185539b591da5f18697b9f6ed541e4872d files/digest-phppgadmin-3.5.4 253
+SHA256 02a3ee92c7464988a477ed27d7d1146f1afda2ca7216da0cb5d9b7127a7b9ae9 files/digest-phppgadmin-3.5.4 253
+MD5 404e0f6967131f8657357b4745d6238b files/digest-phppgadmin-4.0.1 253
+RMD160 5841692885cf27718dc63d3a4d2de5c19fb24638 files/digest-phppgadmin-4.0.1 253
+SHA256 bb73cf1609eaa9a2d707d3db5f4a5d22756765d75d1e50896b633c1296d041fa files/digest-phppgadmin-4.0.1 253
 MD5 502d9961e63f871ef1ddb5cd5da157d4 files/postinstall-en.txt 162
-MD5 2261f2781c16bb39eea8517c4edb1649 files/digest-phppgadmin-3.5.4 69
-MD5 0f2f49b835456b5715ad189abaf654a8 files/digest-phppgadmin-3.5.5 69
-MD5 39e8ebac0a944e684a8b721950db14a8 files/digest-phppgadmin-3.5.6 69
-MD5 dcbc5963df37f2ee6828628add8d6d47 files/digest-phppgadmin-4.0.1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDi6kkEzitwsaoONoRAmQSAJ4kpvW0tNn980rr9VxISiFzEVbh/QCfdXac
-9vf9n3bFVaGq3Sy+WmI/SNg=
-=Ze9J
------END PGP SIGNATURE-----
+RMD160 feb3e5e74476c24efa7fc0c22a9b99f6e7c6547a files/postinstall-en.txt 162
+SHA256 4a9660e63271a754cc5ad9976c0021b57ef1e02cb3e919e54b7b6e87293e6573 files/postinstall-en.txt 162
+MD5 8c05332043586029d9d1417154cda2fc metadata.xml 185
+RMD160 15bec831ce9a0f6765a88dda4fe4acf259c14400 metadata.xml 185
+SHA256 a382745039a87fe301ef3076e4d937b0a58eef8de0d18d2d9d3ba18ce912e771 metadata.xml 185
+MD5 0c4420522514153654f21409a386a18a phppgadmin-3.5.4.ebuild 1104
+RMD160 560c32e2118083c4258ed81b28c4bb7333734516 phppgadmin-3.5.4.ebuild 1104
+SHA256 d1e53eb673054e853b1044687c4b562f8f24f576ec1f06fb61dc9c8f04c81698 phppgadmin-3.5.4.ebuild 1104
+MD5 c8513b71f41ceb0cd9b1248a5da1f0d3 phppgadmin-4.0.1.ebuild 1089
+RMD160 dcc67134bd91be7237f24c50a604ec0af34aeaae phppgadmin-4.0.1.ebuild 1089
+SHA256 1d8ef7d5e22654f10192d332739b6f6d83fedbac96e07b854bfbb0c5b64cef4d phppgadmin-4.0.1.ebuild 1089
diff --git a/dev-db/phppgadmin/files/digest-phppgadmin-3.5.4 b/dev-db/phppgadmin/files/digest-phppgadmin-3.5.4
index b8b0e5b48aa3..3b387ea7560e 100644
--- a/dev-db/phppgadmin/files/digest-phppgadmin-3.5.4
+++ b/dev-db/phppgadmin/files/digest-phppgadmin-3.5.4
@@ -1 +1,3 @@
 MD5 34917ca53666700a0a5209f41b53a522 phpPgAdmin-3.5.4.tar.bz2 457648
+RMD160 939cc713d6a5b96c07558039427bc985768ec1ef phpPgAdmin-3.5.4.tar.bz2 457648
+SHA256 a0e4c034ccb207f89257d6f684d7a9c3448f01470b2136f3c9ac5a2d6fc02036 phpPgAdmin-3.5.4.tar.bz2 457648
diff --git a/dev-db/phppgadmin/files/digest-phppgadmin-3.5.5 b/dev-db/phppgadmin/files/digest-phppgadmin-3.5.5
deleted file mode 100644
index 9b3f0d70a22e..000000000000
--- a/dev-db/phppgadmin/files/digest-phppgadmin-3.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26ff10b0bc1c4a313ddcf6e679cb4adf phpPgAdmin-3.5.5.tar.bz2 457450
diff --git a/dev-db/phppgadmin/files/digest-phppgadmin-3.5.6 b/dev-db/phppgadmin/files/digest-phppgadmin-3.5.6
deleted file mode 100644
index 43e9c85ec2ce..000000000000
--- a/dev-db/phppgadmin/files/digest-phppgadmin-3.5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6492cd318b8213a257571f0443e6c344 phpPgAdmin-3.5.6.tar.bz2 457277
diff --git a/dev-db/phppgadmin/files/digest-phppgadmin-4.0.1 b/dev-db/phppgadmin/files/digest-phppgadmin-4.0.1
index 51559fa155cb..9ff12fafb71d 100644
--- a/dev-db/phppgadmin/files/digest-phppgadmin-4.0.1
+++ b/dev-db/phppgadmin/files/digest-phppgadmin-4.0.1
@@ -1 +1,3 @@
 MD5 7e0c18a01538572d3c2b435725e68fe2 phpPgAdmin-4.0.1.tar.bz2 509800
+RMD160 6515251fda31d2b51419d071580b8f01805c53a3 phpPgAdmin-4.0.1.tar.bz2 509800
+SHA256 8a1b94013e6a332affc3bd029542734d461b3214e33e083f4cdebfe6b2466ff1 phpPgAdmin-4.0.1.tar.bz2 509800
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild
index a76a63a649d9..d2e48ed3e7c9 100644
--- a/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild,v 1.7 2005/11/20 13:37:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild,v 1.8 2006/02/15 22:32:54 rl03 Exp $
 
-inherit eutils webapp
+inherit eutils webapp depend.php
 
 IUSE=""
 
@@ -18,10 +18,12 @@ HOMEPAGE="http://phppgadmin.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS="amd64 hppa ppc sparc x86"
 
-DEPEND="virtual/httpd-php"
+need_php
 
-RDEPEND="${DEPEND}
-	!<=dev-db/phppgadmin-3.3.1"
+pkg_setup() {
+	webapp_pkg_setup
+	require_php_with_use pcre postgres session
+}
 
 src_install() {
 	webapp_src_preinst
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild
deleted file mode 100644
index de3c93ec0ec3..000000000000
--- a/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild,v 1.2 2005/11/20 13:37:16 mholzer Exp $
-
-inherit webapp
-
-IUSE=""
-
-# This package insists on uppercase letters
-MY_PN=phpPgAdmin
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DEPEND="virtual/httpd-php"
-
-RDEPEND="${DEPEND}
-	!<=dev-db/phppgadmin-3.3.1"
-
-src_install() {
-	webapp_src_preinst
-
-	local doc
-	local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
-	dodoc ${docs}
-	mv conf/config.inc.php-dist conf/config.inc.php
-
-	cp -r * ${D}${MY_HTDOCSDIR}
-	for doc in ${docs} INSTALL LICENSE; do
-		rm -f ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild
deleted file mode 100644
index cdcc079afb69..000000000000
--- a/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild,v 1.2 2005/11/20 13:37:16 mholzer Exp $
-
-inherit webapp
-
-IUSE=""
-
-# This package insists on uppercase letters
-MY_PN=phpPgAdmin
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DEPEND="virtual/httpd-php"
-
-RDEPEND="${DEPEND}
-	!<=dev-db/phppgadmin-3.3.1"
-
-src_install() {
-	webapp_src_preinst
-
-	local doc
-	local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
-	dodoc ${docs}
-	mv conf/config.inc.php-dist conf/config.inc.php
-
-	cp -r * ${D}${MY_HTDOCSDIR}
-	for doc in ${docs} INSTALL LICENSE; do
-		rm -f ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/dev-db/phppgadmin/phppgadmin-4.0.1.ebuild b/dev-db/phppgadmin/phppgadmin-4.0.1.ebuild
index 5b02292daa5c..fcab1970f467 100644
--- a/dev-db/phppgadmin/phppgadmin-4.0.1.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-4.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-4.0.1.ebuild,v 1.1 2005/11/29 01:04:26 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-4.0.1.ebuild,v 1.2 2006/02/15 22:32:54 rl03 Exp $
 
-inherit webapp
+inherit webapp depend.php
 
 IUSE=""
 
@@ -17,10 +17,12 @@ HOMEPAGE="http://phppgadmin.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
-DEPEND="virtual/httpd-php"
+need_php
 
-RDEPEND="${DEPEND}
-	!<=dev-db/phppgadmin-3.3.1"
+pkg_setup() {
+	webapp_pkg_setup
+	require_php_with_use pcre postgres session
+}
 
 src_install() {
 	webapp_src_preinst