1 |
mabi 13/11/25 23:11:17 |
2 |
|
3 |
Modified: ChangeLog php-pear-r1.eclass |
4 |
Log: |
5 |
integrate php-pear-lib-r1 into php-pear-r1 eclass |
6 |
|
7 |
Revision Changes Path |
8 |
1.1071 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1071&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1071&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1070&r2=1.1071 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1070 |
18 |
retrieving revision 1.1071 |
19 |
diff -u -r1.1070 -r1.1071 |
20 |
--- ChangeLog 25 Nov 2013 07:06:23 -0000 1.1070 |
21 |
+++ ChangeLog 25 Nov 2013 23:11:16 -0000 1.1071 |
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.1070 2013/11/25 07:06:23 nerdboy Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1071 2013/11/25 23:11:16 mabi Exp $ |
27 |
+ |
28 |
+ 26 Nov 2013; Matti Bickel <mabi@g.o> php-pear-r1.eclass: |
29 |
+ Merge pkg_setup from php-pear-lib-r1.eclass and generify so that php-pear-r1 |
30 |
+ can handle everything php-pear-lib-r1 can. |
31 |
|
32 |
25 Nov 2013; Steve Arnold <nerdboy@g.o> gnatbuild.eclass: |
33 |
Symlink fix should be good back to 4.4 (see bug #363839). |
34 |
|
35 |
|
36 |
|
37 |
1.31 eclass/php-pear-r1.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.31&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.31&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.30&r2=1.31 |
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.30 |
47 |
retrieving revision 1.31 |
48 |
diff -u -r1.30 -r1.31 |
49 |
--- php-pear-r1.eclass 22 Aug 2012 15:06:20 -0000 1.30 |
50 |
+++ php-pear-r1.eclass 25 Nov 2013 23:11:16 -0000 1.31 |
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-r1.eclass,v 1.30 2012/08/22 15:06:20 olemarkus Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.31 2013/11/25 23:11:16 mabi Exp $ |
56 |
|
57 |
# @ECLASS: php-pear-r1.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -44,12 +44,26 @@ |
60 |
[[ -z "${PEAR_PV}" ]] && fix_PEAR_PV |
61 |
|
62 |
PEAR_PN="${PHP_PEAR_PKG_NAME}-${PEAR_PV}" |
63 |
+: ${PHP_PEAR_URI:=pear.php.net} |
64 |
|
65 |
-[[ -z "${SRC_URI}" ]] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz" |
66 |
-[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}" |
67 |
+[[ -z "${SRC_URI}" ]] && SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_PN}.tgz" |
68 |
+[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://${PHP_PEAR_URI}/${PHP_PEAR_PKG_NAME}" |
69 |
|
70 |
S="${WORKDIR}/${PEAR_PN}" |
71 |
|
72 |
+# @FUNCTION: php-pear-lib-r1_pkg_setup |
73 |
+# @DESCRIPTION: |
74 |
+# Adds required PEAR channel if necessary |
75 |
+php-pear-r1_pkg_setup() { |
76 |
+ if [[ -n $PHP_PEAR_CHANNEL ]] ; then |
77 |
+ if [[ -f $PHP_PEAR_CHANNEL ]]; then |
78 |
+ pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels" |
79 |
+ else |
80 |
+ die "PHP_PEAR_CHANNEL must point to a (local) channel file" |
81 |
+ fi |
82 |
+ fi |
83 |
+} |
84 |
+ |
85 |
# @FUNCTION: php-pear-r1_src_install |
86 |
# @DESCRIPTION: |
87 |
# Takes care of standard install for PEAR packages. |