[proaudio] [1631] more jnoise

[subversion@xxxxxxxxxxxxx]

Revision: 1631
Author:   gavlee
Date:     2010-04-11 20:57:11 +0200 (Sun, 11 Apr 2010)
Log Message:
-----------
more jnoise

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jnoise/ChangeLog
    trunk/overlays/proaudio/media-sound/jnoise/Manifest
    trunk/overlays/proaudio/media-sound/jnoise/files/jnoise-0.4.0-makefile.patch
    trunk/overlays/proaudio/media-sound/jnoise/jnoise-0.4.0.ebuild

Modified: trunk/overlays/proaudio/media-sound/jnoise/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jnoise/ChangeLog	2010-04-11 10:54:28 UTC (rev 1630)
+++ trunk/overlays/proaudio/media-sound/jnoise/ChangeLog	2010-04-11 18:57:11 UTC (rev 1631)
@@ -3,6 +3,10 @@
 # $Header: $
 
   11 Apr 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> jnoise-0.4.0.ebuild,
+  files/jnoise-0.4.0-makefile.patch:
+  simplify more, update makefile patch
+
+  11 Apr 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> jnoise-0.4.0.ebuild,
   +files/jnoise-0.4.0-makefile.patch, metadata.xml:
   patch for Makefile to work around sandbox errors, add sed tricks from
   jaaa/japa

Modified: trunk/overlays/proaudio/media-sound/jnoise/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jnoise/Manifest	2010-04-11 10:54:28 UTC (rev 1630)
+++ trunk/overlays/proaudio/media-sound/jnoise/Manifest	2010-04-11 18:57:11 UTC (rev 1631)
@@ -1,5 +1,5 @@
-AUX jnoise-0.4.0-makefile.patch 733 RMD160 82c6f69603930cc9907a6945c5d0c08b115d2fd2 SHA1 c2bb7e777b6a8687d72007400e04279a2ab7c930 SHA256 dd800e0522b98f480adaf9f7249c397db65abf47f6a454337a714effb311431f
+AUX jnoise-0.4.0-makefile.patch 1011 RMD160 0d0ea4a347bb08a7d34c761488f57147f9211961 SHA1 7368a7de422589e63d04ee44f15424dd0aece111 SHA256 fea416824e0bb2af3760b759ccbbc36f605a677f22b66bd9c25846eaa52eb680
 DIST jnoise-0.4.0.tar.bz2 11051 RMD160 d19c47192dc284e48a23e43f578311d327353c5b SHA1 d1a905f1d7345fd3a07d43254e4f5d548cfa19b4 SHA256 5d596bb4a97a3642899b8344f991f0e88c5d59dfe9b241d7182c498b19133e2a
-EBUILD jnoise-0.4.0.ebuild 864 RMD160 d2b553e635cd1f43d7fccd2173bed50ca298f303 SHA1 f4fa6b001c0848ddf0667cd5d5725e4b06d4be86 SHA256 5a4fc8dd9f88d596a904cdad7fb69387fa051fc2a5ade8eec33a8cda49dfb56c
-MISC ChangeLog 454 RMD160 dc82d3cd499c1b82f49def7fd53bc7b1f05b8dfe SHA1 1519876f5423916394626a47e1e17ad7602ac904 SHA256 1b5b32372dfecb9cff5ce995b949ec5319f97cb7b59cb7db6311873254e11ab9
+EBUILD jnoise-0.4.0.ebuild 850 RMD160 57ce5038dd192d5d5d85af9d97c1252022dd4efd SHA1 d1e6f26c1c87a5a5f13c05bb54b9a1dc96c57bee SHA256 604d176be48476ae86612f8bb48ee694b4f1e2531cc7cf11146cf7b3b7ff3e72
+MISC ChangeLog 608 RMD160 dab1674fa394adeeed1b64584d929bb2e7afd304 SHA1 10cc7736f50f035915b4f7cd592fc3de4b420fcf SHA256 2a2ce7d9fdc3012ddcb03e98885122c23791e2c3128cf02cf33466451c03ede8
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/jnoise/files/jnoise-0.4.0-makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jnoise/files/jnoise-0.4.0-makefile.patch	2010-04-11 10:54:28 UTC (rev 1630)
+++ trunk/overlays/proaudio/media-sound/jnoise/files/jnoise-0.4.0-makefile.patch	2010-04-11 18:57:11 UTC (rev 1631)
@@ -1,6 +1,16 @@
 --- Makefile.old	2010-04-10 03:53:31.000000000 +0100
-+++ Makefile	2010-04-11 02:01:12.000000000 +0100
-@@ -22,20 +22,20 @@
++++ Makefile	2010-04-11 19:41:47.000000000 +0100
+@@ -15,27 +15,28 @@
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ 
+-PREFIX = /usr/local
++CXX ?= g++
++PREFIX ?= /usr/local
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+-LIBDIR = lib$(SUFFIX)
++LIBDIR ?= lib$(SUFFIX)
+ VERSION = 0.4.0
  DISTDIR = jnoise-$(VERSION)
  CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\"
  #CPPFLAGS += -march=pentium4

Modified: trunk/overlays/proaudio/media-sound/jnoise/jnoise-0.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jnoise/jnoise-0.4.0.ebuild	2010-04-11 10:54:28 UTC (rev 1630)
+++ trunk/overlays/proaudio/media-sound/jnoise/jnoise-0.4.0.ebuild	2010-04-11 18:57:11 UTC (rev 1631)
@@ -22,8 +22,7 @@
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-makefile.patch"
-	esed_check -i -e 's@g++@\$(CXX)@g' \
-		-e '/^CPPFLAGS/ s/-O3//' "${S}/Makefile"
+	esed_check -e '/^CPPFLAGS/ s/-O3//' "${S}/Makefile"
 }
 
 src_compile() {
@@ -32,6 +31,6 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS README
 }