gentoo resync : 04.01.2022

5 files changed, 3 insertions, 146 deletions

diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 78511064525d..75afaf5f2273 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,8 +1,3 @@
-AUX libmirage-3.2.4-gcc-10.patch 1207 BLAKE2B 60104bdd6feebe1d654fe69ce7218c0134c3f28dc3b2a39cd64987ea6459c12041f23f4eb253d98ea4a15454f9ad9ea263056b2fafba794c3bd7df0055dfbade SHA512 b4aab3ea20ed4d73669d6cb911191eda0f6f509a84af803154b397809a4ba5719cb2270c32b71686a236b8362fe5dfe88fa745a00313215c06bda35d38fc38e0
-DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
-DIST libmirage-3.2.5.tar.xz 229380 BLAKE2B ee73bf8418a209633afe7b30888c851cc0f206c03413d0b8d2717bbdb6fe77f3f32e81e1210931753cf453759ff7e4af48164866ad973b3a219381cbafd3d6f6 SHA512 f1247430d428b63734ab16328c3a484acab05fa2189b5979dc0e5759812190abd38b84bacc87b68f166f77cc88c3d4e9fb64ab0d7ec24c116c08d9314dd6b75b
 DIST libmirage-3.2.6.tar.xz 229408 BLAKE2B 38402e37acf42e58fc896621cfb0f253a53b23eb8c783a900521fa8fb297fd3df8397b2f8d341e33fd7e0edcae9ac1a4e178cc9414498f27399b8e5f2a1984c5 SHA512 085ca774c047f845a61e9c1015f4b249073e72239c55dbb84c335799815cfe93b0c883c6e56cac3c0c11db009f44a6b48680c6fe6793dde63a5006cdbb627197
-EBUILD libmirage-3.2.4.ebuild 1213 BLAKE2B d43481df1f7e1150c4163b292eb9586d0df99c78aca6fa545df6ef02445413b8a728a31ba013a825fffb458434e64305dd4d4c0b43b7336e66087433cdecf584 SHA512 1f262c22797a3df1f813eb1716d568fe192b869dcb1e7ccf7c63539d0ee8686ee1e972da6f597296842fdc8278395fc8bc731b2a941b2c6ef305ef22b2dc297d
-EBUILD libmirage-3.2.5.ebuild 1166 BLAKE2B f8559131516bb8d14ca80027554e6dc97e2715ee3cf2d8757342fc89aeb2c7e1accb262864866e2f86a6863209d2c879d4c08fef63d7221f1d2d3fd538444eed SHA512 dcb7858727dbcb907a1b47251822484efe5e09ef0a3844fb53c0709c02f7d1d1614f99390cc715cfbb849f15738438ccdb6910baf1aae8a193a2366458575896
-EBUILD libmirage-3.2.6.ebuild 1168 BLAKE2B b0686f882d6e047fa4698fc3cdc8f8d72bba375b60197a74205b0534c54be5cb7593b93a020b7bde563b80d940e43a6d8e45e21e02a2c22d19d59fa7842616a6 SHA512 fca50c501372b12b4f03862533a760e6217bb15006b86c0f6a6e624bb7c6ac740eb3cde2e07076a5e22c08b31a3b33e2d532a5488b461d885413df51ba6b5f3d
+EBUILD libmirage-3.2.6.ebuild 1166 BLAKE2B a47ac0053d873cfe61a57d171ef5730d966bc9bdae90447e27368740137d0c78f6603dd31403f7b270b0396b1960c904335d8cc31ed95eea80a34b019a853e51 SHA512 63a2fa5d9e2decd70b12b34a20f08f4e9445cd54de21022871c817300438ea73230ac166daf5132ba719ace31b2a23311ddb9045dabc835fe6bcedb1d184dfc7
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch b/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch
deleted file mode 100644
index 7834e39eed7c..000000000000
--- a/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001
-From: Rok Mandeljc <rok.mandeljc@gmail.com>
-Date: Sat, 2 May 2020 17:37:34 +0200
-Subject: [PATCH] libMirage: utils.h: added missing extern specifiers
-
-The lack thereof seems to be causing errors with gcc 10 on Fedora 32.
----
- libmirage/mirage/utils.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h
-index 64611810..fc431d2f 100644
---- a/mirage/utils.h
-+++ b/mirage/utils.h
-@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c);
- gboolean mirage_helper_validate_isrc (const gchar *isrc);
- 
- /* CRC utility functions */
--guint16 *crc16_1021_lut;
--guint32 *crc32_d8018001_lut;
-+extern guint16 *crc16_1021_lut;
-+extern guint32 *crc32_d8018001_lut;
- 
- guint16 *mirage_helper_init_crc16_lut (guint16 genpoly);
- guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices);
-@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer);
- 
- 
- /* ECMA-130 Annex B sector data scrambler */
--guint8 *ecma_130_scrambler_lut;
-+extern guint8 *ecma_130_scrambler_lut;
- 
- guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void);
- 
diff --git a/dev-libs/libmirage/libmirage-3.2.4.ebuild b/dev-libs/libmirage/libmirage-3.2.4.ebuild
deleted file mode 100644
index 4aad2870f2df..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 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.bz2"
-
-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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-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.5.ebuild b/dev-libs/libmirage/libmirage-3.2.5.ebuild
deleted file mode 100644
index 6c4473dd19e2..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 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.6.ebuild b/dev-libs/libmirage/libmirage-3.2.6.ebuild
index 9625ed04c5a2..27a87fac9425 100644
--- a/dev-libs/libmirage/libmirage-3.2.6.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.6.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
@@ -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:=