From cdb747b791914a30c287a3a8e33d1b635e431707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jul 2022 03:08:54 +0100 Subject: gentoo auto-resync : 30:07:2022 - 03:08:54 --- media-sound/tagtool/Manifest | 5 +- .../tagtool/files/tagtool-0.12.3-QA-desktop.patch | 10 +++ .../tagtool/files/tagtool-0.12.3-autotools.patch | 88 ++++++++++++++++++++++ .../files/tagtool-0.12.3-underlinking.patch | 80 -------------------- media-sound/tagtool/tagtool-0.12.3-r1.ebuild | 51 ------------- media-sound/tagtool/tagtool-0.12.3-r2.ebuild | 49 ++++++++++++ 6 files changed, 150 insertions(+), 133 deletions(-) create mode 100644 media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch create mode 100644 media-sound/tagtool/files/tagtool-0.12.3-autotools.patch delete mode 100644 media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch delete mode 100644 media-sound/tagtool/tagtool-0.12.3-r1.ebuild create mode 100644 media-sound/tagtool/tagtool-0.12.3-r2.ebuild (limited to 'media-sound/tagtool') diff --git a/media-sound/tagtool/Manifest b/media-sound/tagtool/Manifest index 8eca902bf1ac..181642f5b1cd 100644 --- a/media-sound/tagtool/Manifest +++ b/media-sound/tagtool/Manifest @@ -1,4 +1,5 @@ -AUX tagtool-0.12.3-underlinking.patch 2714 BLAKE2B 5576cab572d24cfd30fd2ca20f057daa0aa08c82f889c0f9e2c1fad3e72527579ad24a608d80c6b6b66abb0ba26704ebb7778620bcd1159fbc80259dc6cc6707 SHA512 679754976a0bd4f8e64bce1363d74bb783265718ba7d76f5d4101df72214e740ca5e50af9bd0798230e57ec8647bb5c10f8a39b86bd57df4df52276cb59053f0 +AUX tagtool-0.12.3-QA-desktop.patch 242 BLAKE2B 1ed0f06a9508a57f88156f45897215bb4d5bc6a95f9d591f0952dde29c911ae4132d99f77ae457d5f35c3fb426045819f8aec46b892af043a4720dad866cbc1b SHA512 ea60592b98d31270897e855cfa5ea633988a9d8e4d155a421593ac08799a20efb402d574e2bd75d0dccf6e890b50224323354e7a5275119f7dadb2b0d91e237c +AUX tagtool-0.12.3-autotools.patch 2870 BLAKE2B a1c03faef377af6a3d51a5c2ffd766a4857d71b12e8ec3727f2e3ab11975f88d7e683c91ed130bfc7d35d60f0de02fb3e12df2a5d81cfcb0f3e05ac4075dde62 SHA512 ded7531f36334487c1c05ac2516077ff5e3df539bcfc3faa7513ac1668d3c601db529e74676e351dee2c9785738d4791d44a6f15183760dbe534247e98c198e1 DIST tagtool-0.12.3.tar.bz2 303743 BLAKE2B 58186540d9495d7a4d03bae2433822d20b9a578f279229ea267c17039a87f3dcc5fbbb105a6cd67e177ebd48ca2bf9af893013e4cf60b64b414de71633306697 SHA512 f32cf8ab072b9e8f52c5afd27e93f348a6d573085f71efedf81764a2d20941e580583c6536d420f25956eae84dcb6d1930229e60bc068ec7948247cfa64ff385 -EBUILD tagtool-0.12.3-r1.ebuild 1050 BLAKE2B d5b4cf9fd64da8443a5e51e3321c1d2ede479b5c9750587e7cfed433902322d88bf1e95854c217574330b4e25e45aded015d01e5dc313f9bca1d9afc8079e6fe SHA512 26c3af16b805fd21a7231bd943d8861cc3eb5053f144456a8f6859f0660a7cdea2256000e21dfe1526f2e2d474fb488666bbd5e6db6936b833c17416be565b78 +EBUILD tagtool-0.12.3-r2.ebuild 954 BLAKE2B a7a98d889735f9c790dd56106348303d3baf711f88a3a0659e7c6cfc43e7baa5850c290ba9bf071d1ed6427b4c464789a105801fecb6581eaa82c2f6442711fd SHA512 f2edc2128b211a8a75583c6a00b62339e214f8dcf643b36ec06e626d825f74eae3d53784c0fb45875af40d1973a035a9509cef9c31803d252bc97ead70ee0d5b MISC metadata.xml 331 BLAKE2B d6551557a943009e85384db344db0220d153b4a44e14d463d04da0c0e73beeceae83f4d0cca15b57e985d10fb542af494be8769137f73430f0f8105a96a8af52 SHA512 25559a24e503a70f044f7937731fb4e1003409fa9c1c0d05909388e4f630c0e0414bd94148b163130ca7bb2430c19343558b53867ee5b423532a69cb3f91f23f diff --git a/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch new file mode 100644 index 000000000000..50c290d0ee15 --- /dev/null +++ b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch @@ -0,0 +1,10 @@ +--- a/data/tagtool.desktop.in ++++ b/data/tagtool.desktop.in +@@ -3,6 +3,6 @@ + _Comment=MP3 and Ogg Vorbis tag editor + Exec=tagtool + Icon=TagTool +-Terminal=False ++Terminal=false + Type=Application + Categories=Audio;AudioVideo;AudioVideoEditing; diff --git a/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch new file mode 100644 index 000000000000..40d1f5e80441 --- /dev/null +++ b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch @@ -0,0 +1,88 @@ +* Fix underlinking issues caused by missing libm and libogg linking + https://bugs.gentoo.org/513012 +* Fix spurious test failure caused by incomplete POTFILES.in + https://bugs.gentoo.org/631236 +* In addition, fix nonidiomatic AC_ARG_ENABLE option handling. + +--- a/configure.ac ++++ b/configure.ac +@@ -13,20 +13,16 @@ + + + dnl Command line options +-AC_ARG_ENABLE(mp3, +- AC_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]), +- [enable_mp3=no; disable_mp3_reason="(disabled)"], +- [enable_mp3=yes]) +- +-AC_ARG_ENABLE(vorbis, +- AC_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]), +- [enable_vorbis=no; disable_vorbis_reason="(disabled)"], +- [enable_vorbis=yes]) ++AC_ARG_ENABLE([mp3], ++ AS_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)])) + +-if test "$enable_mp3" = "no" && test "$enable_vorbis" = "no"; then +- AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) +-fi; ++AC_ARG_ENABLE([vorbis], ++ AS_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)])) + ++dnl Test for no flags being enabled ++AS_IF([test "x$enable_mp3" != "xyes" && test "x$enable_vorbis" != "xyes" ], [ ++ AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) ++]) + + dnl Checks for programs. + AC_PROG_CC +@@ -50,6 +46,12 @@ + fi; + + ++dnl Check for libm for ceil() ++AC_SEARCH_LIBS([ceil], [m], [], [ ++ AC_MSG_ERROR([unable to find the ceil() function]) ++]) ++ ++ + dnl Check for gtk and related libraries + PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.12.0 + gtk+-2.0 >= 2.8.0 +@@ -91,6 +93,9 @@ + AC_CHECK_LIB(vorbisfile, main,, + [enable_vorbis=no; disable_vorbis_reason="(missing vorbisfile library)"]) + fi; ++if test "$enable_vorbis" = "yes"; then ++ PKG_CHECK_MODULES([OGG], [ogg]) ++fi; + + AM_CONDITIONAL(ENABLE_MP3, test "$enable_mp3" = "yes") + AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes") +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -22,3 +22,4 @@ + src/vorbis_edit.c + src/vorbis_edit_field.c + src/vorbis_file.c ++src/vcedit.c +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,7 +28,8 @@ + vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c \ + vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c \ + vcedit.h +-vorbis_cflags = -DENABLE_VORBIS ++vorbis_cflags = $(OGG_CFLAGS) -DENABLE_VORBIS ++vorbis_libs = $(OGG_LIBS) + else + vorbis_sources = + vorbis_cflags = +@@ -39,7 +40,7 @@ + ${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"' + + tagtool_LDFLAGS = -export-dynamic +-tagtool_LDADD = $(GTK_LIBS) ++tagtool_LDADD = $(GTK_LIBS) ${vorbis_libs} + + tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h \ + edit_tab.c edit_tab.h elist.c elist.h main.c math_util.c \ diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch deleted file mode 100644 index 9569ad2fbaf5..000000000000 --- a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch +++ /dev/null @@ -1,80 +0,0 @@ -Fix underlinking issues caused by missing libm and libogg linking -Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012 - -In addition, fix nonidiomatic AC_ARG_ENABLE option handling. - ---- tagtool-0.12.3/configure.ac -+++ tagtool-0.12.3/configure.ac -@@ -13,20 +13,16 @@ - - - dnl Command line options --AC_ARG_ENABLE(mp3, -- AC_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]), -- [enable_mp3=no; disable_mp3_reason="(disabled)"], -- [enable_mp3=yes]) -- --AC_ARG_ENABLE(vorbis, -- AC_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]), -- [enable_vorbis=no; disable_vorbis_reason="(disabled)"], -- [enable_vorbis=yes]) -+AC_ARG_ENABLE([mp3], -+ AS_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)])) - --if test "$enable_mp3" = "no" && test "$enable_vorbis" = "no"; then -- AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) --fi; -+AC_ARG_ENABLE([vorbis], -+ AS_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)])) - -+dnl Test for no flags being enabled -+AS_IF([test "x$enable_mp3" != "xyes" && test "x$enable_vorbis" != "xyes" ], [ -+ AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) -+]) - - dnl Checks for programs. - AC_PROG_CC -@@ -50,6 +46,12 @@ - fi; - - -+dnl Check for libm for ceil() -+AC_SEARCH_LIBS([ceil], [m], [], [ -+ AC_MSG_ERROR([unable to find the ceil() function]) -+]) -+ -+ - dnl Check for gtk and related libraries - PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.12.0 - gtk+-2.0 >= 2.8.0 -@@ -91,6 +93,9 @@ - AC_CHECK_LIB(vorbisfile, main,, - [enable_vorbis=no; disable_vorbis_reason="(missing vorbisfile library)"]) - fi; -+if test "$enable_vorbis" = "yes"; then -+ PKG_CHECK_MODULES([OGG], [ogg]) -+fi; - - AM_CONDITIONAL(ENABLE_MP3, test "$enable_mp3" = "yes") - AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes") ---- tagtool-0.12.3/src/Makefile.am -+++ tagtool-0.12.3/src/Makefile.am -@@ -28,7 +28,8 @@ - vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c \ - vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c \ - vcedit.h --vorbis_cflags = -DENABLE_VORBIS -+vorbis_cflags = $(OGG_CFLAGS) -DENABLE_VORBIS -+vorbis_libs = $(OGG_LIBS) - else - vorbis_sources = - vorbis_cflags = -@@ -39,7 +40,7 @@ - ${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"' - - tagtool_LDFLAGS = -export-dynamic --tagtool_LDADD = $(GTK_LIBS) -+tagtool_LDADD = $(GTK_LIBS) ${vorbis_libs} - - tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h \ - edit_tab.c edit_tab.h elist.c elist.h main.c math_util.c \ diff --git a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild b/media-sound/tagtool/tagtool-0.12.3-r1.ebuild deleted file mode 100644 index be7039a613eb..000000000000 --- a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger" -HOMEPAGE="https://sourceforge.net/projects/tagtool/" -SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" -IUSE="mp3 +vorbis" -REQUIRED_USE="|| ( mp3 vorbis )" - -RDEPEND="x11-libs/gtk+:2 - >=gnome-base/libglade-2.6 - mp3? ( >=media-libs/id3lib-3.8.3-r6 ) - vorbis? ( >=media-libs/libvorbis-1 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-underlinking.patch -) - -src_prepare() { - # QA fix for wrong boolean value - sed -i -e 's/Terminal=False/Terminal=false/' data/tagtool.desktop.in || die - - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable mp3) \ - $(use_enable vorbis) -} - -src_install() { - emake \ - DESTDIR="${D}" \ - GNOME_SYSCONFDIR="${D}/etc" \ - sysdir="${D}/usr/share/applets/Multimedia" \ - install - - dodoc ChangeLog NEWS README TODO THANKS -} diff --git a/media-sound/tagtool/tagtool-0.12.3-r2.ebuild b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild new file mode 100644 index 000000000000..bdd326c02eb6 --- /dev/null +++ b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger" +HOMEPAGE="https://sourceforge.net/projects/tagtool/" +SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ~sparc x86" +IUSE="mp3 +vorbis" +REQUIRED_USE="|| ( mp3 vorbis )" + +RDEPEND=" + x11-libs/gtk+:2 + >=gnome-base/libglade-2.6 + mp3? ( >=media-libs/id3lib-3.8.3-r6 ) + vorbis? ( >=media-libs/libvorbis-1 )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-QA-desktop.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable mp3) \ + $(use_enable vorbis) +} + +src_install() { + emake \ + DESTDIR="${D}" \ + GNOME_SYSCONFDIR="${ED}"/etc \ + sysdir="${ED}"/usr/share/applets/Multimedia \ + install + einstalldocs +} -- cgit v1.2.3