Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/phpldapadmin/
Date: Wed, 25 Nov 2015 13:48:05
Message-Id: 1448459245.a14654168015ffc03c59a82acc7f81b2ea264266.grknight@gentoo
1 commit: a14654168015ffc03c59a82acc7f81b2ea264266
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 25 13:47:25 2015 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 25 13:47:25 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1465416
7
8 net-nds/phpldapadmin: Remove depend.php from inherit wrt bug 552854
9
10 This simply replaces the function call with the dep it was adding.
11 No effective dep changes.
12 Ack by jmbsvicetto on IRC
13
14 Package-Manager: portage-2.2.25
15
16 net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild | 8 ++++----
17 net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild | 8 ++++----
18 2 files changed, 8 insertions(+), 8 deletions(-)
19
20 diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
21 index 6ce53f6..84052a1 100644
22 --- a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
23 +++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
24 @@ -1,10 +1,10 @@
25 -# Copyright 1999-2014 Gentoo Foundation
26 +# Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 # $Id$
29
30 EAPI=5
31
32 -inherit webapp depend.php
33 +inherit webapp
34
35 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
36 HOMEPAGE="http://phpldapadmin.sourceforge.net"
37 @@ -15,10 +15,10 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
38 IUSE=""
39
40 RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
41 - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
42 + || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
43 + virtual/httpd-php"
44
45 need_httpd_cgi
46 -need_php_httpd
47
48 src_prepare() {
49 mv config/config.php.example config/config.php
50
51 diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
52 index 15be856..0095131 100644
53 --- a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
54 +++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
55 @@ -1,10 +1,10 @@
56 -# Copyright 1999-2014 Gentoo Foundation
57 +# Copyright 1999-2015 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 # $Id$
60
61 EAPI=5
62
63 -inherit webapp depend.php
64 +inherit webapp
65
66 DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server"
67 HOMEPAGE="http://phpldapadmin.sourceforge.net"
68 @@ -15,10 +15,10 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
69 IUSE=""
70
71 RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
72 - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
73 + || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
74 + virtual/httpd-php"
75
76 need_httpd_cgi
77 -need_php_httpd
78
79 src_prepare() {
80 mv config/config.php.example config/config.php