1 |
commit: a8d66c528bc20145a8905dd6777667204ab67e4a |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 28 10:25:31 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 28 10:26:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d66c52 |
7 |
|
8 |
app-cdr/graveman: Fix bug #579918 |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
app-cdr/graveman/files/joliet-long.patch | 4 ++-- |
13 |
app-cdr/graveman/files/rename.patch | 4 ++-- |
14 |
app-cdr/graveman/files/sox.patch | 4 ++-- |
15 |
app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild | 21 ++++++++++++--------- |
16 |
4 files changed, 18 insertions(+), 15 deletions(-) |
17 |
|
18 |
diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch |
19 |
index 31517d6..0b0f6665 100644 |
20 |
--- a/app-cdr/graveman/files/joliet-long.patch |
21 |
+++ b/app-cdr/graveman/files/joliet-long.patch |
22 |
@@ -1,5 +1,5 @@ |
23 |
---- src/mkisofs.c.old 2005-05-28 02:37:14.000000000 +0200 |
24 |
-+++ src/mkisofs.c 2005-07-11 02:10:44.000000000 +0200 |
25 |
+--- a/src/mkisofs.c.old 2005-05-28 02:37:14.000000000 +0200 |
26 |
++++ b/src/mkisofs.c 2005-07-11 02:10:44.000000000 +0200 |
27 |
@@ -91,13 +91,13 @@ |
28 |
} |
29 |
} |
30 |
|
31 |
diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch |
32 |
index 6be526d..5970656 100644 |
33 |
--- a/app-cdr/graveman/files/rename.patch |
34 |
+++ b/app-cdr/graveman/files/rename.patch |
35 |
@@ -1,5 +1,5 @@ |
36 |
---- src/callbacks.c.old 2006-05-23 17:42:48.642913000 +0200 |
37 |
-+++ src/callbacks.c 2006-05-23 17:42:52.553201500 +0200 |
38 |
+--- a/src/callbacks.c.old 2006-05-23 17:42:48.642913000 +0200 |
39 |
++++ b/src/callbacks.c 2006-05-23 17:42:52.553201500 +0200 |
40 |
@@ -268,7 +268,7 @@ |
41 |
|
42 |
gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1); |
43 |
|
44 |
diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch |
45 |
index f283337..570bc84 100644 |
46 |
--- a/app-cdr/graveman/files/sox.patch |
47 |
+++ b/app-cdr/graveman/files/sox.patch |
48 |
@@ -1,6 +1,6 @@ |
49 |
diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c |
50 |
---- a/graveman-0.3.12-5/src/sox.c 2005-05-28 02:37:14.000000000 +0200 |
51 |
-+++ b/graveman-0.3.12-5/src/sox.c 2007-01-27 18:22:11.000000000 +0100 |
52 |
+--- a/src/sox.c 2005-05-28 02:37:14.000000000 +0200 |
53 |
++++ b/src/sox.c 2007-01-27 18:22:11.000000000 +0100 |
54 |
@@ -37,7 +37,7 @@ |
55 |
gboolean check_sox() |
56 |
{ |
57 |
|
58 |
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild |
59 |
index 3741361..9948ecc 100644 |
60 |
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild |
61 |
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild |
62 |
@@ -1,10 +1,8 @@ |
63 |
-# Copyright 1999-2014 Gentoo Foundation |
64 |
+# Copyright 1999-2016 Gentoo Foundation |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
# $Id$ |
67 |
|
68 |
-EAPI="5" |
69 |
-GCONF_DEBUG="no" |
70 |
- |
71 |
+EAPI=6 |
72 |
inherit autotools eutils gnome2 |
73 |
|
74 |
DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2" |
75 |
@@ -20,7 +18,7 @@ RDEPEND=" |
76 |
app-cdr/cdrdao |
77 |
>=dev-libs/glib-2.4:2 |
78 |
>=gnome-base/libglade-2.4:2.0 |
79 |
- media-libs/libmng |
80 |
+ media-libs/libmng:= |
81 |
virtual/cdrtools |
82 |
x11-libs/gdk-pixbuf:2 |
83 |
>=x11-libs/gtk+-2.4:2 |
84 |
@@ -38,18 +36,19 @@ RDEPEND=" |
85 |
DEPEND="${RDEPEND} |
86 |
dev-util/intltool |
87 |
virtual/pkgconfig |
88 |
- nls? ( sys-devel/gettext )" |
89 |
+ nls? ( sys-devel/gettext ) |
90 |
+" |
91 |
|
92 |
-S=${WORKDIR}/${P/_p/-} |
93 |
+S="${WORKDIR}/${P/_p/-}" |
94 |
|
95 |
src_prepare() { |
96 |
- epatch \ |
97 |
+ eapply \ |
98 |
"${FILESDIR}"/joliet-long.patch \ |
99 |
"${FILESDIR}"/rename.patch \ |
100 |
"${FILESDIR}"/desktop-entry.patch |
101 |
|
102 |
if use mp3 || use vorbis; then |
103 |
- epatch "${FILESDIR}"/sox.patch |
104 |
+ eapply "${FILESDIR}"/sox.patch |
105 |
fi |
106 |
|
107 |
# Fix tests |
108 |
@@ -57,6 +56,10 @@ src_prepare() { |
109 |
echo glade/window_welcome.glade >> po/POTFILES.in |
110 |
echo src/flac.c >> po/POTFILES.in |
111 |
|
112 |
+ # Prevent m4_copy error when running aclocal |
113 |
+ # m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918 |
114 |
+ rm m4/glib-gettext.m4 || die |
115 |
+ |
116 |
eautoreconf # Needed for build only the needed translations |
117 |
gnome2_src_prepare |
118 |
} |