gentoo resync : 09.07.2022

3 files changed, 2 insertions, 193 deletions

diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index e1e88728310f..6c4e211d19a6 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -2,6 +2,5 @@ AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a226
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
 AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.17.1-r100.ebuild 3925 BLAKE2B 8fcd8814a2a5fe2bd4a2e3f95b25686eb4ba952c13b0f72e054d48c79717d5466d2b434dfb97e8a908390291d04d1ba742db70064b715852a8946d9dfcdc3e88 SHA512 12c5bfed035846bbd56941c709bdc9b60cacf35e55a53bf521a51c76dd8ebafce3e21da2897d3e89cd202358c0d3a601c0ce543743130a7fbffa7726286d2c37
-EBUILD redland-bindings-1.0.17.1-r101.ebuild 3790 BLAKE2B ad5c2dd47882aad04b3e5e69538ef10d02ea7901aafce9e99fbb874a4fec88c4e28f18f9156a7a677297078f1a128206866d4506cd118ce13131d3d23ff79739 SHA512 84823b0671a03c55e23986762d6722d1cd2e4cf8ec87406dfb82cc0840d3a684a21df6c25b3b645a2faa0581ec5f851a307f0e72f72544de67e9c3ed23ab229b
+EBUILD redland-bindings-1.0.17.1-r101.ebuild 3784 BLAKE2B 5bd2a5b79c3a567387434eceff3bbc0edf0387f0a13cc0b9b00001c4cd26efafcb48b1a62c6d1962db2259616a5bb3ce93b0bd24e8fc1ead078a96d190159b20 SHA512 33e3a0fc0d04459db287559bce5dc485cf4eda8ebfd3763bc0b638b35889c7c2ca076ef48910d5cc01329606be92acec23cb4c18f4f5d7fa00b5183132c9bd5c
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
deleted file mode 100644
index e5c4cde5b39a..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby"
-PHP_EXT_NAME="redland"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PATCHES="yes"
-PHP_EXT_SKIP_PHPIZE="yes"
-
-inherit lua php-ext-source-r3 python-single-r1 autotools
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/bindings/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-linux"
-IUSE="lua perl python php ruby test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/sed
-	virtual/pkgconfig"
-
-RDEPEND=">=dev-libs/redland-1.0.14
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* dev-ruby/log4r )
-	php? (
-		php_targets_php7-2? ( dev-lang/php:7.2[-threads] )
-		php_targets_php7-3? ( dev-lang/php:7.3[-threads] )
-		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2
-	test? (
-		>=dev-libs/redland-1.0.14[berkdb]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bool.patch
-	"${FILESDIR}"/${PN}-1.0.17.1-php-config-r1.patch
-	"${FILESDIR}"/${PN}-1.0.17.1-add-PHP7-support.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# As of version 1.0.17.1, out-of-tree builds fail with:
-	# "error: redland_wrap.c: No such file or directory",
-	# have to copy the sources.
-	use lua && lua_copy_sources
-
-	use php && php-ext-source-r3_src_prepare
-}
-
-lua_src_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	econf \
-		--with-lua="${ELUA}" \
-		--without-perl \
-		--without-php \
-		--without-python \
-		--without-ruby
-
-	popd > /dev/null || die
-}
-
-src_configure() {
-	if use perl || use python || use ruby ; then
-		econf \
-			$(use_with lua) \
-			$(use_with perl) \
-			$(use_with python) \
-			--without-php \
-			$(use_with ruby)
-	fi
-
-	if use lua; then
-		lua_foreach_impl lua_src_configure
-	fi
-
-	use php && php-ext-source-r3_src_configure
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	default_src_compile
-
-	popd > /dev/null || die
-}
-
-src_compile() {
-	if use perl || use python || use ruby ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl lua_src_compile
-	fi
-
-	use php && php-ext-source-r3_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	default_src_test
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	if use perl || use python || use ruby ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl lua_src_test
-	fi
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots) ; do
-			php_init_slot_env "${slot}"
-			cd php || die
-			${PHPCLI} -v
-			${PHPCLI} -d "extension=./${PHP_EXT_NAME}.so" -f test.php || die "PHP tests for ${slot} failed!"
-			cd "${S}" || die
-		done
-	fi
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake DESTDIR="${D}" INSTALLDIRS=vendor luadir="$(lua_get_cmod_dir)" install
-
-	popd > /dev/null || die
-}
-
-src_install() {
-	if use perl || use python || use ruby ; then
-		emake DESTDIR="${D}" INSTALLDIRS=vendor install
-	fi
-
-	if use lua; then
-		lua_foreach_impl lua_src_install
-	fi
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete
-	fi
-
-	use python && python_optimize
-
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			exeinto "${EXT_DIR#$EPREFIX}"
-			doexe "php/${PHP_EXT_NAME}.so"
-		done
-
-		php-ext-source-r3_createinifiles
-	fi
-
-	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
-	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
-	einstalldocs
-}
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
index 169122ec6cd4..476340d958a1 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-linux"
 IUSE="lua perl python php ruby test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"