gentoo auto-resync : 30:01:2025 - 22:43:19

4 files changed, 62 insertions, 10 deletions

diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 606f01e14837..23657044f97d 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,6 +1,8 @@
+AUX easytag-2.4.3-fix-appdata.patch 355 BLAKE2B 5c6cfbc47933676967729e961befaf8ac816c90f15eeb6ba83eb9f392294ddca5ec5d73a94d903a8eea6f379ff77f7a5addacae1adcad62b5023e08f9b734e20 SHA512 33fda6ea703e10161deac5cb932c24d2eb41ca268a544726051ed6d93359541f30d73a18a9e5f78483e1d70d12c790928c7ab0811ca7bde5982a575a3ba3dccf
 AUX easytag-2.4.3-fix-build-taglib2.patch 6569 BLAKE2B a1486a91e418ca3701a4bd25c57979c07f5bf0fce69e2c4abeb72c1bf8654667cc64cc3d3920470aca2ae4ad7a37fbcb0bd8cb7ac53ed893c149ac923e940bdb SHA512 ad08cf0ed12ffecce4fe67eed05cb7850f984c7c5d66954d518f7cdb2ab0a3716d896b0fa01bd273fe92a5abe97f01d71eba17dabbae867501a7534c9150dbff
+AUX easytag-2.4.3-fix-check-id3.patch 1954 BLAKE2B 170fce00c7ebb33f183a61f59a45b47548c8770aa583454fdb42628470bcd0616e4d5738b3f5b50f1b824cba3e20606596511dd859b27548af7885f92035711f SHA512 08209028408640b1d9b14b9e00a22387e913b90bb9fd98daec3ab5a1351747123c05aa718148835596e14653d97e11ddb88a51762ad5adcf54871e0fdbdc64ea
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
 EBUILD easytag-2.4.3-r6.ebuild 1971 BLAKE2B cc41ea0cdb02a1cf520f4cdf669189c8e693c3c4f65c6954534d43a0c941e76e9b48989c96a273ed5c320aaa2b9b0e435a086606bde7036dda925308ad8ece45 SHA512 835083104b3ada76d5b62ca026407c7f35210e0ccd8980f84475446740915c98934b240ea99877bfa48365ad46ee77f83eef1b6952560ff575d765e3d4634a7c
-EBUILD easytag-2.4.3-r7.ebuild 2021 BLAKE2B 768aad5ef327739c7115f11daa009368bc84a211c3ee09d8e53d7edcc6bab94cc4f7692ecf7379cf3511e4e90f00de9a07851d51e68c43965c59c6a8ccae0f3c SHA512 45eb6fc7bf802c40a7d7eaccbcb532ae9b67a11931666c00620af7db4d1f504baf1270772b6d895490151e4fbb12e9cc8adae9ca375f120232a34603638dc1b5
+EBUILD easytag-2.4.3-r7.ebuild 1979 BLAKE2B b695bba0069c916e8c115844e6f743110bd8b4f1d86b99917fc4af5cb673a6497568fbe888de62cbc19f6aa1bac6dc5b145fa6137fb8bbf1e1b6bf1b78342df3 SHA512 b4f0fce91f5c0b58c32678816a5ea82b18df538971023bace44c2945b600585427879c4e8d6fd48cf836a8855e2f6014ca5b5991ef38a9273c657c527aa15a68
 MISC metadata.xml 422 BLAKE2B d1415eb185e22013f0567c5553c886558d812f8edaa2c817f684d6f0c1bb04d8a7fa8fd63abf929d07e9d9f181d0dd64af3c2c2c77f5769e3a718530598d9529 SHA512 438a22ec60b4e7b2061fd6d7645b4a31b537c06fec22968b86496e85f98306227ff6025eb2afd8a0dbaa57929aa78b3f7bc4631f9232f1204e8efa3d6f16e238
diff --git a/media-sound/easytag/easytag-2.4.3-r7.ebuild b/media-sound/easytag/easytag-2.4.3-r7.ebuild
index 594ad5101f03..4b8b3470b368 100644
--- a/media-sound/easytag/easytag-2.4.3-r7.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+GNOME2_EAUTORECONF="yes"
 inherit gnome2
 
 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
@@ -10,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
 # Disable nautilus support until https://gitlab.gnome.org/GNOME/easytag/-/issues/78
 # is solved
@@ -47,19 +48,21 @@ BDEPEND="
 	app-text/docbook-xml-dtd:4.4
 	app-text/yelp-tools
 	dev-util/glib-utils
+	dev-libs/appstream-glib
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.18.3.2
 	virtual/pkgconfig
 	test? (
-		dev-libs/appstream-glib
 		>=dev-util/desktop-file-utils-0.22
 	)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ogg-corruption.patch
 	"${FILESDIR}"/${P}-fix-build-taglib2.patch
+	"${FILESDIR}"/${P}-fix-check-id3.patch
+	"${FILESDIR}"/${P}-fix-appdata.patch
 )
 
 src_configure() {
@@ -77,9 +80,3 @@ src_configure() {
 		$(use_enable mp4) \
 		$(use_enable wavpack)
 }
-
-src_install() {
-	gnome2_src_install
-	# https://gitlab.gnome.org/GNOME/easytag/-/issues/82
-	mv "${ED}"/usr/share/{appdata,metainfo} || die
-}
diff --git a/media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch b/media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch
new file mode 100644
index 000000000000..e0fb19211cad
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.4.3-fix-appdata.patch
@@ -0,0 +1,11 @@
+--- a/data/easytag.appdata.xml.in
++++ b/data/easytag.appdata.xml.in
+@@ -30,4 +30,8 @@
+     </kudos>
+     <update_contact>amigadave@amigadave.com</update_contact>
+     <translation type="gettext">easytag</translation>
++    <content_rating type="oars-1.1" />
++    <releases>
++    	<release version="2.4.3" date="2016-12-05"/>
++    </releases>
+ </component>
diff --git a/media-sound/easytag/files/easytag-2.4.3-fix-check-id3.patch b/media-sound/easytag/files/easytag-2.4.3-fix-check-id3.patch
new file mode 100644
index 000000000000..f096c936a8ac
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.4.3-fix-check-id3.patch
@@ -0,0 +1,42 @@
+https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/3.patch
+From a41d48c8849aff8f6bc19ae1f449d8509c20d3ae Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Sat, 20 Jul 2019 15:42:05 +0800
+Subject: [PATCH] Use C++ linker to check for id3lib
+
+Instead of manually adding -lstdc++ to the linker command line, which
+isn't going to work if the C++ runtime library isn't provided by GCC,
+use the C++ compiler driver to link the program to avoid the need to
+figure out the name of the C++ runtime library ourselves.
+
+This fixes the check on FreeBSD, which uses Clang and LLVM libc++ by
+default.
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8d93ef65..3603da27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,7 +254,8 @@ AS_IF([test "x$have_mp3" != "xno"],
+ AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"],
+       dnl Check which libs are required by id3lib, libid3.la is fucked up
+       [LIBS_SAVE="$LIBS"
+-       AC_SEARCH_LIBS([ID3Tag_Link], ["id3" "id3 -lstdc++" "id3 -lz" "id3 -lz -lstdc++"], [have_id3lib=yes], [have_id3lib=no])
++       AC_LANG_PUSH([C++])
++       AC_SEARCH_LIBS([ID3Tag_Link], ["id3" "id3 -lz"], [have_id3lib=yes], [have_id3lib=no])
+         
+        dnl expected version for cross compiling
+        ID3LIB_MAJOR=3
+@@ -272,6 +273,7 @@ AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"],
+     fclose(output);
+     return 0;
+ ]])], [. ./conftest.id3; AC_MSG_RESULT([${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}])], [AC_MSG_ERROR([could not determine id3lib version])], [echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
++       AC_LANG_POP([C++])
+        LIBS="$LIBS_SAVE"
+        AC_DEFINE_UNQUOTED([ID3LIB_MAJOR], [$ID3LIB_MAJOR], [id3lib major version])
+        AC_DEFINE_UNQUOTED([ID3LIB_MINOR], [$ID3LIB_MINOR], [id3lib minor version])
+-- 
+GitLab
+