gentoo resync : 29.12.2022

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 8d5ab3e37de1..18c630dff7aa 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,6 +1,4 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
-DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
-EBUILD rrdtool-bindings-1.7.2.ebuild 1384 BLAKE2B 41e25c46ee6396873c3116b2b240b03621c0de7238f49d7c84959477ab18be9b794f8778d2a6c7aa134e5182b4a7541fd17cb3af8210138eb8d7a2218e4d3e85 SHA512 a2a48c792d77dbed939d51fdb8e11e8af6e2eddd4f3ac7b44eff83a90e344b59405516c14081b7bd50789415279ad5b9c0cc6b18aab3b9092850bda392bea7c6
-EBUILD rrdtool-bindings-1.8.0.ebuild 1391 BLAKE2B 4e80ea3ec0e05b0d407d5903f4e9945f5646f4c955ae8282594098f12f593aec9b3447955b63580cbc82f6e3c5300d59725828d5a0b054730a3ac7aacf984c17 SHA512 89beef5380e9e487bd36f76745a5a5f10cbfab7a32d26b7898b3d9b2f3d55a8be46f6f632c4ba6481a5625d4f1c2669f61ae5742da6f90d34f12b4bf1e90977d
+EBUILD rrdtool-bindings-1.8.0.ebuild 1390 BLAKE2B 3e8f731fe549c68e3914254522d98c2a982cc4fb57cf9cedc1b99b3ca50fb7e8e0988a849a89cf647fcdb9c0590bb67a2534c0f5940249fb94456a8dc1086111 SHA512 fb689fea7dbf3296539bfb85c595e0fa51da4703a4e9518bfd9b67a89592a36e64e159f0ab4cacddc5422097ce82fdff3e0e3bf77dd05813a62dc4ece957d392
 MISC metadata.xml 464 BLAKE2B 9802c0c651c611515835f1b50971c4bc91b0948503ffc62ddaa67fba4ef70f4a9beee54c1de7c9e55fffb7bf97875e6ea9cf3d5fb1882a92065bd4162a0d2ede SHA512 f4b12972651c85515f2ae49fb5124dc21bcf083483ccc1be22df06d81fc17818e16c64a729a0209146688c0552346bc5474b55791871213a946b331548e1ec8d
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
deleted file mode 100644
index d52b6b98cdec..000000000000
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-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="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-RUBY_S="$MY_P"/bindings/ruby
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="graph test"
-RESTRICT="!test? ( 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="
-	${RDEPEND}
-	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
-"
-
-all_ruby_prepare() {
-	eapply -p3 "${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.8.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
index a30192a903de..9890e062684e 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
@@ -18,7 +18,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"