Add patch to make graveman work with >=sox-12.18, bug #156595

Package-Manager: portage-2.1.1-r2

5 files changed, 118 insertions, 5 deletions

diff --git a/app-cdr/graveman/ChangeLog b/app-cdr/graveman/ChangeLog
index 0482767ba9e0..3679f85bdd22 100644
--- a/app-cdr/graveman/ChangeLog
+++ b/app-cdr/graveman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/graveman
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/ChangeLog,v 1.40 2007/01/27 15:25:14 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/ChangeLog,v 1.41 2007/01/27 17:27:28 dertobi123 Exp $
+
+*graveman-0.3.12_p5-r1 (27 Jan 2007)
+
+  27 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> +files/sox.patch,
+  +graveman-0.3.12_p5-r1.ebuild:
+  Add patch to make graveman work with >=sox-12.18, bug #156595
 
   27 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   +files/fix-menu.patch, graveman-0.3.12_p5.ebuild:
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 157d72a89a0c..46a308a7d3d6 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -10,15 +10,23 @@ AUX rename.patch 501 RMD160 cb9466737d50974143af1ae392734fc9861c2417 SHA1 35bfd0
 MD5 c2d942c8e73483d3ea377e2839873913 files/rename.patch 501
 RMD160 cb9466737d50974143af1ae392734fc9861c2417 files/rename.patch 501
 SHA256 37e390b70c3045c5f038425077b86d51c8729101b8435384e5587373e7199ada files/rename.patch 501
+AUX sox.patch 1453 RMD160 48aa24365e41a07835aa2260350dc8ea3fac8c50 SHA1 6065d9e2c65ae31de91b15bc0d90b3241addfdb8 SHA256 3ef6207ca960b2edf86bdcb5d039c2528bf4041b64b3126a297ed4bd2af15691
+MD5 551ed3c0193f1de26727a7e3f548da46 files/sox.patch 1453
+RMD160 48aa24365e41a07835aa2260350dc8ea3fac8c50 files/sox.patch 1453
+SHA256 3ef6207ca960b2edf86bdcb5d039c2528bf4041b64b3126a297ed4bd2af15691 files/sox.patch 1453
 DIST graveman-0.3.12-5.tar.gz 962523 RMD160 86ff93ea6da0a70ea8e30fb76f4ff7a39e974c39 SHA1 ab7fda11ee22943547f085e8fef1a472ddd2f39f SHA256 c55a4b7b2bd0788f98ed39d752a38af522e8a5bce8bea45ce5455e4c3444a696
+EBUILD graveman-0.3.12_p5-r1.ebuild 1517 RMD160 282919fd54ca6527caa0cad28234ac59b4e4641c SHA1 1f4a37207eb8b4933448021fb40fd59e7a977a06 SHA256 0404abbd5b2654780abcce02d5e444de94a6036dcc1060a9a61cbfbcb71b1771
+MD5 7fad69bbf424108c364f6d7598343110 graveman-0.3.12_p5-r1.ebuild 1517
+RMD160 282919fd54ca6527caa0cad28234ac59b4e4641c graveman-0.3.12_p5-r1.ebuild 1517
+SHA256 0404abbd5b2654780abcce02d5e444de94a6036dcc1060a9a61cbfbcb71b1771 graveman-0.3.12_p5-r1.ebuild 1517
 EBUILD graveman-0.3.12_p5.ebuild 1443 RMD160 88f788f4ab96242c44c4f8f143a7415b94f35373 SHA1 348535090e13b84a612f4071c7b60a6cb4b955c4 SHA256 9e44946d45fbdd107a3d7ebb1911b2aa65e59906f75067bc92f6d99f8c90b2f8
 MD5 cecd1d0ba569a8cc4564a39f75ccc18b graveman-0.3.12_p5.ebuild 1443
 RMD160 88f788f4ab96242c44c4f8f143a7415b94f35373 graveman-0.3.12_p5.ebuild 1443
 SHA256 9e44946d45fbdd107a3d7ebb1911b2aa65e59906f75067bc92f6d99f8c90b2f8 graveman-0.3.12_p5.ebuild 1443
-MISC ChangeLog 6802 RMD160 7c874049842eb06a84e7249664dd96b7f310b010 SHA1 255a236ceb917eacd3796a057efbdff7f320638c SHA256 7948ad0a3673a20448b9eeb439d95537d1989daf6927bd02860c514b8b93111d
-MD5 694b56ce963cf4ba19ffdd2b3aa0da1e ChangeLog 6802
-RMD160 7c874049842eb06a84e7249664dd96b7f310b010 ChangeLog 6802
-SHA256 7948ad0a3673a20448b9eeb439d95537d1989daf6927bd02860c514b8b93111d ChangeLog 6802
+MISC ChangeLog 7012 RMD160 e2f4f3f3a4c2c7f19e277053af9bfc0a16770199 SHA1 e346c1356ac23e112abcb28dc8e5898e33e8ff3c SHA256 afd3f6a7e72a3da2f7bdd1901c08355c6065a369e1489d29fd3731ba1617dc5f
+MD5 633f5e1dcb357f47e99e1e6a808fe5b6 ChangeLog 7012
+RMD160 e2f4f3f3a4c2c7f19e277053af9bfc0a16770199 ChangeLog 7012
+SHA256 afd3f6a7e72a3da2f7bdd1901c08355c6065a369e1489d29fd3731ba1617dc5f ChangeLog 7012
 MISC metadata.xml 232 RMD160 82c7809cacfd18f11c4b576a4e3023061c4a5e72 SHA1 6c7f483c1ba48e1dd36d1137d77ea9d67995c0a3 SHA256 9ea89b64324f770316770d3acd44ae1dd234e1f7bb021b6a88c757f508a0eb40
 MD5 76b896dd67642ee66a4c06ec76c6f898 metadata.xml 232
 RMD160 82c7809cacfd18f11c4b576a4e3023061c4a5e72 metadata.xml 232
@@ -26,3 +34,6 @@ SHA256 9ea89b64324f770316770d3acd44ae1dd234e1f7bb021b6a88c757f508a0eb40 metadata
 MD5 6f4a6ab4936752d849c09a740960c207 files/digest-graveman-0.3.12_p5 253
 RMD160 8d9e2134aba6112fd09dda5350915a86c5ad6773 files/digest-graveman-0.3.12_p5 253
 SHA256 6e2be2bc47ce1394c7c047528b21b13228cfb0009d4ecee2bb2cc1c207cd75f6 files/digest-graveman-0.3.12_p5 253
+MD5 6f4a6ab4936752d849c09a740960c207 files/digest-graveman-0.3.12_p5-r1 253
+RMD160 8d9e2134aba6112fd09dda5350915a86c5ad6773 files/digest-graveman-0.3.12_p5-r1 253
+SHA256 6e2be2bc47ce1394c7c047528b21b13228cfb0009d4ecee2bb2cc1c207cd75f6 files/digest-graveman-0.3.12_p5-r1 253
diff --git a/app-cdr/graveman/files/digest-graveman-0.3.12_p5-r1 b/app-cdr/graveman/files/digest-graveman-0.3.12_p5-r1
new file mode 100644
index 000000000000..d99748f12cdf
--- /dev/null
+++ b/app-cdr/graveman/files/digest-graveman-0.3.12_p5-r1
@@ -0,0 +1,3 @@
+MD5 94183b71f345e405badcdf92ea04dfac graveman-0.3.12-5.tar.gz 962523
+RMD160 86ff93ea6da0a70ea8e30fb76f4ff7a39e974c39 graveman-0.3.12-5.tar.gz 962523
+SHA256 c55a4b7b2bd0788f98ed39d752a38af522e8a5bce8bea45ce5455e4c3444a696 graveman-0.3.12-5.tar.gz 962523
diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch
new file mode 100644
index 000000000000..b14517ba50a3
--- /dev/null
+++ b/app-cdr/graveman/files/sox.patch
@@ -0,0 +1,38 @@
+diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c
+--- /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c	2005-05-28 02:37:14.000000000 +0200
++++ ./src/sox.c	2007-01-27 18:22:11.000000000 +0100
+@@ -37,7 +37,7 @@
+ gboolean check_sox()
+ {
+   gchar *Lsox = conf_get_string("sox");
+-  gchar *Lcommandline, *Lerr = NULL;
++  gchar *Lcommandline, *Lerr = NULL, *Lstdout = NULL;
+   gboolean Lstatus;
+   gint Lexit = 0;
+ 
+@@ -47,12 +47,22 @@
+   if (!Lsox || !*Lsox) return FALSE;
+ 
+   Lcommandline = g_strdup_printf("%s -help", conf_get_string("sox"));
+-  Lstatus = g_spawn_command_line_sync(Lcommandline, NULL, &Lerr, &Lexit, NULL);
++  Lstatus = g_spawn_command_line_sync(Lcommandline, &Lstdout, &Lerr, &Lexit, NULL);
+   g_free(Lcommandline);
+ 
+-  GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
+-  GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  /* sox 12.17 outputs -help to stderr */ 
++  if (Lerr && strstr(Lerr, "12.17")) {
++	GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  }
++
++  /* sox 12.18 outputs -help to stdout */
++  else {
++	GsupportMp3 = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_OGG))));
++  }
+   
++  g_free(Lstdout);
+   g_free(Lerr);
+ 
+   return Lstatus;
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild
new file mode 100644
index 000000000000..d4fc12ca3a9d
--- /dev/null
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild,v 1.1 2007/01/27 17:27:28 dertobi123 Exp $
+
+inherit gnome2 eutils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dvdr flac mp3 nls vorbis"
+
+DEPEND=">=x11-libs/gtk+-2.4
+	>=dev-libs/glib-2.4
+	>=gnome-base/libglade-2.4
+	>=dev-util/intltool-0.22
+	dev-util/pkgconfig
+	flac? ( >=media-libs/flac-1.1.0 )
+	nls? ( sys-devel/gettext )
+	mp3? ( >=media-libs/libid3tag-0.15
+		>=media-libs/libmad-0.15 )
+	vorbis? ( >=media-libs/libogg-1.0
+		>=media-libs/libvorbis-1.0 )"
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	>=app-cdr/cdrdao-1.1.9
+	media-libs/libmng
+	dvdr? ( >=app-cdr/dvd+rw-tools-5.20 )
+	vorbis? ( >=media-sound/sox-12.17.0 )
+	mp3? ( >=media-sound/sox-12.17.0 )
+	nls? ( virtual/libintl )"
+
+G2CONF="${G2CONF} \
+	$(use_enable flac) \
+	$(use_enable mp3) \
+	$(use_enable vorbis ogg) \
+	$(use_enable debug)"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/joliet-long.patch
+	epatch ${FILESDIR}/rename.patch
+	epatch ${FILESDIR}/fix-menu.patch
+	if use mp3 || use vorbis; then
+		epatch ${FILESDIR}/sox.patch
+	fi
+}
+DOCS="AUTHORS ChangeLog INSTALL NEWS README* THANKS"
+USE_DESTDIR="1"