public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Brian Evans" <grknight@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-rrd/
Date: Wed, 17 May 2017 16:53:49 +0000 (UTC)	[thread overview]
Message-ID: <1495040009.702209cb7207c1c8c256e2b51d2daab09a153d6c.grknight@gentoo> (raw)

commit:     702209cb7207c1c8c256e2b51d2daab09a153d6c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 16:53:29 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed May 17 16:53:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=702209cb

dev-php/pecl-rrd: Revbump to add php7-1 support wrt bug 618720

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-php/pecl-rrd/pecl-rrd-1.1.3-r1.ebuild | 16 ------------
 dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild | 42 +++++++++++++++++++++++++++++++
 dev-php/pecl-rrd/pecl-rrd-2.0.1-r1.ebuild | 20 ---------------
 dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild | 42 +++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/dev-php/pecl-rrd/pecl-rrd-1.1.3-r1.ebuild b/dev-php/pecl-rrd/pecl-rrd-1.1.3-r1.ebuild
deleted file mode 100644
index 910275dbd2e..00000000000
--- a/dev-php/pecl-rrd/pecl-rrd-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-analyzer/rrdtool[graph]"
-RDEPEND="${DEPEND}"

diff --git a/dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild b/dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild
new file mode 100644
index 00000000000..ac2a4557ce6
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="php_targets_php5-6? ( net-analyzer/rrdtool[graph] )"
+RDEPEND="${DEPEND}"
+
+PDEPEND="
+	php_targets_php7-0? ( dev-php/pecl-rrd:7[php_targets_php7-0(-)] )
+	php_targets_php7-1? ( dev-php/pecl-rrd:7[php_targets_php7-1(-)] )
+"
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=()
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}

diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r1.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r1.ebuild
deleted file mode 100644
index 4501a33effc..00000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define 5.6 here to have the {,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-0"
-
-inherit php-ext-pecl-r3
-
-# But we really only build 7.0
-USE_PHP="php7-0"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-analyzer/rrdtool[graph]"
-RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"

diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
new file mode 100644
index 00000000000..08528ee02ab
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define 5.6 here to have the {,REQUIRED_}USE generated
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# But we really only build 7.0
+USE_PHP="php7-0 php7-1"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=()
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}


             reply	other threads:[~2017-05-17 16:53 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-17 16:53 Brian Evans [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-28  2:00 [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-rrd/ Conrad Kostecki
2023-12-28  2:00 Conrad Kostecki
2022-12-12 18:22 Brian Evans
2021-10-15 14:33 Thomas Deutschmann
2021-01-11 15:35 Brian Evans
2019-11-29 13:34 Thomas Deutschmann
2019-06-07 14:14 Thomas Deutschmann
2018-04-06 17:03 Brian Evans
2017-01-17 19:16 Michael Orlitzky
2016-07-14 21:03 Brian Evans
2016-06-29 16:20 Brian Evans
2016-01-14 21:35 Brian Evans

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495040009.702209cb7207c1c8c256e2b51d2daab09a153d6c.grknight@gentoo \
    --to=grknight@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox