* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2009-01-12 22:48 Markus Meier (maekke)
0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier (maekke) @ 2009-01-12 22:48 UTC (permalink / raw
To: gentoo-commits
maekke 09/01/12 22:48:06
Modified: php-pear-lib-r1.eclass
Log:
whitespace
Revision Changes Path
1.15 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.14&r2=1.15
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php-pear-lib-r1.eclass 19 Mar 2008 09:27:28 -0000 1.14
+++ php-pear-lib-r1.eclass 12 Jan 2009 22:48:06 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.14 2008/03/19 09:27:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.15 2009/01/12 22:48:06 maekke Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -45,29 +45,29 @@
cd "${S}"
- if [[ -f "${WORKDIR}"/package2.xml ]] ; then
- mv -f "${WORKDIR}/package2.xml" "${S}"
- if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
- local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
- install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package2.xml" || die "Unable to install PEAR package"
- else
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package2.xml" || die "Unable to install PEAR package"
- fi
- else
- mv -f "${WORKDIR}/package.xml" "${S}"
- if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
- local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
- install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package.xml" || die "Unable to install PEAR package"
- else
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package.xml" || die "Unable to install PEAR package"
- fi
- fi
+ if [[ -f "${WORKDIR}"/package2.xml ]] ; then
+ mv -f "${WORKDIR}/package2.xml" "${S}"
+ if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
+ local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
+ pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ install --force --loose --nodeps --offline --packagingroot="${D}" \
+ "${S}/package2.xml" || die "Unable to install PEAR package"
+ else
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+ "${S}/package2.xml" || die "Unable to install PEAR package"
+ fi
+ else
+ mv -f "${WORKDIR}/package.xml" "${S}"
+ if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
+ local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
+ pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ install --force --loose --nodeps --offline --packagingroot="${D}" \
+ "${S}/package.xml" || die "Unable to install PEAR package"
+ else
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+ "${S}/package.xml" || die "Unable to install PEAR package"
+ fi
+ fi
rm -Rf "${D}/usr/share/php/.channels" \
"${D}/usr/share/php/.depdblock" \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2010-06-09 11:11 Matti Bickel (mabi)
0 siblings, 0 replies; 8+ messages in thread
From: Matti Bickel (mabi) @ 2010-06-09 11:11 UTC (permalink / raw
To: gentoo-commits
mabi 10/06/09 11:11:58
Modified: php-pear-lib-r1.eclass
Log:
fix PEAR-PEAR dependency (bug #310633)
Revision Changes Path
1.16 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.15&r2=1.16
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- php-pear-lib-r1.eclass 12 Jan 2009 22:48:06 -0000 1.15
+++ php-pear-lib-r1.eclass 9 Jun 2010 11:11:58 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.15 2009/01/12 22:48:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.16 2010/06/09 11:11:58 mabi Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -17,7 +17,9 @@
EXPORT_FUNCTIONS src_install
-DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.6.1"
+DEPEND="dev-lang/php
+ || ( ( >=dev-php/PEAR-PEAR-1.6.1 <dev-php/PEAR-PEAR-1.8.1 )
+ >=dev-php/pear-1.8.1 )"
RDEPEND="${DEPEND}"
# @FUNCTION: php-pear-lib-r1_src_install
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2010-07-12 17:48 Matti Bickel (mabi)
0 siblings, 0 replies; 8+ messages in thread
From: Matti Bickel (mabi) @ 2010-07-12 17:48 UTC (permalink / raw
To: gentoo-commits
mabi 10/07/12 17:48:32
Modified: php-pear-lib-r1.eclass
Log:
use peardev instead of pear to avoid memory limitation issues
Revision Changes Path
1.17 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.16&r2=1.17
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- php-pear-lib-r1.eclass 9 Jun 2010 11:11:58 -0000 1.16
+++ php-pear-lib-r1.eclass 12 Jul 2010 17:48:32 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.16 2010/06/09 11:11:58 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.17 2010/07/12 17:48:32 mabi Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -51,22 +51,22 @@
mv -f "${WORKDIR}/package2.xml" "${S}"
if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
install --force --loose --nodeps --offline --packagingroot="${D}" \
"${S}/package2.xml" || die "Unable to install PEAR package"
else
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+ peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
"${S}/package2.xml" || die "Unable to install PEAR package"
fi
else
mv -f "${WORKDIR}/package.xml" "${S}"
if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
install --force --loose --nodeps --offline --packagingroot="${D}" \
"${S}/package.xml" || die "Unable to install PEAR package"
else
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+ peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
"${S}/package.xml" || die "Unable to install PEAR package"
fi
fi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2011-03-05 11:04 Ole Markus With (olemarkus)
0 siblings, 0 replies; 8+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-03-05 11:04 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/03/05 11:04:11
Modified: php-pear-lib-r1.eclass
Log:
Packages can now define their own pear channel.
Requried version for pear packages is now pear-1.9.0
Revision Changes Path
1.20 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.19&r2=1.20
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- php-pear-lib-r1.eclass 30 Oct 2010 17:01:25 -0000 1.19
+++ php-pear-lib-r1.eclass 5 Mar 2011 11:04:11 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.19 2010/10/30 17:01:25 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.20 2011/03/05 11:04:11 olemarkus Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -15,13 +15,35 @@
inherit depend.php multilib
-EXPORT_FUNCTIONS src_install
+EXPORT_FUNCTIONS pkg_setup src_install
DEPEND="dev-lang/php
- || ( ( >=dev-php/PEAR-PEAR-1.6.1 <dev-php/PEAR-PEAR-1.8.1 )
- >=dev-php/pear-1.8.1 )"
+ >=dev-php/pear-1.9.0"
RDEPEND="${DEPEND}"
+
+if [[ -n $PHP_PEAR_CHANNEL ]] ; then
+ PHP_PEAR_PV=${PV/_rc/RC}
+ [[ -z ${PHP_PEAR_PN} ]] && die "Missing PHP_PEAR_PN. Please notify the maintainer"
+ PHP_PEAR_P=${PHP_PEAR_PN}-${PHP_PEAR_PV}
+
+ S=${WORKDIR}/${PHP_PEAR_P}
+
+ SRC_URI="${PHP_PEAR_CHANNEL}/get/${PHP_PEAR_P}.tgz"
+fi
+
+
+# @FUNCTION: php-pear-lib-r1_pkg_setup
+# @DESCRIPTION
+# Adds required PEAR channel if necessary
+php-pear-lib-r1_pkg_setup() {
+ if [[ -n $PHP_PEAR_CHANNEL ]] ; then
+ pear channel-discover $PHP_PEAR_CHANNEL
+ pear channel-update $PHP_PEAR_CHANNEL
+ fi
+}
+
+
# @FUNCTION: php-pear-lib-r1_src_install
# @DESCRIPTION:
# Takes care of standard install for PEAR-based libraries.
@@ -39,26 +61,16 @@
if [[ -f "${WORKDIR}"/package2.xml ]] ; then
mv -f "${WORKDIR}/package2.xml" "${S}"
- if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
- local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
- install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package2.xml" || die "Unable to install PEAR package"
- else
- peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package2.xml" || die "Unable to install PEAR package"
- fi
+ local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
+ peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ install --force --loose --nodeps --offline --packagingroot="${D}" \
+ "${S}/package2.xml" || die "Unable to install PEAR package"
else
mv -f "${WORKDIR}/package.xml" "${S}"
- if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
- local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
- install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package.xml" || die "Unable to install PEAR package"
- else
- peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
- "${S}/package.xml" || die "Unable to install PEAR package"
- fi
+ local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
+ peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ install --force --loose --nodeps --offline --packagingroot="${D}" \
+ "${S}/package.xml" || die "Unable to install PEAR package"
fi
rm -Rf "${D}/usr/share/php/.channels" \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2011-03-14 8:00 Ole Markus With (olemarkus)
0 siblings, 0 replies; 8+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-03-14 8:00 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/03/14 08:00:10
Modified: php-pear-lib-r1.eclass
Log:
Made sure that pear repository URIs are valid
Revision Changes Path
1.21 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.20&r2=1.21
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- php-pear-lib-r1.eclass 5 Mar 2011 11:04:11 -0000 1.20
+++ php-pear-lib-r1.eclass 14 Mar 2011 08:00:10 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.20 2011/03/05 11:04:11 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.21 2011/03/14 08:00:10 olemarkus Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -29,7 +29,7 @@
S=${WORKDIR}/${PHP_PEAR_P}
- SRC_URI="${PHP_PEAR_CHANNEL}/get/${PHP_PEAR_P}.tgz"
+ SRC_URI="http://${PHP_PEAR_CHANNEL}/get/${PHP_PEAR_P}.tgz"
fi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2011-04-16 12:19 Ole Markus With (olemarkus)
0 siblings, 0 replies; 8+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-04-16 12:19 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/04/16 12:19:00
Modified: php-pear-lib-r1.eclass
Log:
Added support for local channels
Revision Changes Path
1.22 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.21&r2=1.22
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- php-pear-lib-r1.eclass 14 Mar 2011 08:00:10 -0000 1.21
+++ php-pear-lib-r1.eclass 16 Apr 2011 12:19:00 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.21 2011/03/14 08:00:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.22 2011/04/16 12:19:00 olemarkus Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -38,8 +38,12 @@
# Adds required PEAR channel if necessary
php-pear-lib-r1_pkg_setup() {
if [[ -n $PHP_PEAR_CHANNEL ]] ; then
- pear channel-discover $PHP_PEAR_CHANNEL
- pear channel-update $PHP_PEAR_CHANNEL
+ if [[ -f $PHP_PEAR_CHANNEL ]]; then
+ pear channel-add $PHP_PEAR_CHANNEL
+ else
+ pear channel-discover $PHP_PEAR_CHANNEL
+ pear channel-update $PHP_PEAR_CHANNEL
+ fi
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2011-06-28 7:03 Ole Markus With (olemarkus)
0 siblings, 0 replies; 8+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-06-28 7:03 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/06/28 07:03:59
Modified: php-pear-lib-r1.eclass
Log:
After channel.xml files were copied locally, all SRC_URI's broke for the pear ebuilds
Revision Changes Path
1.23 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.22&r2=1.23
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php-pear-lib-r1.eclass 16 Apr 2011 12:19:00 -0000 1.22
+++ php-pear-lib-r1.eclass 28 Jun 2011 07:03:59 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.22 2011/04/16 12:19:00 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.23 2011/06/28 07:03:59 olemarkus Exp $
#
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -21,7 +21,6 @@
>=dev-php/pear-1.9.0"
RDEPEND="${DEPEND}"
-
if [[ -n $PHP_PEAR_CHANNEL ]] ; then
PHP_PEAR_PV=${PV/_rc/RC}
[[ -z ${PHP_PEAR_PN} ]] && die "Missing PHP_PEAR_PN. Please notify the maintainer"
@@ -29,7 +28,7 @@
S=${WORKDIR}/${PHP_PEAR_P}
- SRC_URI="http://${PHP_PEAR_CHANNEL}/get/${PHP_PEAR_P}.tgz"
+ SRC_URI="http://${PHP_PEAR_URI}/get/${PHP_PEAR_P}.tgz"
fi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass
@ 2012-06-23 14:58 Ole Markus With (olemarkus)
0 siblings, 0 replies; 8+ messages in thread
From: Ole Markus With (olemarkus) @ 2012-06-23 14:58 UTC (permalink / raw
To: gentoo-commits
olemarkus 12/06/23 14:58:17
Modified: php-pear-lib-r1.eclass
Log:
Make channel discovery more strict
Revision Changes Path
1.25 eclass/php-pear-lib-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.24&r2=1.25
Index: php-pear-lib-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- php-pear-lib-r1.eclass 22 Aug 2011 04:46:32 -0000 1.24
+++ php-pear-lib-r1.eclass 23 Jun 2012 14:58:17 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.24 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.25 2012/06/23 14:58:17 olemarkus Exp $
# @ECLASS: php-pear-lib-r1.eclass
# @MAINTAINER:
@@ -38,10 +38,9 @@
php-pear-lib-r1_pkg_setup() {
if [[ -n $PHP_PEAR_CHANNEL ]] ; then
if [[ -f $PHP_PEAR_CHANNEL ]]; then
- pear channel-add $PHP_PEAR_CHANNEL
+ pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels"
else
- pear channel-discover $PHP_PEAR_CHANNEL
- pear channel-update $PHP_PEAR_CHANNEL
+ die "Could not find channel file $PHP_PEAR_CHANNEL"
fi
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-06-23 14:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-05 11:04 [gentoo-commits] gentoo-x86 commit in eclass: php-pear-lib-r1.eclass Ole Markus With (olemarkus)
-- strict thread matches above, loose matches on Subject: below --
2012-06-23 14:58 Ole Markus With (olemarkus)
2011-06-28 7:03 Ole Markus With (olemarkus)
2011-04-16 12:19 Ole Markus With (olemarkus)
2011-03-14 8:00 Ole Markus With (olemarkus)
2010-07-12 17:48 Matti Bickel (mabi)
2010-06-09 11:11 Matti Bickel (mabi)
2009-01-12 22:48 Markus Meier (maekke)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox