Remove spurious inherit, update live ebuild

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 31 insertions, 14 deletions

diff --git a/dev-db/phppgadmin/ChangeLog b/dev-db/phppgadmin/ChangeLog
index 3c1b5b243109..860c423a5c10 100644
--- a/dev-db/phppgadmin/ChangeLog
+++ b/dev-db/phppgadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/phppgadmin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.84 2010/04/30 22:01:38 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.85 2010/05/03 17:44:52 reavertm Exp $
+
+  03 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  phppgadmin-4.2.3.ebuild, phppgadmin-9999.ebuild:
+  Remove spurious inherit, update live ebuild
 
 *phppgadmin-4.2.3 (30 Apr 2010)
 
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index 3bd6d0e2a0d8..c9e398fea329 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -4,7 +4,7 @@ DIST phpPgAdmin-4.2.2.tar.bz2 664619 RMD160 a41ce2278d09a2d791630b24db90edd0d3cc
 DIST phpPgAdmin-4.2.3.tar.bz2 665324 RMD160 3e1a7740d8c6883282818999436d93288573d993 SHA1 28ecb4073d432b80592bc53b0c86fa9ef8459428 SHA256 52efcb2a2a2782f6bfe216d19c04fae854fc172f56f0b62b6c0dc0bf4c324a13
 EBUILD phppgadmin-4.1.3.ebuild 1048 RMD160 367af535b2e5c4558ec289068a6440254b76d92b SHA1 2a576063ed167e27068da54c9f7bfb32bb386f76 SHA256 724a031ef2f789eb0657b1e9a7d0558ae5b1c68178c9d69e6a523b0753812e4b
 EBUILD phppgadmin-4.2.2.ebuild 1047 RMD160 99da01e74ae55319629a0c1b5adb6cb318b35c86 SHA1 02ea6fb4a6e831b8459e87107c19d00ab6af1598 SHA256 b588aec0866954c88b41890e1177871d572924020d6b503e8344c4a44a131d1d
-EBUILD phppgadmin-4.2.3.ebuild 1097 RMD160 2c7be0380119c7375c781558c04198b4ff9bb564 SHA1 0d51db3acc01cadcc75d93952a4a81dc7d4f4be8 SHA256 71a306250485112c2fbe93388790b6db4aae391cc20b80e46c47421413a8cefd
-EBUILD phppgadmin-9999.ebuild 994 RMD160 ed467175a9f09ac195123d1b852f34a2279c9049 SHA1 65618c7ce7972c0bc50a66ab2f93a9aa8e422bb5 SHA256 360ecedf30ed9e433bc1c0eaa92b41f07c63bbe9920b77b904609f1ba8c8bdf5
-MISC ChangeLog 10361 RMD160 515e09c36c0e8ba7790d7f33b162790a251d8451 SHA1 e0f4f9378b139e5b6072e5a296f7f8431b6fe819 SHA256 5eaaaf6ab2208da1bc9f9a6d2ec98ee15f8da48ead3f09944e05086331eb76e0
+EBUILD phppgadmin-4.2.3.ebuild 1099 RMD160 b5c8594eaabb5187f538a6d6f80f446a5662b649 SHA1 e3e534fd213571c46d9e3f7eebca877f70522d5c SHA256 e3cf2768be5640f4919c9ba9481d0349cddcd5a3438530b2aaef6f098c2e8cfa
+EBUILD phppgadmin-9999.ebuild 1030 RMD160 37e02507d945fcf93b945744da931f215cec15fc SHA1 4b01579ebf01d07dc0729445467da72ff6691143 SHA256 d6e0f9e139e2c0811ed9085e0a91d37590d2312b8cdd55984f081df8bb3691ba
+MISC ChangeLog 10517 RMD160 2b43ceddedbfa150ea08dd4e6aa3e19c0e5923e9 SHA1 0256ef0030ae5903f7279022b8ad0c7e7de071b3 SHA256 8d0dbf0fca3450f3a78c23abf672feec58506b537f8f1af3fd928be932a1dc0a
 MISC metadata.xml 185 RMD160 15bec831ce9a0f6765a88dda4fe4acf259c14400 SHA1 318ade6da45c6657a13c2593cf96b3f7956992f7 SHA256 a382745039a87fe301ef3076e4d937b0a58eef8de0d18d2d9d3ba18ce912e771
diff --git a/dev-db/phppgadmin/phppgadmin-4.2.3.ebuild b/dev-db/phppgadmin/phppgadmin-4.2.3.ebuild
index a9434b5ec648..f4ddb3c3ef0b 100644
--- a/dev-db/phppgadmin/phppgadmin-4.2.3.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-4.2.3.ebuild
@@ -1,21 +1,26 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-4.2.3.ebuild,v 1.1 2010/04/30 22:01:38 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-4.2.3.ebuild,v 1.2 2010/05/03 17:44:52 reavertm Exp $
 
 EAPI="2"
-inherit webapp depend.php
 
-IUSE=""
+inherit webapp
 
 MY_P=phpPgAdmin-${PV}
 
 DESCRIPTION="Web-based administration for Postgres database in php"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://phppgadmin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+IUSE=""
+
+RDEPEND="
+	|| (
+		<dev-lang/php-5.3[pcre]
+		>=dev-lang/php-5.3
+	)
 	dev-lang/php[postgres,session]
 "
 
diff --git a/dev-db/phppgadmin/phppgadmin-9999.ebuild b/dev-db/phppgadmin/phppgadmin-9999.ebuild
index b6706adcef96..e0395275b456 100644
--- a/dev-db/phppgadmin/phppgadmin-9999.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-9999.ebuild,v 1.1 2010/02/21 17:38:21 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-9999.ebuild,v 1.2 2010/05/03 17:44:52 reavertm Exp $
 
 EAPI="2"
 
-inherit webapp depend.php git
+inherit webapp git
 
 DESCRIPTION="Web-based administration for Postgres database in php"
 HOMEPAGE="http://phppgadmin.sourceforge.net/"
@@ -14,11 +14,16 @@ LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
-need_php
+RDEPEND="
+	|| (
+		<dev-lang/php-5.3[pcre]
+		>=dev-lang/php-5.3
+	)
+	dev-lang/php[postgres,session]
+"
 
 pkg_setup() {
 	webapp_pkg_setup
-	require_php_with_use pcre postgres session
 }
 
 src_install() {
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index e7f215df9881..bbf5a3d4801b 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,12 +1,15 @@
 AUX 1.4.43.patch 439 RMD160 2b8a86157cb96fec3ad919575d630f70bf15bef3 SHA1 801092250201b37bf5cd55d53383d6a3b9f5d21c SHA256 1b374a675a6386cc64d575659baed130e6d4ad5e6cee0388051e86477d70c413
+AUX 1.4.44.patch 438 RMD160 c79d4b30738a5993f5ddc9465c8de7801f6749b9 SHA1 66d69a7e802d85e6b293bd32ed9eb8870e29c61f SHA256 5ab2a953847086cf81eaa68911014aced562b2b1f7dabb45d9b9e75e3923fc96
 AUX fix_rpath.patch 2111 RMD160 ef1878e4519d3e056847b6bb98069d343987d737 SHA1 4bc2679a8fd544ae2275f1113f5096d540987ae9 SHA256 cba364650da90d9fcae3424a1e6ce400769db193c863e5cdbf29a4ced0292ce6
 DIST tokyocabinet-1.4.38.tar.gz 989170 RMD160 959e6c9cebf14ae8477cfdfb4f47f0b4edc7433b SHA1 7eee413bfd08751a50943637352981c13681c6ed SHA256 689bedf38afea507ece2a997c65bac5121921c29683fa5e1a7841cd52b249574
 DIST tokyocabinet-1.4.41.tar.gz 991669 RMD160 104f3e3c83caf7f510a64537e8815a7e41fd8e24 SHA1 aefd98f86cd86141254978574e10ca58228902a6 SHA256 567bd9a05608474776a44849fca866fbbc0de69278531af5c9332c7bb6c24391
 DIST tokyocabinet-1.4.42.tar.gz 989905 RMD160 8c39190d7cc8b379a6d69bbe58e07f3760c28744 SHA1 e46da0ef614f821b57564639cf15388df1c39fb5 SHA256 9936eefe9f410686af77c24dfefe69e7ab9a50cbd3668b1fca3ea0859b0f6e05
 DIST tokyocabinet-1.4.43.tar.gz 991665 RMD160 8efbcc718e49127e37e94f6df39a41cc3f29653d SHA1 80af9c05d767d9d4347172526087a667eea6ada0 SHA256 5d37aa1e974e82b6d1bd5a654e68319b03d6a5879a7ef55941c068f8b53b43f5
+DIST tokyocabinet-1.4.44.tar.gz 988966 RMD160 b4236bf1fe3d79491b1fa68334400947675dccdc SHA1 8c563c9f7a0da65c201b016cc7f34fc517d984c9 SHA256 eb5244d31d07e614a8be93c324478a7d410fb7bebf7e06eccfd183dfdbbd27ac
 EBUILD tokyocabinet-1.4.38.ebuild 988 RMD160 e8bd5253efe7847e0a00d08a19fe60c3fb5a6c30 SHA1 599384c864011d2cbd67037828163876a07f5d20 SHA256 e5fc665455c9280eae5910cdcbfdeae71da8ced72ba674b30e70ad3e220633e5
 EBUILD tokyocabinet-1.4.41.ebuild 992 RMD160 e41b78b1a962280785b002e95bbcfe12864093ef SHA1 abde2407f5df28d0a5dd0bc56a47b400220b1a13 SHA256 a505e40c30e1457c358c6eb8e209fad4305138756120044898cb0154ac19c80b
 EBUILD tokyocabinet-1.4.42.ebuild 993 RMD160 6458c0d61b4058533438246eb3ff603b73f41367 SHA1 cef38459681dcb646a7a625cf7c383625e2c822b SHA256 91c8b7224833634be053e48f1e872aa41afa5b4994c25e9545b0cd7db4517176
 EBUILD tokyocabinet-1.4.43.ebuild 1031 RMD160 e81c3f7223e82e2f76bb8adf17020936ec22a17b SHA1 48865f670f8020fb03f2e10ed7c9bb8c8d23fa19 SHA256 67a680ee6e98eaccb611d4d33e37181dc15aaeaa92c8b872cda5220d291a7f5c
-MISC ChangeLog 3325 RMD160 5cf645794cb2de5a1f55838b466b3b64021dabee SHA1 9a839ae3584b9bb783090718d17ea5989adac380 SHA256 4365edac94a7a82bb0b7c0abbcef5f9d1ee6502cba8ee97d40acdc20d6247a40
+EBUILD tokyocabinet-1.4.44.ebuild 1031 RMD160 aeea0dcf04fe455eb3ae2f1fc488a138337474c5 SHA1 c5806cd51a92d0fbfc5a1e1e57979b8ca2e32443 SHA256 ed0df2b4ac6d2d2693078575cacedbde45ece1a2ad0b8f8b584c03e496001ed3
+MISC ChangeLog 3481 RMD160 cb868f70132de902eb61b391a7ad8504e9b0f99f SHA1 b405910f98a1de645b637a2adf8c4bd012fdf95b SHA256 22430a254acf0914a73042c9d3a5c76f620c0ec64341ceb8dfe5e0dbac312bbf
 MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b