* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
@ 2007-10-22 22:55 Markus Ullmann (jokey)
0 siblings, 0 replies; 6+ messages in thread
From: Markus Ullmann (jokey) @ 2007-10-22 22:55 UTC (permalink / raw
To: gentoo-commits
jokey 07/10/22 22:55:04
Modified: php-pear-r1.eclass
Log:
proper pear call
Revision Changes Path
1.18 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.17&r2=1.18
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- php-pear-r1.eclass 1 Sep 2007 15:58:17 -0000 1.17
+++ php-pear-r1.eclass 22 Oct 2007 22:55:04 -0000 1.18
@@ -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-r1.eclass,v 1.17 2007/09/01 15:58:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.18 2007/10/22 22:55:04 jokey Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -17,7 +17,7 @@
EXPORT_FUNCTIONS src_install
-DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.4.6"
+DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.4.8"
RDEPEND="${DEPEND}"
# @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME
@@ -70,10 +70,10 @@
cd "${S}"
mv -f "${WORKDIR}/package.xml" "${S}"
- if has_version '>=dev-php/PEAR-PEAR-1.4.8' ; then
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package"
+ if [[ -f "${S}"/package2.xml ]] ; then
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package2.xml" > /dev/null || die "Unable to install PEAR package"
else
- pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package"
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package"
fi
rm -Rf "${D}/usr/share/php/.channels" \
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
@ 2007-11-08 16:07 Markus Ullmann (jokey)
0 siblings, 0 replies; 6+ messages in thread
From: Markus Ullmann (jokey) @ 2007-11-08 16:07 UTC (permalink / raw
To: gentoo-commits
jokey 07/11/08 16:07:23
Modified: php-pear-r1.eclass
Log:
Make the eclass handle alpha versions as well
Revision Changes Path
1.19 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.18&r2=1.19
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- php-pear-r1.eclass 22 Oct 2007 22:55:04 -0000 1.18
+++ php-pear-r1.eclass 8 Nov 2007 16:07:22 -0000 1.19
@@ -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-r1.eclass,v 1.18 2007/10/22 22:55:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.19 2007/11/08 16:07:22 jokey Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -31,12 +31,13 @@
tmp="${tmp/_/}"
tmp="${tmp/rc/RC}"
tmp="${tmp/beta/b}"
+ tmp="${tmp/alpha/a}"
PEAR_PV="${tmp}"
}
# @ECLASS-VARIABLE: PEAR_PV
# @DESCRIPTION:
-# Set in ebuild if the eclass ${PV} mangling breaks SRC_URI for beta/rc versions
+# Set in ebuild if the eclass ${PV} mangling breaks SRC_URI for alpha/beta/rc versions
[[ -z "${PEAR_PV}" ]] && fix_PEAR_PV
PEAR_PN="${PHP_PEAR_PKG_NAME}-${PEAR_PV}"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
@ 2009-01-12 23:09 Markus Meier (maekke)
0 siblings, 0 replies; 6+ messages in thread
From: Markus Meier (maekke) @ 2009-01-12 23:09 UTC (permalink / raw
To: gentoo-commits
maekke 09/01/12 23:09:02
Modified: php-pear-r1.eclass
Log:
whitespace
Revision Changes Path
1.22 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.21&r2=1.22
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- php-pear-r1.eclass 19 Mar 2008 09:27:28 -0000 1.21
+++ php-pear-r1.eclass 12 Jan 2009 23:09:02 -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-r1.eclass,v 1.21 2008/03/19 09:27:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.22 2009/01/12 23:09:02 maekke Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -71,7 +71,7 @@
esac
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
@ 2010-02-16 4:14 Steve Dibb (beandog)
0 siblings, 0 replies; 6+ messages in thread
From: Steve Dibb (beandog) @ 2010-02-16 4:14 UTC (permalink / raw
To: gentoo-commits
beandog 10/02/16 04:14:13
Modified: php-pear-r1.eclass
Log:
Fix dependencies for new pear setup where PEAR-PEAR doesn't pull in all
deps, and dev-php/pear is new virtual
Revision Changes Path
1.23 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.22&r2=1.23
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php-pear-r1.eclass 12 Jan 2009 23:09:02 -0000 1.22
+++ php-pear-r1.eclass 16 Feb 2010 04:14:13 -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-r1.eclass,v 1.22 2009/01/12 23:09:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.23 2010/02/16 04:14:13 beandog Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -19,7 +19,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}"
# @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
@ 2010-03-31 20:37 Matti Bickel (mabi)
0 siblings, 0 replies; 6+ messages in thread
From: Matti Bickel (mabi) @ 2010-03-31 20:37 UTC (permalink / raw
To: gentoo-commits
mabi 10/03/31 20:37:56
Modified: php-pear-r1.eclass
Log:
use peardev instead of pear to avoid memory limits (bug #265413)
Revision Changes Path
1.24 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.23&r2=1.24
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- php-pear-r1.eclass 16 Feb 2010 04:14:13 -0000 1.23
+++ php-pear-r1.eclass 31 Mar 2010 20:37:56 -0000 1.24
@@ -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-r1.eclass,v 1.23 2010/02/16 04:14:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.24 2010/03/31 20:37:56 mabi Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -78,22 +78,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] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
@ 2010-07-13 23:50 Matti Bickel (mabi)
0 siblings, 0 replies; 6+ messages in thread
From: Matti Bickel (mabi) @ 2010-07-13 23:50 UTC (permalink / raw
To: gentoo-commits
mabi 10/07/13 23:50:34
Modified: php-pear-r1.eclass
Log:
remove superflous ;; from php-pear-r1.eclass
Revision Changes Path
1.26 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.25&r2=1.26
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- php-pear-r1.eclass 13 Jul 2010 23:48:47 -0000 1.25
+++ php-pear-r1.eclass 13 Jul 2010 23:50:34 -0000 1.26
@@ -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-r1.eclass,v 1.25 2010/07/13 23:48:47 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.26 2010/07/13 23:50:34 mabi Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Luca Longinotti <chtekk@gentoo.org>
@@ -60,7 +60,7 @@
addpredict /var/lib/net-snmp/
addpredict /session_mm_cli0.sem
- PHP_BIN="/usr/$(get_libdir)/php5/bin/php" ;;
+ PHP_BIN="/usr/$(get_libdir)/php5/bin/php"
cd "${S}"
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-07-13 23:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-16 4:14 [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass Steve Dibb (beandog)
-- strict thread matches above, loose matches on Subject: below --
2010-07-13 23:50 Matti Bickel (mabi)
2010-03-31 20:37 Matti Bickel (mabi)
2009-01-12 23:09 Markus Meier (maekke)
2007-11-08 16:07 Markus Ullmann (jokey)
2007-10-22 22:55 Markus Ullmann (jokey)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox