| 1 |
mabi 13/11/25 23:22:57 |
| 2 |
|
| 3 |
Modified: ChangeLog php-pear-r1.eclass |
| 4 |
Log: |
| 5 |
export pkg_setup and default PHP_PEAR_CHANNEL to ${FILESDIR}/channel.xml (all current packages set this value) |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1072 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1072&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1072&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1071&r2=1.1072 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1071 |
| 18 |
retrieving revision 1.1072 |
| 19 |
diff -u -r1.1071 -r1.1072 |
| 20 |
--- ChangeLog 25 Nov 2013 23:11:16 -0000 1.1071 |
| 21 |
+++ ChangeLog 25 Nov 2013 23:22:57 -0000 1.1072 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1071 2013/11/25 23:11:16 mabi Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1072 2013/11/25 23:22:57 mabi Exp $ |
| 27 |
+ |
| 28 |
+ 26 Nov 2013; Matti Bickel <mabi@g.o> php-pear-r1.eclass: |
| 29 |
+ export pkg_setup and default PHP_PEAR_CHANNEL to ${FILESDIR}/channel.xml (all |
| 30 |
+ current packages set this value) |
| 31 |
|
| 32 |
26 Nov 2013; Matti Bickel <mabi@g.o> php-pear-r1.eclass: |
| 33 |
Merge pkg_setup from php-pear-lib-r1.eclass and generify so that php-pear-r1 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.32 eclass/php-pear-r1.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.32&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.32&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.31&r2=1.32 |
| 42 |
|
| 43 |
Index: php-pear-r1.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v |
| 46 |
retrieving revision 1.31 |
| 47 |
retrieving revision 1.32 |
| 48 |
diff -u -r1.31 -r1.32 |
| 49 |
--- php-pear-r1.eclass 25 Nov 2013 23:11:16 -0000 1.31 |
| 50 |
+++ php-pear-r1.eclass 25 Nov 2013 23:22:57 -0000 1.32 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
-# Copyright 1999-2011 Gentoo Foundation |
| 53 |
+# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.31 2013/11/25 23:11:16 mabi Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.32 2013/11/25 23:22:57 mabi Exp $ |
| 57 |
|
| 58 |
# @ECLASS: php-pear-r1.eclass |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -17,7 +17,7 @@ |
| 61 |
|
| 62 |
inherit multilib |
| 63 |
|
| 64 |
-EXPORT_FUNCTIONS src_install |
| 65 |
+EXPORT_FUNCTIONS pkg_setup src_install |
| 66 |
|
| 67 |
DEPEND="dev-lang/php |
| 68 |
>=dev-php/pear-1.8.1" |
| 69 |
@@ -45,6 +45,7 @@ |
| 70 |
|
| 71 |
PEAR_PN="${PHP_PEAR_PKG_NAME}-${PEAR_PV}" |
| 72 |
: ${PHP_PEAR_URI:=pear.php.net} |
| 73 |
+: ${PHP_PEAR_CHANNEL:=${FILESDIR}/channel.xml} |
| 74 |
|
| 75 |
[[ -z "${SRC_URI}" ]] && SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_PN}.tgz" |
| 76 |
[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://${PHP_PEAR_URI}/${PHP_PEAR_PKG_NAME}" |
| 77 |
@@ -55,12 +56,8 @@ |
| 78 |
# @DESCRIPTION: |
| 79 |
# Adds required PEAR channel if necessary |
| 80 |
php-pear-r1_pkg_setup() { |
| 81 |
- if [[ -n $PHP_PEAR_CHANNEL ]] ; then |
| 82 |
- if [[ -f $PHP_PEAR_CHANNEL ]]; then |
| 83 |
- pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels" |
| 84 |
- else |
| 85 |
- die "PHP_PEAR_CHANNEL must point to a (local) channel file" |
| 86 |
- fi |
| 87 |
+ if [[ -f $PHP_PEAR_CHANNEL ]]; then |
| 88 |
+ pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels" |
| 89 |
fi |
| 90 |
} |
Archives