Respect CC and LDFLAGS wrt bug 334715. Thanks to Diego for the report. Clean ebuild.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 36 deletions

diff --git a/sci-visualization/spectromatic/ChangeLog b/sci-visualization/spectromatic/ChangeLog
index 1def9eecb7d9..aa8c8af8e307 100644
--- a/sci-visualization/spectromatic/ChangeLog
+++ b/sci-visualization/spectromatic/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/spectromatic
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/spectromatic/ChangeLog,v 1.6 2010/06/23 20:13:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/spectromatic/ChangeLog,v 1.7 2010/08/27 07:21:50 xarthisius Exp $
+
+*spectromatic-1.0-r2 (27 Aug 2010)
+
+  27 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -spectromatic-1.0-r1.ebuild, +spectromatic-1.0-r2.ebuild,
+  files/spectromatic-1.0-makefile.patch:
+  Respect CC and LDFLAGS wrt bug 334715. Thanks to Diego for the report.
+  Clean ebuild.
 
   23 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
   spectromatic-1.0.ebuild, spectromatic-1.0-r1.ebuild:
diff --git a/sci-visualization/spectromatic/Manifest b/sci-visualization/spectromatic/Manifest
index a9bbcacf1b7e..1c86c7b7a16b 100644
--- a/sci-visualization/spectromatic/Manifest
+++ b/sci-visualization/spectromatic/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX spectromatic-1.0-gentoo.diff 603 RMD160 ec538bfe07d5db5c1612e7a167e7a3befc14ea74 SHA1 334547beff15dde2429a583e937c59ea78b84f38 SHA256 f4aaf93a836b1169cea6e1069fc012e7800116f1df237579a84447864417e865
-AUX spectromatic-1.0-makefile.patch 1091 RMD160 cda4ad00a4aa44ca784d798aea3fd8ad133fa3f8 SHA1 01d7e52fecb5002231a41f6865b92567555ecfb9 SHA256 476cdde5292627a51ab8eb3746eeb5ab1cfc78ebe9621663a4c9aee60f9aa4ce
+AUX spectromatic-1.0-makefile.patch 1128 RMD160 4a71ba7bae0e178cbc43000023b7e46b64a14c45 SHA1 34232915f064cc87fee1101dc4c1c4882516acb6 SHA256 e5ff3481ccd4282c7f8b3ddd260f49589ced9c2cbfec2f2263ab773c58843dab
 AUX spectromatic-1.0-stringliteral.patch 2217 RMD160 8d78c644fa90850c3849ace2ffd6872d4ffb1f39 SHA1 1fd5d609b88e8d48bbd14a1e4c883b1f62afb29d SHA256 9f44677c651584acd5b01b25c94639d6349803a341af99fb348311433c3abd79
 DIST spectromatic_1.0-1.tar.gz 13724 RMD160 bd9294639745b1f95cc9523fe5619e7b1517c0eb SHA1 a3c571f8a03c625a3d9f26c1ad9ef8ec9035ce0e SHA256 5ed057c6c37cc7c5a6a1c8975cb0a74085baa8b18467f4643d40c0986fc45fd4
-EBUILD spectromatic-1.0-r1.ebuild 878 RMD160 bd3cce05f42db53c53d406a9c5b355d6b98a8c74 SHA1 73440b63d3c5741bb8b355d888ccde373e3e573f SHA256 4c927f4ac68a0e4fe94e7f56cc69364a58de04cc5476732f615bebb43ea1e974
+EBUILD spectromatic-1.0-r2.ebuild 798 RMD160 59fbe044e408f48da7cf122634553182c0c649da SHA1 8f6b391b6e73c82a9f38e3305c460529ae77fb50 SHA256 084429a61960e5533b84b1b53bdbbec7b548153bb968e012ac3a38a47b5660c9
 EBUILD spectromatic-1.0.ebuild 921 RMD160 29442de6cb940ab33f26929e637ca72c39f4b703 SHA1 5870b8b27cd34a5951f5f1a19d083c7c9bb12a58 SHA256 18933612a97bb4ea6895a1cc36bfe7049e80d255f1bb3dd7d656dbf41a7b857d
-MISC ChangeLog 2110 RMD160 6ac6c864e42e70b168bef62ecdb8842eb7414548 SHA1 4c6503c5bb042351fb9d948d7bb743689fa9a736 SHA256 aa96b79e00eedfc80316f933d41922787601b00c65e0e8648cf8ea7783d2b57b
+MISC ChangeLog 2393 RMD160 2bca45865027834093a931222a0ff3ca21d2801b SHA1 62005d3e6f2a1136174e943f870ccdf62ed64918 SHA256 59f83c65e0ef326399bb8ab54e30b70580621f6905dcf021e02032703bfd556f
 MISC metadata.xml 782 RMD160 8b1a3572979590ff70b3ea293d4529ec28dc2354 SHA1 c8dd1848e055fea62d2a4737c99a7d691516d51b SHA256 330bd71f2be64f790ffb5cdf585ddeb872105ab68a52a8276ad20ff4b3b206cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwibGcACgkQ1ycZbhPLE2DHegCdHmVxECmqSvUgTST+dE/5hvPg
-Ga0An0A2vOpC4tAMK3I0jy5+JNoMeHHX
-=CQ+5
------END PGP SIGNATURE-----
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
index 941cb3bd39da..6636484f876e 100644
--- a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
@@ -1,10 +1,14 @@
---- spectromatic-1.0/Makefile	2002-03-30 05:17:34.000000000 +0000
-+++ spectromatic-1.0.new/Makefile	2008-11-26 10:43:15.910065276 +0000
+Respect LDFLAGS, CFLAGS, CC  #334715
+Fix install paths
+
+--- Makefile
++++ Makefile
 @@ -1,33 +1,29 @@
  # Makefile for spectromatic
  
 -CFLAGS = -O2 -Wall 
- LIBS = -lgsl -lgslcblas -lpng -lm
+-LIBS = -lgsl -lgslcblas -lpng -lm
++LIBS = -lpng `pkg-config --libs gsl`
  DESTDIR =
  TOPLEVEL_HOME = /usr
  
@@ -23,10 +27,11 @@
 -	install -o root -g root -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/man/man1
 -
  all:	$(OBJ)
- 	$(CC) -o $(TARGET) $(OBJ) $(LIBS)
+-	$(CC) -o $(TARGET) $(OBJ) $(LIBS)
 -	strip $(TARGET)
++	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJ) $(LIBS)
 +
-+install: all
++install: $(TARGET)
 +	mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin
 +	mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1
 +	install -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin
diff --git a/sci-visualization/spectromatic/spectromatic-1.0-r1.ebuild b/sci-visualization/spectromatic/spectromatic-1.0-r2.ebuild
index b61ed6c532b8..336c2b0a81eb 100644
--- a/sci-visualization/spectromatic/spectromatic-1.0-r1.ebuild
+++ b/sci-visualization/spectromatic/spectromatic-1.0-r2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/spectromatic/spectromatic-1.0-r1.ebuild,v 1.3 2010/06/23 20:19:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/spectromatic/spectromatic-1.0-r2.ebuild,v 1.1 2010/08/27 07:21:51 xarthisius Exp $
 
-inherit eutils
+EAPI=2
 
-MY_P="spectromatic_1.0-1"
+inherit base toolchain-funcs
+
+MY_P=${PN}_${PV}-1
 
 DESCRIPTION="Generates time-frequency analysis images from wav files"
 HOMEPAGE="http://ieee.uow.edu.au/~daniel/software/spectromatic/"
@@ -14,21 +16,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="media-libs/libpng
+RDEPEND="media-libs/libpng
 	sci-libs/gsl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-stringliteral.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-stringliteral.patch" )
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
+pkg_setup() {
+	tc-export CC
 }