commit: 6d4208982d86c95b77e68f9da8126f6417b1ef85 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Sep 14 08:35:42 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Sep 14 08:40:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d420898
dev-ruby/rrdtool-bindings: DEPEND on net-analyzer/rrdtool Package-Manager: Portage-2.3.76, Repoman-2.3.17 Bug: https://bugs.gentoo.org/690318 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild | 1 + .../rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild | 60 ---------------------- .../rrdtool-bindings-1.7.1-r1.ebuild | 1 + .../rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild | 59 --------------------- .../rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild | 1 + 5 files changed, 3 insertions(+), 119 deletions(-) diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild index 50bf714fd42..20f293c3ab7 100644 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild +++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild @@ -29,6 +29,7 @@ RDEPEND=" ~net-analyzer/rrdtool-${PV}[graph=] " DEPEND=" + ${RDEPEND} test? ( ~net-analyzer/rrdtool-${PV}[graph] ) " diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild deleted file mode 100644 index 1f8d1af39fc..00000000000 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby23 ruby24 ruby25 ruby26" -RUBY_FAKEGEM_TASK_DOC="" -inherit ruby-ng - -MY_P=${P/-bindings} -MY_P=${MY_P/_/-} - -DESCRIPTION="Ruby bindings for rrdtool" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/"; -SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz" -RUBY_S="$MY_P"/bindings/ruby - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="graph test" -REQUIRED_USE="test? ( graph )" - -# Block on older versions of rrdtool that install the bindings themselves. -# requires rrd_xport which requires rrd_graph -RDEPEND=" - ~net-analyzer/rrdtool-${PV}[graph=] -" -DEPEND=" - test? ( ~net-analyzer/rrdtool-${PV}[graph] ) -" - -RUBY_PATCHES=( - "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch -) - -each_ruby_configure() { - rm ../../src/rrd_config.h || die - touch ../../src/rrd_config.h || die - - ${RUBY} extconf.rb \ - --with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die -} - -each_ruby_compile() { - emake V=1 ABS_TOP_SRCDIR="${PWD}/../.." -} - -each_ruby_test() { - if use graph; then - ${RUBY} -I. test.rb || die - fi -} - -all_ruby_install() { - dodoc CHANGES README -} - -each_ruby_install() { - DESTDIR=${D} emake install -} diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild index 113be286f9b..aa652bbfc94 100644 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild +++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild @@ -26,6 +26,7 @@ RDEPEND=" ~net-analyzer/rrdtool-${PV}[graph=] " DEPEND=" + ${RDEPEND} test? ( ~net-analyzer/rrdtool-${PV}[graph] ) " diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild deleted file mode 100644 index 4ed42759a6c..00000000000 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby23 ruby24 ruby25 ruby26" -RUBY_FAKEGEM_TASK_DOC="" -inherit ruby-ng - -MY_P=${P/-bindings} -MY_P=${MY_P/_/-} - -DESCRIPTION="Ruby bindings for rrdtool" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/"; -SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz" -RUBY_S="$MY_P"/bindings/ruby - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="graph test" -REQUIRED_USE="test? ( graph )" - -# Block on older versions of rrdtool that install the bindings themselves. -# requires rrd_xport which requires rrd_graph -RDEPEND=" - ~net-analyzer/rrdtool-${PV}[graph=] -" -DEPEND=" - test? ( ~net-analyzer/rrdtool-${PV}[graph] ) -" -RUBY_PATCHES=( - "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch -) - -each_ruby_configure() { - rm ../../src/rrd_config.h || die - touch ../../src/rrd_config.h || die - - ${RUBY} extconf.rb \ - --with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die -} - -each_ruby_compile() { - emake V=1 ABS_TOP_SRCDIR="${PWD}/../.." -} - -each_ruby_test() { - if use graph; then - ${RUBY} -I. test.rb || die - fi -} - -all_ruby_install() { - dodoc CHANGES README -} - -each_ruby_install() { - DESTDIR=${D} emake install -} diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild index 113be286f9b..aa652bbfc94 100644 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild +++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild @@ -26,6 +26,7 @@ RDEPEND=" ~net-analyzer/rrdtool-${PV}[graph=] " DEPEND=" + ${RDEPEND} test? ( ~net-analyzer/rrdtool-${PV}[graph] ) "
