gentoo resync : 04.01.2022

3 files changed, 3 insertions, 71 deletions

diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index f659cb83f614..56c375a2c21b 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,6 +2,5 @@ AUX libxslt-1.1.34-CVE-2021-30560.patch 6053 BLAKE2B cbeae5b4f87a6a5872a015848b1
 AUX libxslt-1.1.34-libxml2-2.9.12.patch 4178 BLAKE2B 00dc945c2a4d50bb4a428c1ae5fe16128565d6bf8174b245c035c65281c3b1e9c798b61054b538341a2ea099fa4287be99e53c2efae67b8b43649946d6b0b643 SHA512 f688a68e7f9b005a2073722c0857dc4de786a9fb18d50065d9b5cda9bb5cc4597f3f34b4ba5448739b993dab46fb49ee22d3cd15c7c7434bb56d04dc06896e0b
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
-EBUILD libxslt-1.1.34-r1.ebuild 1895 BLAKE2B aad9987b5281f44a22887708effce2fa0a534218b972dd23ae25fda0b28a9d40bf3d82dd924bcc7e5b4cc9fd310ac991ae423298784bb4cd39a3ffe82650d23b SHA512 901f36c08011e745bfe308e4009625e732f3ed300215083e2641b7fdca542a5bb1cf943b38d11b1818ce040b8a274ee4c6add77820e9b54662dac63c5086addb
-EBUILD libxslt-1.1.34-r2.ebuild 1990 BLAKE2B f5ffe2c0fb87dca8ad11cfcfb54c96fab9824b20091644aa8c5aef9fbc99cfb76d00de62a4bcf07705003e974db0bc77b34b50fb1d71134e938fc8861bab6e9d SHA512 1652a35a87f40f51d3d9d6759e8fabb135f3e3164794fbfca8e4c551cf4290df07c258d6e962ac6f7f2a69592877ecec5214bed7dadfe804bdab92c169a34edb
+EBUILD libxslt-1.1.34-r2.ebuild 1977 BLAKE2B bc92b5ce86af6e6c83109b094e5b1e32d3eb903359f43b9e1c388de29dd44da03c813a34caabd6e5a811d67f09fca7b0385f04a313c39bdb2a7f6ce0b834e3f5 SHA512 608488b624330f72a52204b2062c12b834630c5b0665198e9b470691317e475ef24c0b772c2c550accfe30e69d9adf1dd4ea178c39ec40f1fada798ca7bbb353
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
deleted file mode 100644
index fd7981f397ae..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
-inherit libtool multilib-minimal verify-sig
-
-# Note: Please bump this in sync with dev-libs/libxml2.
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt"
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt debug examples static-libs elibc_Darwin"
-
-BDEPEND=">=virtual/pkgconfig-1
-	verify-sig? ( sec-keys/openpgp-keys-danielveillard )"
-RDEPEND="
-	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
-	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# Prefix always needs elibtoolize if not eautoreconf'd.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Python bindings were dropped as they were Python 2 only at the time
-	ECONF_SOURCE="${S}" econf \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-html-subdir=html \
-		--without-python \
-		$(use_with crypt crypto) \
-		$(use_with debug) \
-		$(use_with debug mem-debug) \
-		$(use_enable static-libs static) \
-		"$@"
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
index b13785e3e3c7..5239f0691623 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt debug examples static-libs elibc_Darwin"
+IUSE="crypt debug examples static-libs"
 
 BDEPEND=">=virtual/pkgconfig-1
 	verify-sig? ( sec-keys/openpgp-keys-danielveillard )"