* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-pear-r1.eclass
@ 2012-01-18 17:50 Matti Bickel (mabi)
0 siblings, 0 replies; 3+ messages in thread
From: Matti Bickel (mabi) @ 2012-01-18 17:50 UTC (permalink / raw
To: gentoo-commits
mabi 12/01/18 17:50:58
Modified: ChangeLog php-pear-r1.eclass
Log:
remove dependency on dev-php/PEAR-PEAR-1.8.1 from php-pear-r1.eclass
Revision Changes Path
1.95 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.94&r2=1.95
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog 17 Jan 2012 16:05:59 -0000 1.94
+++ ChangeLog 18 Jan 2012 17:50:58 -0000 1.95
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.94 2012/01/17 16:05:59 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.95 2012/01/18 17:50:58 mabi Exp $
+
+ 18 Jan 2012; Matti Bickel <mabi@gentoo.org> php-pear-r1.eclass:
+ Remove dependency on long gone dev-php/PEAR-PEAR-1.8.1
17 Jan 2012; Magnus Granberg <zorry@gentoo.org> toolchain.eclass:
Add HARD_CFLAGS to ALL_CXXFLAGS for hardened gcc 4.7
1.29 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.28&r2=1.29
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- php-pear-r1.eclass 22 Aug 2011 04:46:32 -0000 1.28
+++ php-pear-r1.eclass 18 Jan 2012 17:50:58 -0000 1.29
@@ -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-r1.eclass,v 1.28 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.29 2012/01/18 17:50:58 mabi Exp $
# @ECLASS: php-pear-r1.eclass
# @MAINTAINER:
@@ -20,8 +20,7 @@
EXPORT_FUNCTIONS 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.8.1"
RDEPEND="${DEPEND}"
# @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-pear-r1.eclass
@ 2013-11-25 23:11 Matti Bickel (mabi)
0 siblings, 0 replies; 3+ messages in thread
From: Matti Bickel (mabi) @ 2013-11-25 23:11 UTC (permalink / raw
To: gentoo-commits
mabi 13/11/25 23:11:17
Modified: ChangeLog php-pear-r1.eclass
Log:
integrate php-pear-lib-r1 into php-pear-r1 eclass
Revision Changes Path
1.1071 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1071&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1071&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1070&r2=1.1071
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -u -r1.1070 -r1.1071
--- ChangeLog 25 Nov 2013 07:06:23 -0000 1.1070
+++ ChangeLog 25 Nov 2013 23:11:16 -0000 1.1071
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1070 2013/11/25 07:06:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1071 2013/11/25 23:11:16 mabi Exp $
+
+ 26 Nov 2013; Matti Bickel <mabi@gentoo.org> php-pear-r1.eclass:
+ Merge pkg_setup from php-pear-lib-r1.eclass and generify so that php-pear-r1
+ can handle everything php-pear-lib-r1 can.
25 Nov 2013; Steve Arnold <nerdboy@gentoo.org> gnatbuild.eclass:
Symlink fix should be good back to 4.4 (see bug #363839).
1.31 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.30&r2=1.31
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- php-pear-r1.eclass 22 Aug 2012 15:06:20 -0000 1.30
+++ php-pear-r1.eclass 25 Nov 2013 23:11:16 -0000 1.31
@@ -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-r1.eclass,v 1.30 2012/08/22 15:06:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.31 2013/11/25 23:11:16 mabi Exp $
# @ECLASS: php-pear-r1.eclass
# @MAINTAINER:
@@ -44,12 +44,26 @@
[[ -z "${PEAR_PV}" ]] && fix_PEAR_PV
PEAR_PN="${PHP_PEAR_PKG_NAME}-${PEAR_PV}"
+: ${PHP_PEAR_URI:=pear.php.net}
-[[ -z "${SRC_URI}" ]] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz"
-[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}"
+[[ -z "${SRC_URI}" ]] && SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_PN}.tgz"
+[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://${PHP_PEAR_URI}/${PHP_PEAR_PKG_NAME}"
S="${WORKDIR}/${PEAR_PN}"
+# @FUNCTION: php-pear-lib-r1_pkg_setup
+# @DESCRIPTION:
+# Adds required PEAR channel if necessary
+php-pear-r1_pkg_setup() {
+ if [[ -n $PHP_PEAR_CHANNEL ]] ; then
+ if [[ -f $PHP_PEAR_CHANNEL ]]; then
+ pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels"
+ else
+ die "PHP_PEAR_CHANNEL must point to a (local) channel file"
+ fi
+ fi
+}
+
# @FUNCTION: php-pear-r1_src_install
# @DESCRIPTION:
# Takes care of standard install for PEAR packages.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-pear-r1.eclass
@ 2013-11-25 23:22 Matti Bickel (mabi)
0 siblings, 0 replies; 3+ messages in thread
From: Matti Bickel (mabi) @ 2013-11-25 23:22 UTC (permalink / raw
To: gentoo-commits
mabi 13/11/25 23:22:57
Modified: ChangeLog php-pear-r1.eclass
Log:
export pkg_setup and default PHP_PEAR_CHANNEL to ${FILESDIR}/channel.xml (all current packages set this value)
Revision Changes Path
1.1072 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1072&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1072&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1071&r2=1.1072
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1071
retrieving revision 1.1072
diff -u -r1.1071 -r1.1072
--- ChangeLog 25 Nov 2013 23:11:16 -0000 1.1071
+++ ChangeLog 25 Nov 2013 23:22:57 -0000 1.1072
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1071 2013/11/25 23:11:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1072 2013/11/25 23:22:57 mabi Exp $
+
+ 26 Nov 2013; Matti Bickel <mabi@gentoo.org> php-pear-r1.eclass:
+ export pkg_setup and default PHP_PEAR_CHANNEL to ${FILESDIR}/channel.xml (all
+ current packages set this value)
26 Nov 2013; Matti Bickel <mabi@gentoo.org> php-pear-r1.eclass:
Merge pkg_setup from php-pear-lib-r1.eclass and generify so that php-pear-r1
1.32 eclass/php-pear-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.31&r2=1.32
Index: php-pear-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- php-pear-r1.eclass 25 Nov 2013 23:11:16 -0000 1.31
+++ php-pear-r1.eclass 25 Nov 2013 23:22:57 -0000 1.32
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.31 2013/11/25 23:11:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.32 2013/11/25 23:22:57 mabi Exp $
# @ECLASS: php-pear-r1.eclass
# @MAINTAINER:
@@ -17,7 +17,7 @@
inherit multilib
-EXPORT_FUNCTIONS src_install
+EXPORT_FUNCTIONS pkg_setup src_install
DEPEND="dev-lang/php
>=dev-php/pear-1.8.1"
@@ -45,6 +45,7 @@
PEAR_PN="${PHP_PEAR_PKG_NAME}-${PEAR_PV}"
: ${PHP_PEAR_URI:=pear.php.net}
+: ${PHP_PEAR_CHANNEL:=${FILESDIR}/channel.xml}
[[ -z "${SRC_URI}" ]] && SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_PN}.tgz"
[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://${PHP_PEAR_URI}/${PHP_PEAR_PKG_NAME}"
@@ -55,12 +56,8 @@
# @DESCRIPTION:
# Adds required PEAR channel if necessary
php-pear-r1_pkg_setup() {
- if [[ -n $PHP_PEAR_CHANNEL ]] ; then
- if [[ -f $PHP_PEAR_CHANNEL ]]; then
- pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels"
- else
- die "PHP_PEAR_CHANNEL must point to a (local) channel file"
- fi
+ if [[ -f $PHP_PEAR_CHANNEL ]]; then
+ pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels"
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-25 23:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-18 17:50 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-pear-r1.eclass Matti Bickel (mabi)
-- strict thread matches above, loose matches on Subject: below --
2013-11-25 23:11 Matti Bickel (mabi)
2013-11-25 23:22 Matti Bickel (mabi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox