Removed precompiled binaries. Respect CFLAGS, LDFLAGS, and CC.

(Portage version: 2.1_pre7-r2)

6 files changed, 81 insertions, 33 deletions

diff --git a/media-sound/wavsplit/ChangeLog b/media-sound/wavsplit/ChangeLog
index 65dc7eaa6a98..2efb7240649b 100644
--- a/media-sound/wavsplit/ChangeLog
+++ b/media-sound/wavsplit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2006/03/30 05:22:37 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.11 2006/03/30 09:30:34 tove Exp $
+
+  30 Mar 2006; Torsten Veller <tove@gentoo.org>
+  +files/wavsplit-1.2.1-Makefile.patch,
+  files/wavsplit-1.2.1-large-files.patch, wavsplit-1.2.1.ebuild:
+  Removed precompiled binaries. Respect CFLAGS, LDFLAGS, and CC.
 
   30 Mar 2006; Chris White <chriswhite@gentoo.org> wavsplit-1.2.1.ebuild:
   wavsplit-1.2.1 x86 stable bug #127679
diff --git a/media-sound/wavsplit/Manifest b/media-sound/wavsplit/Manifest
index cfb06be1a69f..80493bcb1165 100644
--- a/media-sound/wavsplit/Manifest
+++ b/media-sound/wavsplit/Manifest
@@ -1,19 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9e43c1beaa7ee8fa54faebb0c3d34a25 ChangeLog 1341
+MD5 2460e064d66bb74bdfac696bcb8aac15 ChangeLog 1560
+RMD160 57798dfe530cc8ce73e53db722be9195db2ddc50 ChangeLog 1560
+SHA256 c3d7f324fc87963add59a6990e74e2af982b02a7c9a0cec7121aa8d040b5a60a ChangeLog 1560
 MD5 614dc021dbcc9eeff1f7f30e81c6070d files/digest-wavsplit-1.0 60
+RMD160 a8891f10972061ab67e1b557bf888695a7a77241 files/digest-wavsplit-1.0 60
+SHA256 21e4f6711094141aa21d3f81ee9a9348207c7246630ae642b8b5decd7bfd193b files/digest-wavsplit-1.0 60
 MD5 db9e42a4c6a9b5af5fafcd4ad40de35b files/digest-wavsplit-1.1.0 65
-MD5 5ff77e4d417fcb0c21cfb902cac670b4 files/digest-wavsplit-1.2.1 65
-MD5 ff908f77353445c3684934789f83b42f files/wavsplit-1.2.1-large-files.patch 6730
+RMD160 271df4d2962aef053c070ea49b34b88f7c1695fe files/digest-wavsplit-1.1.0 65
+SHA256 0e78e5d553a3f085b99e9d7256817cbb324ed8664a7f718b8be24ce96ed1abdc files/digest-wavsplit-1.1.0 65
+MD5 847e1d7f35307144d9069e4c8203b46a files/digest-wavsplit-1.2.1 241
+RMD160 0b1c7ee991a4f17b4d61d4fd59d1a6b414223f0e files/digest-wavsplit-1.2.1 241
+SHA256 97e03fb1c3ba2a3bc101a25c60484992250d5890df3fa79a44f8983b0073cf5f files/digest-wavsplit-1.2.1 241
+MD5 261051ab4ccee921fce0db78a9e75a34 files/wavsplit-1.2.1-Makefile.patch 495
+RMD160 bff83202a5788ef784e77a2a0d24e7d3a687e4e1 files/wavsplit-1.2.1-Makefile.patch 495
+SHA256 969e09af86f71b9d35008ac564d1ec1818b090205fe279e57c931ddb6a3d0007 files/wavsplit-1.2.1-Makefile.patch 495
+MD5 a105da6d4cfd3db6c6061e1e64c6855e files/wavsplit-1.2.1-large-files.patch 6265
+RMD160 94addfecfd6b4341d8f435ca79f45d10ad59bc80 files/wavsplit-1.2.1-large-files.patch 6265
+SHA256 00598bfa0530ae841dedf708b802b4ee20aac3d30712ba0f556ee816fb9590e7 files/wavsplit-1.2.1-large-files.patch 6265
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 MD5 b402735415dce0755a2413b300310c4a wavsplit-1.0.ebuild 676
+RMD160 9db3575be266f4fee4c4d4274e7f7dedd908affa wavsplit-1.0.ebuild 676
+SHA256 22f4ff63fc6a62f2541f25add015727561da6349f68fe8ffb90f01ebd8f7841a wavsplit-1.0.ebuild 676
 MD5 1c33ef68829f20e3f7493e1aadbcf74d wavsplit-1.1.0.ebuild 696
-MD5 01b34565e5738a25961e21db160075a2 wavsplit-1.2.1.ebuild 791
+RMD160 2f012e0892779b002ad0d7a51524b00abfe6aa47 wavsplit-1.1.0.ebuild 696
+SHA256 f505027850424aa30decdfbaa2bef7533ddc146ca4f7ca9be9fb9f5e59aaa3aa wavsplit-1.1.0.ebuild 696
+MD5 0e2b895b5522df72216dda3efa91c969 wavsplit-1.2.1.ebuild 1020
+RMD160 3150e50d8cf95381ec2c5fd869c78b9df5775c63 wavsplit-1.2.1.ebuild 1020
+SHA256 c80e8121d378690e1c29a18296b3ed39357494a35c6e1dbfefa9d057f338dfca wavsplit-1.2.1.ebuild 1020
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEK2tiFdQwWVoAgN4RAjMRAKCxaN3ELqdWzc3unFFqFlT1IsojuACgyJfe
-6RnmEUs+HcwMXdLxJivYdKE=
-=SFA0
+iD4DBQFEK6UAV3J2n04EauwRAvOlAKC4c/wxMVfESdLdLvOzM+1bKu1h5gCY9xeb
+xvZ/Ug3FNg9a0HvEP2xstg==
+=5Vfp
 -----END PGP SIGNATURE-----
diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.2.1 b/media-sound/wavsplit/files/digest-wavsplit-1.2.1
index 9421aa70b0ee..d22924180fcf 100644
--- a/media-sound/wavsplit/files/digest-wavsplit-1.2.1
+++ b/media-sound/wavsplit/files/digest-wavsplit-1.2.1
@@ -1 +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-Makefile.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
new file mode 100644
index 000000000000..a4b35a64fefe
--- /dev/null
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
@@ -0,0 +1,23 @@
+--- Makefile.old	2006-03-30 08:54:03.000000000 +0200
++++ Makefile	2006-03-30 08:55:04.000000000 +0200
+@@ -6,16 +6,16 @@
+ version = 1.2.1
+ 
+ CC = gcc
+-CFLAGS = -Wall
+-LDFLAGS = -lm
++CFLAGS += -Wall
++LIBS = -lm
+ 
+ all: wavsplit wavren
+ 
+ wavsplit:  wavsplit.c wavsplit.h
+-	gcc $(CFLAGS) wavsplit.c $(LDFLAGS) -o $@
++	$(CC) $(CFLAGS) wavsplit.c $(LIBS) $(LDFLAGS) -o $@
+ 
+ wavren: wavren.c
+-	gcc $(CFLAGS) wavren.c -o $@
++	$(CC) $(CFLAGS) wavren.c $(LDFLAGS) -o $@
+ 
+ install:
+ 	cp wavsplit $(BIN)
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
index 87730ce997a8..ff27231be65e 100644
--- a/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
@@ -1,20 +1,16 @@
-diff -Nur wavsplit-1.2.1/Makefile /tmp/wavsplit-1.2.1/Makefile
---- wavsplit-1.2.1/Makefile	2004-11-17 23:19:17.000000000 +0100
-+++ /tmp/wavsplit-1.2.1/Makefile	2005-01-16 21:23:33.000000000 +0100
+--- Makefile	2004-11-17 23:19:17.000000000 +0100
++++ Makefile	2005-01-16 21:23:33.000000000 +0100
 @@ -6,7 +6,7 @@
  version = 1.2.1
  
  CC = gcc
--CFLAGS = -Wall
-+CFLAGS = -Wall -D_FILE_OFFSET_BITS=64
- LDFLAGS = -lm
+-CFLAGS += -Wall
++CFLAGS += -Wall -D_FILE_OFFSET_BITS=64
+ LIBS = -lm
  
  all: wavsplit wavren
-Dateien wavsplit-1.2.1/wavren und /tmp/wavsplit-1.2.1/wavren sind verschieden.
-Dateien wavsplit-1.2.1/wavsplit und /tmp/wavsplit-1.2.1/wavsplit sind verschieden.
-diff -Nur wavsplit-1.2.1/wavsplit.c /tmp/wavsplit-1.2.1/wavsplit.c
---- wavsplit-1.2.1/wavsplit.c	2004-11-17 23:19:17.000000000 +0100
-+++ /tmp/wavsplit-1.2.1/wavsplit.c	2005-01-16 22:04:39.000000000 +0100
+--- wavsplit.c	2004-11-17 23:19:17.000000000 +0100
++++ wavsplit.c	2005-01-16 22:04:39.000000000 +0100
 @@ -269,9 +269,9 @@
             timepos * split)
  {
@@ -165,9 +161,8 @@ diff -Nur wavsplit-1.2.1/wavsplit.c /tmp/wavsplit-1.2.1/wavsplit.c
  
    while (to_be_read) {
      n_read = read (ifd, buf, to_be_read);
-diff -Nur wavsplit-1.2.1/wavsplit.h /tmp/wavsplit-1.2.1/wavsplit.h
---- wavsplit-1.2.1/wavsplit.h	2004-11-17 23:19:17.000000000 +0100
-+++ /tmp/wavsplit-1.2.1/wavsplit.h	2005-01-16 21:23:33.000000000 +0100
+--- wavsplit.h	2004-11-17 23:19:17.000000000 +0100
++++ wavsplit.h	2005-01-16 21:23:33.000000000 +0100
 @@ -121,15 +121,15 @@
  static int split (unsigned int UseHours, unsigned int UseFrames,
                    unsigned int fps, unsigned int UseTrackLens,
diff --git a/media-sound/wavsplit/wavsplit-1.2.1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1.ebuild
index 17d5c2192b1a..80f6372c83af 100644
--- a/media-sound/wavsplit/wavsplit-1.2.1.ebuild
+++ b/media-sound/wavsplit/wavsplit-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.ebuild,v 1.3 2006/03/30 05:22:37 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/wavsplit-1.2.1.ebuild,v 1.4 2006/03/30 09:30:34 tove Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
 HOMEPAGE="http://sourceforge.net/projects/wavsplit/"
@@ -17,17 +17,19 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-large-files.patch
+	cd "${S}"
+	# remove precomplied binaries
+	rm "${S}"/{wavren,wavsplit} || die
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-large-files.patch
 }
 
-
-#src_compile() {
-#	emake || die
-#}
-
+src_compile(){
+	emake CC="$(tc-getCC)" || die "make failed"
+}
 src_install() {
-	dobin wavsplit wavren
-	doman wavsplit.1 wavren.1
-	dodoc BUGS CHANGES CREDITS README README.wavren
+	dobin wavren wavsplit || die "dobin failed"
+	doman wavren.1 wavsplit.1 || die "doman failed"
+	dodoc BUGS CHANGES CREDITS README README.wavren || die "dodoc failed"
 }