[proaudio] [2701] media-plugins/njl-plugins: add patch to honour CC/CFLAGS/LDFLAGS, EAPI=5, inherit base, remove old.

[subversion@xxxxxxxxxxxxx]

Revision: 2701
Author:   gavlee
Date:     2013-04-30 02:37:36 +0200 (Tue, 30 Apr 2013)
Log Message:
-----------
media-plugins/njl-plugins: add patch to honour CC/CFLAGS/LDFLAGS, EAPI=5, inherit base, remove old.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-plugins/njl-plugins/ChangeLog
    trunk/overlays/proaudio/media-plugins/njl-plugins/Manifest
    trunk/overlays/proaudio/media-plugins/njl-plugins/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-plugins/njl-plugins/files/njl-plugins-0.2.1-Makefile.patch
    trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r2.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r1.ebuild
    trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1.ebuild

Modified: trunk/overlays/proaudio/media-plugins/njl-plugins/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/ChangeLog	2013-04-29 19:33:24 UTC (rev 2700)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/ChangeLog	2013-04-30 00:37:36 UTC (rev 2701)
@@ -1,7 +1,15 @@
 # ChangeLog for media-plugins/njl-plugins
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*njl-plugins-0.2.1-r2 (30 Apr 2013)
+
+  30 Apr 2013; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  -njl-plugins-0.2.1.ebuild, -njl-plugins-0.2.1-r1.ebuild,
+  +njl-plugins-0.2.1-r2.ebuild, +files/njl-plugins-0.2.1-Makefile.patch,
+  metadata.xml:
+  add patch to honour CC/CFLAGS/LDFLAGS, EAPI=5, inherit base, remove old.
+
   03 Mar 2011; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
   njl-plugins-0.2.1.ebuild, njl-plugins-0.2.1-r1.ebuild:
   fixup libdir

Modified: trunk/overlays/proaudio/media-plugins/njl-plugins/Manifest
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/Manifest	2013-04-29 19:33:24 UTC (rev 2700)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/Manifest	2013-04-30 00:37:36 UTC (rev 2701)
@@ -1,5 +1,5 @@
-DIST njl-plugins-0.2.1.tar.gz 19081 RMD160 c256182fa3d1e818bb93436319c862b782b23b44 SHA1 e6b659792feb831e9a6fd20ad474e75c4730cb0e SHA256 f675ac6255a4cd8ad7080d40cb11ceb4adad73859415628f90e2833aa3f9bc1b
-EBUILD njl-plugins-0.2.1-r1.ebuild 565 RMD160 602bac7b7d070eda9df0c2e0c36777b54eb944bb SHA1 9d892b4e06cd66d7d609b0afdeb6bfdac0164bf7 SHA256 2266ef1388de3688080b326a6b31510fec90bf08e3aeaa316aedaef0fa80bbfa
-EBUILD njl-plugins-0.2.1.ebuild 500 RMD160 e9ad67c1ab2c38ceebc87db52b8fda47504d4474 SHA1 caa2ec0d5f081848ae8c8e92202f0d40b44d98ce SHA256 b79ace38062d25100705781b4e8a4637ba3fe83245518b6152c6fd5b53eb3f55
-MISC ChangeLog 343 RMD160 e410cfbe59ee567ede59423c1b0d6bd415111fe1 SHA1 9d406d4d7981ad09349fc62fe075ffd27c1df532 SHA256 30469a0137b7c88637989310d6be49b2e36cb2e0724824cffc538e117add7052
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX njl-plugins-0.2.1-Makefile.patch 1095 SHA256 fae3241b87ec0ba5082d90b3bed81a7914de80ee7372bb25e10ac1c1b1cb2fa2 SHA512 52bf30c722b055ad07cc5c59e76ecf7d65ed2d9354f9e0503680783fff0db56fb146657d9aff88c048f80101a515824aa7b4bcf1164d091f50aae413af12097a WHIRLPOOL 23ec96d266c134e0513ecd223249edaea76c44303e989a9b07a0e7ab954b093b03f345d6789b20223e2a4c173182c96311514585bce3e6bd0b50a10e0816f766
+DIST njl-plugins-0.2.1.tar.gz 19081 SHA256 f675ac6255a4cd8ad7080d40cb11ceb4adad73859415628f90e2833aa3f9bc1b SHA512 d1a47030bbe09a50260d7135fffa3d37ae665abd7fabb2cafb42f046618643923b19e2ebfe6390b1e99b79013b27a24a30456b29dece8aaa4f2091796209353b WHIRLPOOL 3402332fc18d05622cbf9bffc182774dd2bacc4f2d2dfe4c68d7a9b94fc5d99929a493909496a23494e1b21b6f771c2b566c2f6373676b6a052384a2826153ca
+EBUILD njl-plugins-0.2.1-r2.ebuild 717 SHA256 ac003427c7ffab82edb83d4478d8b5ee8b1ae3dcbc740834d7af0e32111a563c SHA512 f094dc5525ec8ed4af856d4f2aaae6b70b0eafaa818a6da796f4c1a6ebca2f95823a6546fa7a2865d30ad7dbaf22515b1fdbde9d5750a94eab7bc0644179db0a WHIRLPOOL 22edda8cc0c7a49a0f6dfd17da5820a2764a0d1657d3cb383d4f5782320cd155cdb409210d741033dbd7ed1b645d36b01a52c0618af55a06877f33b6b7f5ed7d
+MISC ChangeLog 669 SHA256 2eadfcbfce0be27f47183f05faccd8ab26693fe8755e17369b010de0c7ad122d SHA512 2b211bdb876eb67df7230bb3503de7ac254dc318d3fe92e01e95f2978ad142fd000e55bfc5b60e35f8279514f9b53e174a4dcd5ad63240771d078fb6b3472570 WHIRLPOOL 1b1e30c6600b21324d7d7b827e9b0d75cadae92d3ec207657808fdacbe623b6b7a94218cbe4e0bb18fa7df9d791760072a24d92df24602d104171838df33468c
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: trunk/overlays/proaudio/media-plugins/njl-plugins/files/njl-plugins-0.2.1-Makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/files/njl-plugins-0.2.1-Makefile.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/files/njl-plugins-0.2.1-Makefile.patch	2013-04-30 00:37:36 UTC (rev 2701)
@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+index 484720f..490be42 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,3 +1,4 @@
++CC=gcc
+ 
+ ALL= noise_1921.so noise_1922.so eir_1923.so risset_1924.so
+ 
+@@ -11,13 +12,13 @@ clean:
+ 	rm $(ALL)
+ 
+ noise_1921.so: noise_1921.c
+-	gcc -Wall -shared -Xlinker -Bdynamic -O2 -fPIC -o noise_1921.so noise_1921.c -lm
++	$(CC) $(LDFLAGS) -Wall -shared -Xlinker -Bdynamic -O2 $(CFLAGS) -fPIC -o noise_1921.so noise_1921.c -lm
+ 
+ noise_1922.so: noise_1922.c
+-	gcc -Wall -shared -Xlinker -Bdynamic -O2 -fPIC -o noise_1922.so noise_1922.c -lm
++	$(CC) $(LDFLAGS) -Wall -shared -Xlinker -Bdynamic -O2 $(CFLAGS) -fPIC -o noise_1922.so noise_1922.c -lm
+ 
+ eir_1923.so: eir_1923.c
+-	gcc -Wall -shared -Xlinker -Bdynamic -O2 -fPIC -o eir_1923.so eir_1923.c -lm
++	$(CC) $(LDFLAGS) -Wall -shared -Xlinker -Bdynamic -O2 $(CFLAGS) -fPIC -o eir_1923.so eir_1923.c -lm
+ 
+ risset_1924.so: risset_1924.c
+-	gcc -Wall -shared -Xlinker -Bdynamic -O2 -fPIC -o risset_1924.so risset_1924.c -lm
++	$(CC) $(LDFLAGS) -Wall -shared -Xlinker -Bdynamic -O2 $(CFLAGS) -fPIC -o risset_1924.so risset_1924.c -lm

Modified: trunk/overlays/proaudio/media-plugins/njl-plugins/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/metadata.xml	2013-04-29 19:33:24 UTC (rev 2700)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/metadata.xml	2013-04-30 00:37:36 UTC (rev 2701)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>

Deleted: trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r1.ebuild	2013-04-29 19:33:24 UTC (rev 2700)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r1.ebuild	2013-04-30 00:37:36 UTC (rev 2701)
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib
-
-RESTRICT="mirror"
-IUSE=""
-DESCRIPTION="NJL LADSPA audio plugins/effects"
-HOMEPAGE="http://devel.tlrmx.org/audio";
-SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-libs/ladspa-sdk"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	dodoc PLUGINS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins eir_1923.so noise_1921.so noise_1922.so risset_1924.so
-}

Copied: trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r2.ebuild (from rev 2698, trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r1.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r2.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1-r2.ebuild	2013-04-30 00:37:36 UTC (rev 2701)
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit base multilib toolchain-funcs
+
+DESCRIPTION="NJL LADSPA audio plugins/effects"
+HOMEPAGE="http://devel.tlrmx.org/audio";
+SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk"
+
+S=${WORKDIR}/${PN}
+RESTRICT="mirror"
+
+DOCS=( PLUGINS README )
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_compile() {
+	base_src_make CC="$(tc-getCC)"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/ladspa
+	insopts -m0755
+	doins eir_1923.so noise_1921.so noise_1922.so risset_1924.so
+	base_src_install_docs
+}

Deleted: trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1.ebuild	2013-04-29 19:33:24 UTC (rev 2700)
+++ trunk/overlays/proaudio/media-plugins/njl-plugins/njl-plugins-0.2.1.ebuild	2013-04-30 00:37:36 UTC (rev 2701)
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib
-
-IUSE=""
-DESCRIPTION="NJL LADSPA audio plugins/effects"
-HOMEPAGE="http://devel.tlrmx.org/audio";
-SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="media-libs/ladspa-sdk"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	dodoc COPYING PLUGINS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}