gentoo auto-resync : 28:03:2023 - 09:49:10

4 files changed, 33 insertions, 257 deletions

diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 189f4ede361a..1ea63f9d05a2 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,7 +1,3 @@
-DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a
-DIST hivex-1.3.21.tar.gz 1729723 BLAKE2B 16c5bad3f06e1293344c39f100596a466a93eb7db1c189bd59859434d7071102e10641bb820cf791834280c2ad79dba0df4efea9b8a84d02727bfdf13f7915d1 SHA512 e893d9fa77655540d29ef6657764f701f9cddb33d11b2bfef36ce0c2caebab92b55a32b7e1c99efbab0d53f558a44bf1c4c6f6da13daa37d568ff96d7d28f842
 DIST hivex-1.3.23.tar.gz 738076 BLAKE2B b536e1b4b930b88b4bbbf8a4434e5ed7d407409acdbe68f7da67fa8198e1813bf84e918505eca7d341f15b41daeb0bbcfc974868a68f999e26941db759557fd5 SHA512 068fe81a442c8045bf9d98f0c6b782330141d8f1e104a0f191c04a2cff25ee6396c2c4777c107d595a471eb4bcbee903400c9f7946cae036165ac201587f861e
-EBUILD hivex-1.3.20.ebuild 2237 BLAKE2B 1ca64c19ba5084e028c3e71d619c53034b6430217f11dd0e7851a272921fb29fda0872fcc9d16634ab135ae11505fc1823bb4b1b0e1f35f7f20f6cfa82e837b5 SHA512 4793a90dfdae64972eb3baf11ae3fabdf957c1e197618d742bbd71904ecb29e734712ff9cd58e36f6277500a5c448c8fb70e06945e8ee104af8b4061d8b78620
-EBUILD hivex-1.3.21.ebuild 2255 BLAKE2B 72eff57657fbab1c71ee3d650f5009b47c7db76019158d503f1082f45b63f2bddaae15ab5ba089b9f3a1ba3fb04467d3d10e98926aeca2422e5047b269e58fd4 SHA512 c9afaa984cba2867dc573fca15c09fcf7b2d0c856193975c3573d0e1922e99543ffd740e30544a3d912ab70c17e4483c67a912b2d39b417f398a4e93b85cef3c
-EBUILD hivex-1.3.23.ebuild 2369 BLAKE2B c7290373a55ba467f7efeef4ec188a2e9dc667f5038d32a4d82d7065a2c3f51f554d477f0c6024a2e3d8084a4e3e3d82c5b3f6af842466542f1ad47d95fe42c9 SHA512 c84caee08ced3a1c299eb02a77e7540ffe28bb55b2cb9d9a482e50a8646e9618007b656f0f7ff8f0dd25bd45660bb91417c4316be34249ab42d36fd51d8e0730
+EBUILD hivex-1.3.23-r1.ebuild 2827 BLAKE2B dfc7cac7ad0a4a405f54a120244b0ba1a92ab25371ac9d8660f03b7672eb704b88db861ce08a2647b1c9c0b95dd985bf1d107109f9d0343867c67563905c539e SHA512 f4e63c9b081fab5e5cda20b9471d395fd8725c3e3f28a539e09f17eda74db11c80cdf0eb5534e05a8476a642463b428804e888c89da7f5c05df70e9efe80024d
 MISC metadata.xml 249 BLAKE2B 6f4e10a8e257d2bb0d3eb8396ec0a4cf29d381ab118c8ef082dff01403cd79db12de157a1e35f0823aead216efcdcf7eab982cf326ad0fe149e9e0cabc205159 SHA512 b32d21b3e68e122d51c5c344f88095410c2b7e9cba5714579c087a2348bb45b0cb542abfec0f6902b205a60e045595c9ab5474694c1ea4bbb0610d4c5a89867f
diff --git a/app-misc/hivex/hivex-1.3.20.ebuild b/app-misc/hivex/hivex-1.3.20.ebuild
deleted file mode 100644
index 849e4597a992..000000000000
--- a/app-misc/hivex/hivex-1.3.20.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_OPTIONAL=yes
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit perl-module ruby-ng python-single-r1 strip-linguas
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="https://libguestfs.org"
-SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline +perl python test ruby"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	virtual/libiconv
-	virtual/libintl
-	ocaml? (
-		dev-lang/ocaml[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-	 )
-	perl? (
-		dev-lang/perl:=
-		dev-perl/IO-stringy
-	)
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
-	ruby? ( $(ruby_implementations_depend) )
-"
-DEPEND="${RDEPEND}
-	perl? (
-		test? (
-			dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage
-		)
-	)"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-			ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-DOCS=( README )
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
-}
-
-src_prepare() {
-	default
-	use perl && perl-module_src_prepare
-	use ruby && ruby-ng_src_prepare
-}
-
-src_configure() {
-	use ruby && ruby-ng_src_configure
-
-	if use perl; then
-		pushd perl || die
-		perl-module_src_configure
-		popd || die
-	fi
-
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		--disable-ruby
-		$(use_enable python)
-		--disable-rpath
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	use ruby && ruby-ng_src_compile
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-
-	if use python; then
-		python_optimize
-	fi
-
-	if use ruby; then
-		ruby-ng_src_install
-	fi
-
-	if use perl; then
-		perl_delete_localpod
-
-		# Workaround Build.PL for now (see libguestfs too)
-		doman "${ED}"/usr/man/man3/*
-		rm -rf "${ED}"/usr/man || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/hivex/hivex-1.3.21.ebuild b/app-misc/hivex/hivex-1.3.21.ebuild
deleted file mode 100644
index 5fef0b3050a5..000000000000
--- a/app-misc/hivex/hivex-1.3.21.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-RUBY_OPTIONAL=yes
-PYTHON_COMPAT=( python3_{9..10} )
-inherit perl-module ruby-ng python-single-r1 strip-linguas
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="https://libguestfs.org"
-SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline +perl python test ruby"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	virtual/libiconv
-	virtual/libintl
-	ocaml? (
-		dev-lang/ocaml[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-	 )
-	perl? (
-		dev-lang/perl:=
-		dev-perl/IO-stringy
-	)
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
-	ruby? ( $(ruby_implementations_depend) )
-"
-DEPEND="${RDEPEND}
-	perl? (
-		test? (
-			dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage
-		)
-	)"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-			ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-DOCS=( README )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
-}
-
-src_prepare() {
-	default
-
-	use perl && perl-module_src_prepare
-	use ruby && ruby-ng_src_prepare
-}
-
-src_configure() {
-	use ruby && ruby-ng_src_configure
-
-	if use perl; then
-		pushd perl || die
-		perl-module_src_configure
-		popd || die
-	fi
-
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		--disable-ruby
-		$(use_enable python)
-		--disable-rpath
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	use ruby && ruby-ng_src_compile
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-
-	if use python; then
-		python_optimize
-	fi
-
-	if use ruby; then
-		ruby-ng_src_install
-	fi
-
-	if use perl; then
-		perl_delete_localpod
-
-		# Workaround Build.PL for now (see libguestfs too)
-		doman "${ED}"/usr/man/man3/*
-		rm -rf "${ED}"/usr/man || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/hivex/hivex-1.3.23.ebuild b/app-misc/hivex/hivex-1.3.23-r1.ebuild
index eb478bcce09c..de92e2a9cade 100644
--- a/app-misc/hivex/hivex-1.3.23.ebuild
+++ b/app-misc/hivex/hivex-1.3.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 RUBY_OPTIONAL=yes
 PYTHON_COMPAT=( python3_{9..11} )
 inherit perl-module ruby-ng python-single-r1 strip-linguas
@@ -31,7 +31,7 @@ RDEPEND="
 		dev-perl/IO-stringy
 	)
 	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
+	readline? ( sys-libs/readline:= )
 	ruby? ( $(ruby_implementations_depend) )
 "
 DEPEND="
@@ -100,21 +100,46 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+each_ruby_configure() {
+	local myeconfargs=(
+		--without-readline
+		--disable-ocaml
+		--disable-perl
+		--enable-nls
+		--enable-ruby
+		--disable-python
+		--disable-rpath
+	)
+
+	export ac_cv_prog_RUBY="${RUBY}"
+
+	econf "${myeconfargs[@]}"
+}
+
 src_compile() {
 	default
 
 	use ruby && ruby-ng_src_compile
 }
 
+each_ruby_compile() {
+	# -C ruby deliberately omitted as we need the library itself built too
+	emake
+}
+
 src_test() {
 	emake check
 
 	local dir
-	for dir in ocaml perl python ruby ; do
+	for dir in ocaml perl python ; do
 		use ${dir} && emake -C ${dir} check
 	done
 }
 
+each_ruby_test() {
+	emake -C ruby check
+}
+
 src_install() {
 	strip-linguas -i po
 
@@ -138,3 +163,7 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 }
+
+each_ruby_install() {
+	emake -C ruby install DESTDIR="${ED}"
+}