gentoo auto-resync : 02:09:2022 - 16:16:41

6 files changed, 8 insertions, 66 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6f61eeada376..8b0e3e4501cf 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 29dd941523c0..2cc5ebb803b1 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,4 +1,3 @@
 DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090
-EBUILD bibletime-3.0.3-r2.ebuild 1177 BLAKE2B c4439532a0737dfa783782157c3e174fbe66d74dab171bc779b0f6fee97ecd9b43dd9968f060beb5f32c791f979ef4d0320d888f40db515349cd3ece7b6609d4 SHA512 f51a7fbdd70a4cd1a735cfdb77af5ab9b1adae262d64cb1b9e6c2c86eda6d7362e48d08d8a08ed5109073cd8a98173c88f767d11c25349dfb7883b0a2077dd4d
-EBUILD bibletime-3.0.3.ebuild 1168 BLAKE2B 22689d994789740bab58092a0aad50c5e5e4a662900b80cc845e5fef488c899aadeff6dc99e1a9ba8c5b81708ec1ce054b5ec05b3e80e402bad5632cd941d5d6 SHA512 263a0bff2fe4ef3680705e809e9c3ff8e01f8832494c9e24bcbfb20f97e347cc0890c1faf9c767791f51c95ed627d2bfd6e306ce453cbe054b81960bffb3c393
+EBUILD bibletime-3.0.3-r2.ebuild 1176 BLAKE2B 08bdfb05292ea3585124507e679616dae31825cfa05901d275c339bd0a5e76a9fa44834a66c89909d0dd1092d55f66cc8a3470f4ff3e210270969c9139594b77 SHA512 c12406d49f2dd42ad6d7a225c9f25df7e9ee7693861bd75036166c6895b1da0e925c01b8a1df46fe412e5d7ad0d35cf98ea334938fbd74358695d34325776d21
 MISC metadata.xml 657 BLAKE2B d60c79c16a34ae0cbd43eb5de895cd675727712be5cc5b5a7f969a6d7e222e5cf1f1583308a2dbf3fee604f3bebdaa85ec97e94fcb0230ee856a988ad14ee175 SHA512 ce660bf9ad657a9f7409620d823655c4021492f4f9eb7f9621696600590a81a70c2e41a7e4a9ec156b3c7e75e2a427c0fa2cb183732efed5a9032fecb23664db
diff --git a/app-text/bibletime/bibletime-3.0.3-r2.ebuild b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
index 810bcbf14e96..8ab6bbf45a4a 100644
--- a/app-text/bibletime/bibletime-3.0.3-r2.ebuild
+++ b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=app-text/sword-1.8.1
 	dev-cpp/clucene
diff --git a/app-text/bibletime/bibletime-3.0.3.ebuild b/app-text/bibletime/bibletime-3.0.3.ebuild
deleted file mode 100644
index 08049be9d0ac..000000000000
--- a/app-text/bibletime/bibletime-3.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Bible-study application using the SWORD library"
-HOMEPAGE="https://bibletime.info/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=app-text/sword-1.8.1
-	dev-cpp/clucene
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/icu:=
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	net-misc/curl
-	sys-libs/zlib"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HANDBOOK_HTML=no
-		-DBUILD_HANDBOOK_PDF=no
-		-DBUILD_HOWTO_HTML=no
-		-DBUILD_HOWTO_PDF=no
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 22aec36b1789..08bf2c2438d3 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,3 @@
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1.ebuild 1437 BLAKE2B df2690179781bbc9ac32ad4bd3d2c8d258652436ad5370bd04e5d2a4a7588b7b8d3ea7491168ba98b46aaab1d40084c6814e03e757ae554f1e5efa304289f92e SHA512 bbb8800b2c6a7929f3e9fa410edbf98dc247d787c976e06a496f821ea89b75dac684d09fec86e12a5b135fb6308302ee1ca490e544130b186fc6f573d4ab4f95
+EBUILD xmlstarlet-1.6.1.ebuild 1490 BLAKE2B 21cd7c4ae62e4cc78a2c74d14d1b06da3293cfd3c11cf615b5b58724e511f718cfe33e6d6b1001beb354122386c432cef7296769a4a4c7e24e4dbedc942ec8c3 SHA512 8e0d96ce3caf405f01a37f3fb753d60b6fc387e101c8e8a0d4271ab8d96a1234d3afc3af0718197897703affce680760931fed97d12bac79b3149847a20d5f2c
 MISC metadata.xml 294 BLAKE2B 15c32d1ad62c8dc9e94ca2cd9554c9f16dd8eb26194eb24f5810202b9d0da8ab6d2638ebdc2f8c43aa6068de35616f3c29609fa85016f34839ddf46f2ec3be2b SHA512 518df7e45f852b93f924300a846be03d00c8dc9a4ad23d0f90b115e0f1fb98f7b41de45a550d05ccf290fe5cbadffb3dacb4e9d632b64996063b42b4289c80bc
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 37ed9694ee5f..a234631ef8b8 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -28,9 +28,11 @@ src_prepare() {
 	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
 	# The grep sandwich acts as a regression test so that a future
 	# version bump cannot break patching without noticing.
-	grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
-	sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
-	grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+	if [[ $(get_libdir) != lib ]]; then
+	    grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+	    sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+	    grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+	fi
 
 	eautoreconf
 }