| 1 |
mabi 12/07/03 09:10:00 |
| 2 |
|
| 3 |
Modified: ChangeLog php-pear-lib-r1.eclass |
| 4 |
Log: |
| 5 |
remove requirement for depend.php from php-pear-lib-r1.eclass |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.334 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.334&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.334&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.333&r2=1.334 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.333 |
| 18 |
retrieving revision 1.334 |
| 19 |
diff -u -r1.333 -r1.334 |
| 20 |
--- ChangeLog 1 Jul 2012 19:43:30 -0000 1.333 |
| 21 |
+++ ChangeLog 3 Jul 2012 09:10:00 -0000 1.334 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.333 2012/07/01 19:43:30 vadimk Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.334 2012/07/03 09:10:00 mabi Exp $ |
| 27 |
+ |
| 28 |
+ 01 Jul 2012; Matti Bickel <mabi@g.o> php-pear-lib-r1.eclass: |
| 29 |
+ Remove requirement for depend.php.eclass. Since our switch to /usr/share/php |
| 30 |
+ only it is no longer needed. |
| 31 |
|
| 32 |
01 Jul 2012; Vadim Kuznetsov vadimk@g.o vmware.eclass, |
| 33 |
vmware-mod.eclass: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.26 eclass/php-pear-lib-r1.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.26&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.26&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.25&r2=1.26 |
| 42 |
|
| 43 |
Index: php-pear-lib-r1.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v |
| 46 |
retrieving revision 1.25 |
| 47 |
retrieving revision 1.26 |
| 48 |
diff -u -r1.25 -r1.26 |
| 49 |
--- php-pear-lib-r1.eclass 23 Jun 2012 14:58:17 -0000 1.25 |
| 50 |
+++ php-pear-lib-r1.eclass 3 Jul 2012 09:10:00 -0000 1.26 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2011 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.25 2012/06/23 14:58:17 olemarkus Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.26 2012/07/03 09:10:00 mabi Exp $ |
| 56 |
|
| 57 |
# @ECLASS: php-pear-lib-r1.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -13,7 +13,7 @@ |
| 60 |
# such as Creole, Jargon, Phing etc., while retaining the functionality to put |
| 61 |
# the libraries into version-dependant directories. |
| 62 |
|
| 63 |
-inherit depend.php multilib |
| 64 |
+inherit multilib |
| 65 |
|
| 66 |
EXPORT_FUNCTIONS pkg_setup src_install |
| 67 |
|
| 68 |
@@ -26,7 +26,7 @@ |
| 69 |
[[ -z ${PHP_PEAR_PN} ]] && die "Missing PHP_PEAR_PN. Please notify the maintainer" |
| 70 |
PHP_PEAR_P=${PHP_PEAR_PN}-${PHP_PEAR_PV} |
| 71 |
|
| 72 |
- S=${WORKDIR}/${PHP_PEAR_P} |
| 73 |
+ S="${WORKDIR}/${PHP_PEAR_P}" |
| 74 |
|
| 75 |
SRC_URI="http://${PHP_PEAR_URI}/get/${PHP_PEAR_P}.tgz" |
| 76 |
fi |
| 77 |
@@ -50,8 +50,6 @@ |
| 78 |
# @DESCRIPTION: |
| 79 |
# Takes care of standard install for PEAR-based libraries. |
| 80 |
php-pear-lib-r1_src_install() { |
| 81 |
- has_php |
| 82 |
- |
| 83 |
# SNMP support |
| 84 |
addpredict /usr/share/snmp/mibs/.index |
| 85 |
addpredict /var/lib/net-snmp/ |
| 86 |
@@ -82,19 +80,7 @@ |
| 87 |
"${D}/usr/share/php/.lock" \ |
| 88 |
"${D}/usr/share/php/.registry" |
| 89 |
|
| 90 |
- # install to the correct phpX folder, if not specified |
| 91 |
- # /usr/share/php will be kept, also sedding to substitute |
| 92 |
- # the path, many files can specify it wrongly |
| 93 |
- if [[ -n "${PHP_SHARED_CAT}" ]] && [[ "${PHP_SHARED_CAT}" != "php" ]] ; then |
| 94 |
- mv -f "${D}/usr/share/php" "${D}/usr/share/${PHP_SHARED_CAT}" || die "Unable to move files" |
| 95 |
- find "${D}/" -type f -exec sed -e "s|/usr/share/php|/usr/share/${PHP_SHARED_CAT}|g" -i {} \; \ |
| 96 |
- || die "Unable to change PHP path" |
| 97 |
- einfo |
| 98 |
- einfo "Installing to /usr/share/${PHP_SHARED_CAT} ..." |
| 99 |
- einfo |
| 100 |
- else |
| 101 |
- einfo |
| 102 |
- einfo "Installing to /usr/share/php ..." |
| 103 |
- einfo |
| 104 |
- fi |
| 105 |
+ einfo |
| 106 |
+ einfo "Installing to /usr/share/php ..." |
| 107 |
+ einfo |
| 108 |
} |
Archives