mark ~amd64 after applying patch from David Watzke; bug 156144

(Portage version: 2.1.2-r9)

6 files changed, 120 insertions, 2 deletions

diff --git a/media-sound/wavsplit/ChangeLog b/media-sound/wavsplit/ChangeLog
index 2efb7240649b..80207b4cd26b 100644
--- a/media-sound/wavsplit/ChangeLog
+++ b/media-sound/wavsplit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/wavsplit
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.11 2006/03/30 09:30:34 tove Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.12 2007/02/12 22:26:25 blubb Exp $
+
+*wavsplit-1.2.1-r1 (12 Feb 2007)
+
+  12 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/wavsplit-1.2.1-64bit.patch, +wavsplit-1.2.1-r1.ebuild:
+  mark ~amd64 after applying patch from David Watzke; bug 156144
 
   30 Mar 2006; Torsten Veller <tove@gentoo.org>
   +files/wavsplit-1.2.1-Makefile.patch,
diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.0 b/media-sound/wavsplit/files/digest-wavsplit-1.0
index 1f450c3200aa..c39fc8af5291 100644
--- a/media-sound/wavsplit/files/digest-wavsplit-1.0
+++ b/media-sound/wavsplit/files/digest-wavsplit-1.0
@@ -1 +1,3 @@
 MD5 f6283b46e367c8efddcaf29b31167611 wavsplit-1.0.tgz 18488
+RMD160 b49f8d13761e3e6e2c876724d702d2f150cd4310 wavsplit-1.0.tgz 18488
+SHA256 dea3f4c129fc7bbd5b958095780663ec48d5a55827346fcc452f8583857dfbaa wavsplit-1.0.tgz 18488
diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.1.0 b/media-sound/wavsplit/files/digest-wavsplit-1.1.0
index 5382ac968463..8af626606c49 100644
--- a/media-sound/wavsplit/files/digest-wavsplit-1.1.0
+++ b/media-sound/wavsplit/files/digest-wavsplit-1.1.0
@@ -1 +1,3 @@
 MD5 8bb9b7d18df841b69fc43e3ff710349d wavsplit-1.1.0.tar.gz 30848
+RMD160 e242c96b82418eca384817aa4393a80607013845 wavsplit-1.1.0.tar.gz 30848
+SHA256 51cd59881268958d5502d832bf1621b7cdb69b3c91e2bff22ee06e3ba3f3dbf3 wavsplit-1.1.0.tar.gz 30848
diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1 b/media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1
new file mode 100644
index 000000000000..d22924180fcf
--- /dev/null
+++ b/media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1
@@ -0,0 +1,3 @@
+MD5 bf204fe0b809b0ab72202f5ba14e4587 wavsplit-1.2.1.tar.gz 32246
+RMD160 374e6b5c792a30e2072cf758630178d7d981854c wavsplit-1.2.1.tar.gz 32246
+SHA256 266970b06888a9030573de07adf85c316bd0850eb663ed3a65248b6f64107e8a wavsplit-1.2.1.tar.gz 32246
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
new file mode 100644
index 000000000000..abfaf424113b
--- /dev/null
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
@@ -0,0 +1,69 @@
+--- bak/wavsplit.c	2006-11-24 17:53:36.056883000 +0100
++++ wavsplit.c	2006-11-24 17:52:38.345276250 +0100
+@@ -403,7 +403,7 @@
+   ptr += 4;                     /* we move past fmt_ */
+   memcpy (&waveformat, ptr, sizeof (WAVEFORMAT));
+ 
+-  if (waveformat.dwSize < (sizeof (WAVEFORMAT) - sizeof (u_long))) {
++  if (waveformat.dwSize < (sizeof (WAVEFORMAT) - sizeof (u_int))) {
+     fprintf (stderr, "Bad format: Bad fmt size\n");
+     return 1;
+   }
+@@ -423,7 +423,7 @@
+   }
+ 
+   ptr += 4;                     /* we move past data */
+-  memcpy (&databytes, ptr, sizeof (u_long));
++  memcpy (&databytes, ptr, sizeof (u_int));
+ 
+   struct stat stat_buf;
+ 
+@@ -446,7 +446,7 @@
+ 
+   if (verbose) {
+     printf ("Channels: %d\n", waveformat.wChannels);
+-    printf ("Samplerate: %ldHz\n", waveformat.dwSamplesPerSec);
++    printf ("Samplerate: %dHz\n", waveformat.dwSamplesPerSec);
+     printf ("Samplebits: %d\n", waveformat.wBitsPerSample);
+     printf ("Databytes: %llu\n\n", databytes);
+     printf ("Split         Hours  Mins   Seconds         Bytes         %%\n");
+--- bak/wavsplit.h	2006-11-24 17:53:36.056883000 +0100
++++ wavsplit.h	2006-11-24 17:43:58.648797250 +0100
+@@ -46,29 +46,29 @@
+ } TIMEFORMAT;
+ 
+ typedef struct {
+-  u_long dwSize;
++  u_int dwSize;
+   u_short wFormatTag;
+   u_short wChannels;
+-  u_long dwSamplesPerSec;
+-  u_long dwAvgBytesPerSec;
++  u_int dwSamplesPerSec;
++  u_int dwAvgBytesPerSec;
+   u_short wBlockAlign;
+   u_short wBitsPerSample;
+ } WAVEFORMAT;
+ 
+ typedef struct {
+   char RiffID[4];
+-  u_long RiffSize;
++  u_int RiffSize;
+   char WaveID[4];
+   char FmtID[4];
+-  u_long FmtSize;
++  u_int FmtSize;
+   u_short wFormatTag;
+   u_short nChannels;
+-  u_long nSamplesPerSec;
+-  u_long nAvgBytesPerSec;
++  u_int nSamplesPerSec;
++  u_int nAvgBytesPerSec;
+   u_short nBlockAlign;
+   u_short wBitsPerSample;
+   char DataID[4];
+-  u_long nDataBytes;
++  u_int nDataBytes;
+ } WAVE_HEADER;
+ 
+ typedef struct {
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..aa955d005f2f
--- /dev/null
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild,v 1.1 2007/02/12 22:26:25 blubb Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
+HOMEPAGE="http://sourceforge.net/projects/wavsplit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
+KEYWORDS="~amd64 -sparc ~x86"
+IUSE=""
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# remove precomplied binaries
+	rm "${S}"/{wavren,wavsplit} || die
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-large-files.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
+}
+
+src_compile(){
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+src_install() {
+	dobin wavren wavsplit || die "dobin failed"
+	doman wavren.1 wavsplit.1 || die "doman failed"
+	dodoc BUGS CHANGES CREDITS README README.wavren || die "dodoc failed"
+}
+