app-cdr/graveman: Fix bug #579918

Package-Manager: portage-2.3.0_rc1

4 files changed, 18 insertions, 15 deletions

diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch
index 31517d6fc782..0b0f66656aa3 100644
--- a/app-cdr/graveman/files/joliet-long.patch
+++ b/app-cdr/graveman/files/joliet-long.patch
@@ -1,5 +1,5 @@
---- src/mkisofs.c.old	2005-05-28 02:37:14.000000000 +0200
-+++ src/mkisofs.c	2005-07-11 02:10:44.000000000 +0200
+--- 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
 @@ -91,13 +91,13 @@
        }
      }
diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch
index 6be526d0c7df..5970656a3c55 100644
--- a/app-cdr/graveman/files/rename.patch
+++ b/app-cdr/graveman/files/rename.patch
@@ -1,5 +1,5 @@
---- src/callbacks.c.old	2006-05-23 17:42:48.642913000 +0200
-+++ src/callbacks.c	2006-05-23 17:42:52.553201500 +0200
+--- 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
 @@ -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 f283337b02f3..570bc8406177 100644
--- a/app-cdr/graveman/files/sox.patch
+++ b/app-cdr/graveman/files/sox.patch
@@ -1,6 +1,6 @@
 diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c
---- a/graveman-0.3.12-5/src/sox.c	2005-05-28 02:37:14.000000000 +0200
-+++ b/graveman-0.3.12-5/src/sox.c	2007-01-27 18:22:11.000000000 +0100
+--- a/src/sox.c	2005-05-28 02:37:14.000000000 +0200
++++ b/src/sox.c	2007-01-27 18:22:11.000000000 +0100
 @@ -37,7 +37,7 @@
  gboolean check_sox()
  {
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
index 374136100df0..9948eccbf52f 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-GCONF_DEBUG="no"
-
+EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
@@ -20,7 +18,7 @@ RDEPEND="
 	app-cdr/cdrdao
 	>=dev-libs/glib-2.4:2
 	>=gnome-base/libglade-2.4:2.0
-	media-libs/libmng
+	media-libs/libmng:=
 	virtual/cdrtools
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.4:2
@@ -38,18 +36,19 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
-S=${WORKDIR}/${P/_p/-}
+S="${WORKDIR}/${P/_p/-}"
 
 src_prepare() {
-	epatch \
+	eapply \
 		"${FILESDIR}"/joliet-long.patch \
 		"${FILESDIR}"/rename.patch \
 		"${FILESDIR}"/desktop-entry.patch
 
 	if use mp3 || use vorbis; then
-		epatch "${FILESDIR}"/sox.patch
+		eapply "${FILESDIR}"/sox.patch
 	fi
 
 	# Fix tests
@@ -57,6 +56,10 @@ src_prepare() {
 	echo glade/window_welcome.glade >> po/POTFILES.in
 	echo src/flac.c >> po/POTFILES.in
 
+	# Prevent m4_copy error when running aclocal
+	# m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918
+	rm m4/glib-gettext.m4 || die
+
 	eautoreconf # Needed for build only the needed translations
 	gnome2_src_prepare
 }