gentoo resync : 15.09.2019

6 files changed, 6 insertions, 125 deletions

diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index b14d40545fc0..47bb6a497bba 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,11 +1,8 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
-DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-bindings-1.6.0.ebuild 1326 BLAKE2B b266e0aa7d92ba5a38b932a093be20ec12666df06a77b923819f18e0ecfd704df6b8974f7db4bcf84cf36dfd3bbc3b93cd4043a391d3c68182442a9c06d26393 SHA512 691b98c9f70445a4b02c512c5f08e7198ab0060adba1f58b0ae8cf6cad835043d8bedea3a4a75b443b33012aedffaa3ffa27a7f7444790a518bbfd0e646ff1b9
-EBUILD rrdtool-bindings-1.7.0.ebuild 1332 BLAKE2B 6d9d813bbb0b5b9b19ab7aeed4adc5409b1f5d584b7b36fbe7e80c9231ce9cdea562907670a87985459af303de251176bfd29ee59f1a264f1dd0feacaf0837ba SHA512 67cb1d983c79dfbac0a03e3adbdeaa0706671096df31846949874733c23e498e3ceb04bbce65f372f14b32083b0fd4d61d00bee0650f851b11fd34a44a012841
-EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1338 BLAKE2B 76f06f4a5764e493a6dad34f691ef02eb7254ea9f5350ff02cee3cb3f6dbe46c85f19fb281d0a9466fcfa52e521df221f29c4c261cbe5f5cf261f233e7ddf76d SHA512 2042c9db914941a057a0c3892bc951d225fbfc3a65273651b51491f01004b55be56a05681c3e1dd60bd8f0ead27bb9a8c7e277e87f2e7d087ae7e8e6d3238f69
-EBUILD rrdtool-bindings-1.7.1.ebuild 1331 BLAKE2B 6b352bc9bb7383edcfecfc58b4498dbdd81bf1047715ec97cf8fad886273cb50c8aab98240ef71459ac1e580b3aeea87ad0acd6c15e5b98101aaf01bec697133 SHA512 aa8e63093b5cb2b82f9ac9934a66ff17df6d9605594b54fa0db6b11cf6e32183c7dcb779b67cde0019d7ca490da2dd8015f80dad727bf55f461a832cd28bfbfe
-EBUILD rrdtool-bindings-1.7.2.ebuild 1338 BLAKE2B 76f06f4a5764e493a6dad34f691ef02eb7254ea9f5350ff02cee3cb3f6dbe46c85f19fb281d0a9466fcfa52e521df221f29c4c261cbe5f5cf261f233e7ddf76d SHA512 2042c9db914941a057a0c3892bc951d225fbfc3a65273651b51491f01004b55be56a05681c3e1dd60bd8f0ead27bb9a8c7e277e87f2e7d087ae7e8e6d3238f69
+EBUILD rrdtool-bindings-1.6.0.ebuild 1338 BLAKE2B 5ed83ee43e4a5fc9247682fbe4bb2b13272d51d4a1662b26b1e7be027c5900a3c614a43ff7b99f33c044f37431959b02671b017a440f4892c02b931ecb7da529 SHA512 df6b8e95b8f1830517cf847c43d85f8ba36d0ec96e5566957dd2bc3cdeb634e3bd3a7a75c73fccc0b7d2dbcd84e5ab6248e463ecd27138441878b4f420c4b3ad
+EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1350 BLAKE2B e5caf6de91964b466709692577176cfa73a27b98588abf29fd66c868735a0933d04263db7b4e3aa7007c9c2c4d89fc8ea4d47db45fad4768f5baec110e967f91 SHA512 683a4fd3bb0081e96c0d8ccefdc6f042031cae2dfa583dde6052b668f6900195b33e529cbe61fd3789faa69498380ab33a0382522b10977e1026df34d3cdd57c
+EBUILD rrdtool-bindings-1.7.2.ebuild 1350 BLAKE2B e5caf6de91964b466709692577176cfa73a27b98588abf29fd66c868735a0933d04263db7b4e3aa7007c9c2c4d89fc8ea4d47db45fad4768f5baec110e967f91 SHA512 683a4fd3bb0081e96c0d8ccefdc6f042031cae2dfa583dde6052b668f6900195b33e529cbe61fd3789faa69498380ab33a0382522b10977e1026df34d3cdd57c
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
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 50bf714fd428..20f293c3ab7f 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 1f8d1af39fcc..000000000000
--- 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 113be286f9b9..aa652bbfc94c 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 4ed42759a6cb..000000000000
--- 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 113be286f9b9..aa652bbfc94c 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] )
 "