diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-03 17:44:52 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-03 17:44:52 +0000 |
| commit | 9b9d5c72fc18eb80fbf7f2eac6f3c28afcbdb042 (patch) | |
| tree | 2868a014425cfa6ee82ec6db510e00b24941d730 /dev-db | |
| parent | Leave to maintainer-needed, without bugs (diff) | |
| download | gentoo-2-9b9d5c72fc18eb80fbf7f2eac6f3c28afcbdb042.tar.gz gentoo-2-9b9d5c72fc18eb80fbf7f2eac6f3c28afcbdb042.tar.bz2 gentoo-2-9b9d5c72fc18eb80fbf7f2eac6f3c28afcbdb042.zip | |
Remove spurious inherit, update live ebuild
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phppgadmin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/phppgadmin/phppgadmin-4.2.3.ebuild | 15 | ||||
| -rw-r--r-- | dev-db/phppgadmin/phppgadmin-9999.ebuild | 13 |
3 files changed, 24 insertions, 10 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/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() { |