commit: 02ee9970c49647e271e92f538b2e1b7e495097a9 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Jul 26 19:27:09 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Jul 26 19:27:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ee9970
app-cdr/graveman: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/428070 Closes: https://bugs.gentoo.org/828899 Signed-off-by: David Seifert <soap <AT> gentoo.org> app-cdr/graveman/files/cflags.patch | 25 +++++++++++++++++++ app-cdr/graveman/files/desktop-entry.patch | 5 ++-- app-cdr/graveman/files/joliet-long.patch | 4 ++-- app-cdr/graveman/files/rename.patch | 4 ++-- app-cdr/graveman/files/sox.patch | 5 ++-- ...2_p5-r3.ebuild => graveman-0.3.12_p5-r4.ebuild} | 28 ++++++++++++---------- 6 files changed, 48 insertions(+), 23 deletions(-) diff --git a/app-cdr/graveman/files/cflags.patch b/app-cdr/graveman/files/cflags.patch new file mode 100644 index 000000000000..45df210130fa --- /dev/null +++ b/app-cdr/graveman/files/cflags.patch @@ -0,0 +1,25 @@ +--- a/configure.in ++++ b/configure.in +@@ -23,7 +23,7 @@ + + + +-AC_INIT(configure.in) ++AC_INIT(configure.ac) + AC_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + +@@ -283,13 +283,6 @@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) + +-if test "A$enable_debug" = "A"; then +- enable_debug=no +- CFLAGS="-Wall" +-else +- CFLAGS="-Wall -g" +-fi +- + dnl Ecriture des fichiers + AC_OUTPUT([ m4/Makefile + Makefile diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch index 4a683d2c84ec..e2a678af8ba0 100644 --- a/app-cdr/graveman/files/desktop-entry.patch +++ b/app-cdr/graveman/files/desktop-entry.patch @@ -1,6 +1,5 @@ -diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in ---- graveman-0.3.12-5.orig/desktop/graveman.desktop.in 2005-05-24 00:07:08.000000000 +0300 -+++ graveman-0.3.12-5/desktop/graveman.desktop.in 2008-05-10 06:33:32.000000000 +0300 +--- a/desktop/graveman.desktop.in ++++ b/desktop/graveman.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch index 0b0f66656aa3..47f6ecf04011 100644 --- a/app-cdr/graveman/files/joliet-long.patch +++ b/app-cdr/graveman/files/joliet-long.patch @@ -1,5 +1,5 @@ ---- a/src/mkisofs.c.old 2005-05-28 02:37:14.000000000 +0200 -+++ b/src/mkisofs.c 2005-07-11 02:10:44.000000000 +0200 +--- a/src/mkisofs.c ++++ b/src/mkisofs.c @@ -91,13 +91,13 @@ } } diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch index 5970656a3c55..a2410354c23e 100644 --- a/app-cdr/graveman/files/rename.patch +++ b/app-cdr/graveman/files/rename.patch @@ -1,5 +1,5 @@ ---- a/src/callbacks.c.old 2006-05-23 17:42:48.642913000 +0200 -+++ b/src/callbacks.c 2006-05-23 17:42:52.553201500 +0200 +--- a/src/callbacks.c ++++ b/src/callbacks.c @@ -268,7 +268,7 @@ gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1); diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch index 570bc8406177..d0a9b3f2fac4 100644 --- a/app-cdr/graveman/files/sox.patch +++ b/app-cdr/graveman/files/sox.patch @@ -1,6 +1,5 @@ -diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c ---- a/src/sox.c 2005-05-28 02:37:14.000000000 +0200 -+++ b/src/sox.c 2007-01-27 18:22:11.000000000 +0100 +--- a/src/sox.c ++++ b/src/sox.c @@ -37,7 +37,7 @@ gboolean check_sox() { diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild similarity index 83% rename from app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild rename to app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild index d9adf8a2b0cb..47779a863ae3 100644 --- a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild +++ b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools gnome2 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2" HOMEPAGE="http://graveman.tuxfamily.org/"; SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"; +S="${WORKDIR}/${P/_p/-}" LICENSE="GPL-2" SLOT="0" @@ -33,30 +35,30 @@ RDEPEND=" media-libs/libogg media-libs/libvorbis media-sound/sox - ) -" -DEPEND="${RDEPEND} + )" +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${P/_p/-}" + nls? ( sys-devel/gettext )" src_prepare() { eapply \ "${FILESDIR}"/joliet-long.patch \ "${FILESDIR}"/rename.patch \ - "${FILESDIR}"/desktop-entry.patch + "${FILESDIR}"/desktop-entry.patch \ + "${FILESDIR}"/cflags.patch if use mp3 || use vorbis; then eapply "${FILESDIR}"/sox.patch fi # Fix tests - echo glade/dialog_media.glade >> po/POTFILES.in - echo glade/window_welcome.glade >> po/POTFILES.in - echo src/flac.c >> po/POTFILES.in + cat <<- EOF >> po/POTFILES.in || die + glade/dialog_media.glade + glade/window_welcome.glade + src/flac.c + EOF # Prevent m4_copy error when running aclocal # m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918
