gentoo auto-resync : 27:12:2023 - 19:39:54

6 files changed, 11 insertions, 57 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ddba903b3219..5a0d1bf03b45 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 6e49b9dd8976..8100d6a07ee7 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,3 @@
-DIST libmirage-3.2.6.tar.xz 229408 BLAKE2B 38402e37acf42e58fc896621cfb0f253a53b23eb8c783a900521fa8fb297fd3df8397b2f8d341e33fd7e0edcae9ac1a4e178cc9414498f27399b8e5f2a1984c5 SHA512 085ca774c047f845a61e9c1015f4b249073e72239c55dbb84c335799815cfe93b0c883c6e56cac3c0c11db009f44a6b48680c6fe6793dde63a5006cdbb627197
 DIST libmirage-3.2.7.tar.xz 229564 BLAKE2B e1e02526fcd8daec8716e0457e38be68df9e13f8609e29772c2bee080ace7e5e76112c6ffb57719144a8c9acddc942dd44e827371ffe90673cd34b0ba0f74b08 SHA512 cbb2e98dca93009c9395d1d29dc529cf4cf912b64f166c0652ee4193c83f3e93ee1f4af623f8f0903ad1d77634fe89e5c3076d138678bcb84641880e1a1d1f76
-EBUILD libmirage-3.2.6.ebuild 1166 BLAKE2B a47ac0053d873cfe61a57d171ef5730d966bc9bdae90447e27368740137d0c78f6603dd31403f7b270b0396b1960c904335d8cc31ed95eea80a34b019a853e51 SHA512 63a2fa5d9e2decd70b12b34a20f08f4e9445cd54de21022871c817300438ea73230ac166daf5132ba719ace31b2a23311ddb9045dabc835fe6bcedb1d184dfc7
-EBUILD libmirage-3.2.7.ebuild 1167 BLAKE2B 1810d046f2245b7a784daa1319656cc4f51bcf720a7df277cbb5fea90c42adbce61842cebde348a2d1334389d4b56a41d46dea6a86ff0bb2f0069648129112c5 SHA512 3fc967ae8a8efc2176533a8d52b0d02de878d75168a77e48dd7655de2f019692477afcdbd174f4c07cf796143ff8fefed2b10a7058466ce308b970aafb824f91
+EBUILD libmirage-3.2.7.ebuild 1166 BLAKE2B 6bdf2147d0210f0b3d2402e08d464da17b678dcc3084bc8e0e6f9f603b4b5bfec293a345dde10ff6e9d7ce9db0a4b78feb649151bfa32a7abbf8a39caf46dca5 SHA512 80858020e3ac94ff50e2e681c5ed8261402d5e8a681ff7f6bb37278276796102cfd9be555a6cc3f3a58d68b4a6741f14eeab5d00480d6db688451e62def73664
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/dev-libs/libmirage/libmirage-3.2.6.ebuild b/dev-libs/libmirage/libmirage-3.2.6.ebuild
deleted file mode 100644
index 27a87fac9425..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="https://cdemu.sourceforge.io"
-SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.38:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-
-DOCS=( AUTHORS README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmirage/libmirage-3.2.7.ebuild b/dev-libs/libmirage/libmirage-3.2.7.ebuild
index e6c42012c342..a634e95fadf5 100644
--- a/dev-libs/libmirage/libmirage-3.2.7.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 790b1ff628c3..a246fc223c3f 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r4.ebuild 3174 BLAKE2B 7891d84b5e952ab4daf90121fac3344ac464618fc006b8f3476955e24a27f112f8b3a17d573e6f93ada0200b3119f76aa49883dff1e93ecff7ae5825d192f9ad SHA512 d87005961f86b682f2d7300ce9cc91146aa82aa8996a87ad5823efdf569fe6e22d6954318f5f6cc7ca02b530bcc69bbc4137cf5622190a76c482c24726bf25e7
+EBUILD libtomcrypt-1.18.2-r4.ebuild 3357 BLAKE2B a31b5b7ec436da91c16f7974016cb406746e60de7910ec3823eca733512267b5b374a7d6783b4ac30ec4d9beb1b3d826925c68527f77819793cc755ec674925d SHA512 eb6a2d13590403b0756092560da2bd88a8df92bb6cae8f6176812b469a21def52e5e9642a5e893a881fb15f22255c584574d2cd231194ed221506111c50a6d47
 MISC metadata.xml 644 BLAKE2B 112aa0ed4b144bc52466f2e247814612bca0ddae22539aa4262826f5bba0c7daac8810939fff61cb3330bc6f921a606a81dae06db9200d22d722a3b6586c17e5 SHA512 2e2fcc358f5f2d0f3ae6566e1af4a5eb4dc40b8eede752bc408d0d77177c6d0540ef5c7b4ed6ca0ebd9822b3260fca3e367b59c1c52d8e7133cd0f92e2b1c957
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
index da71154a8a6b..a42911b32ece 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
@@ -28,12 +28,15 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND="
+RDEPEND="
 	gmp? ( dev-libs/gmp:= )
 	libtommath? ( dev-libs/libtommath:= )
 	tomsfastmath? ( dev-libs/tomsfastmath:= )
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	sys-devel/libtool
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-slibtool.patch
@@ -73,6 +76,9 @@ mymake() {
 		enabled_features+=( -DUSE_TFM=1 )
 	fi
 
+	# Fix cross-compiling, but allow manual overrides for slibtool, which works.
+	[[ -z ${LIBTOOL} ]] && declare -x LIBTOOL="${BASH} ${ESYSROOT}/usr/bin/libtool"
+
 	# IGNORE_SPEED=1 is needed to respect CFLAGS
 	EXTRALIBS="${extra_libs[*]}" emake \
 		CFLAGS="${CFLAGS} ${enabled_features[*]}" \