[proaudio] [1630] simplify ebuilds

[subversion@xxxxxxxxxxxxx]

Revision: 1630
Author:   evermind
Date:     2010-04-11 12:54:28 +0200 (Sun, 11 Apr 2010)
Log Message:
-----------
simplify ebuilds

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jaaa/Manifest
    trunk/overlays/proaudio/media-sound/jaaa/jaaa-0.6.0.ebuild
    trunk/overlays/proaudio/media-sound/japa/Manifest
    trunk/overlays/proaudio/media-sound/japa/japa-0.6.0.ebuild
    trunk/overlays/proaudio/media-sound/jnoise/Manifest
    trunk/overlays/proaudio/media-sound/jnoise/jnoise-0.4.0.ebuild

Modified: trunk/overlays/proaudio/media-sound/jaaa/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jaaa/Manifest	2010-04-11 01:55:24 UTC (rev 1629)
+++ trunk/overlays/proaudio/media-sound/jaaa/Manifest	2010-04-11 10:54:28 UTC (rev 1630)
@@ -1,4 +1,4 @@
 DIST jaaa-0.6.0.tar.bz2 25375 RMD160 37c2b31699d323e59850ee92f90df9978ade377e SHA1 94c82b3cbe4c9862af23c791ba48410ea8367a32 SHA256 2f04f403a60d202b1341a9e1aad895d4e1c2bede6b3ca1a5aee1b4f63e31661b
-EBUILD jaaa-0.6.0.ebuild 986 RMD160 746d592f111670063a57515fdfffe0bdb539574d SHA1 6392b3d300402dc0a229fa459c104e7e9bbc44bd SHA256 42b55fa305d9ebe8366620720d71182e11ef0b13ec3d8cb92298d9f168061fff
+EBUILD jaaa-0.6.0.ebuild 973 RMD160 4ee9e24b8ffebaeeb29cd5c1f10d53b8491624d4 SHA1 0339e4fdc8eecdb7eadd5e71ef4b91b15445e7d0 SHA256 0f1dbe71d725a99274a5611d7500972fd2cc236a6a3650ddc9d4d3f4e6bb2425
 MISC ChangeLog 314 RMD160 2aa9cb743d9c0c3e8c30eff7515b07550a92e37b SHA1 e2e109287b137f67f7b4d829c16479931475d131 SHA256 578b5c93c2d0d60c11fe076925c0e93dbeb55da59b3695dca7c848ba9e39321d
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/jaaa/jaaa-0.6.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jaaa/jaaa-0.6.0.ebuild	2010-04-11 01:55:24 UTC (rev 1629)
+++ trunk/overlays/proaudio/media-sound/jaaa/jaaa-0.6.0.ebuild	2010-04-11 10:54:28 UTC (rev 1630)
@@ -24,13 +24,12 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	esed_check -i -e 's@g++@\$(CXX) \$(LDFLAGS)@g' -e '/^CPPFLAGS/ s/-O2//' \
-		-e "/^LIBDIR/ s/lib\$(SUFFIX)/$(get_libdir)/" Makefile
+	esed_check -i -e 's@g++@\$(CXX) \$(LDFLAGS)@g' -e '/^CPPFLAGS/ s/-O2//' Makefile
 }
 
 src_compile() {
 	tc-export CC CXX
-	emake || die "emake failed"
+	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "emake failed"
 }
 
 src_install() {

Modified: trunk/overlays/proaudio/media-sound/japa/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/japa/Manifest	2010-04-11 01:55:24 UTC (rev 1629)
+++ trunk/overlays/proaudio/media-sound/japa/Manifest	2010-04-11 10:54:28 UTC (rev 1630)
@@ -2,6 +2,6 @@
 DIST japa-0.1.8-2.tar.bz2 23457 RMD160 5ab39ed77509ab409721e31ce2008f1b71272cf4 SHA1 23373bbf2bd78a6810141bee24f980118de52d09 SHA256 3d7ebb43a9adfb4c03caacee5fd0c39d3c87913153a4d2df5bc0b55487d09c23
 DIST japa-0.6.0.tar.bz2 26860 RMD160 1e581e49e7b1e056c1b6061e1e9f6d5c34ef85e2 SHA1 2d0d9d8d07086fd97a04792fd3752e238cbb30d8 SHA256 d1e8dc85099af2ff7692ea7287792fca7e3ab931026031ef5d7e1e1d9cd1de21
 EBUILD japa-0.1.8.ebuild 810 RMD160 0106e0526a6a1e753a36ba611fdcdb6e067df33a SHA1 b7b4c6f26117730471f666cb141d5c007615f67a SHA256 d8fde9d5e050d60eca9693604a4c0952f4e8b0f2659589685e18ecfb6a5eb50b
-EBUILD japa-0.6.0.ebuild 1227 RMD160 d7d9f54a806cfdd9f0d54f3142fd1bc27d88ff03 SHA1 8860a6ef208d28b18666702be1919a57da89683f SHA256 f354ce29dcff6b4354ffce51311f23fd5f075a9b18b2bcdc294e7a20ab4ba430
+EBUILD japa-0.6.0.ebuild 978 RMD160 3a4e4926f1984c91b7c8d4a50452bc431daa24cd SHA1 a46c49868787be2008e1ea2c6f2caa704f820f2f SHA256 6fddb193be0938d7f12e7348bd4d1c9aeba51996ae5950204b1dd690b735bcae
 MISC ChangeLog 534 RMD160 71fb8078f38ae66075da4a4d3b00119978c1f960 SHA1 93d5e7e97398bfb2f08b58a4d9acca14f4a98aa7 SHA256 0a3b9723585379f0df73acdcabce368fdcffb2e5a67b31a7c7afdd25b8f0c3e7
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/japa/japa-0.6.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/japa/japa-0.6.0.ebuild	2010-04-11 01:55:24 UTC (rev 1629)
+++ trunk/overlays/proaudio/media-sound/japa/japa-0.6.0.ebuild	2010-04-11 10:54:28 UTC (rev 1630)
@@ -25,19 +25,12 @@
 	cd "${S}"
 	# fixup vars
 	esed_check -i -e 's@g++@$(CXX)@g' \
-		-e '/^CPPFLAGS/ s/-O2//' \
-		-e "/^LIBDIR/ s/lib\$(SUFFIX)/$(get_libdir)/" Makefile
-
-	# fixup install 
-	esed_check -i \
-		-e '/install\:/'a'XYZ/usr/bin/install -d \$\(DESTDIR\)\$\(PREFIX\)\/bin' \
-		-e 's@\(/usr/bin/install -m 755 japa\ \)@\1$(DESTDIR)@g' Makefile
-	esed_check -i -e 's@^XYZ@\t@g' Makefile
+		-e '/^CPPFLAGS/ s/-O2//' Makefile
 }
 
 src_compile() {
 	tc-export CC CXX
-	emake PREFIX="/usr/" || die "make failed"
+	emake PREFIX="/usr/" LIBDIR="$(get_libdir)" || die "make failed"
 }
 
 src_install() {

Modified: trunk/overlays/proaudio/media-sound/jnoise/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jnoise/Manifest	2010-04-11 01:55:24 UTC (rev 1629)
+++ trunk/overlays/proaudio/media-sound/jnoise/Manifest	2010-04-11 10:54:28 UTC (rev 1630)
@@ -1,5 +1,5 @@
 AUX jnoise-0.4.0-makefile.patch 733 RMD160 82c6f69603930cc9907a6945c5d0c08b115d2fd2 SHA1 c2bb7e777b6a8687d72007400e04279a2ab7c930 SHA256 dd800e0522b98f480adaf9f7249c397db65abf47f6a454337a714effb311431f
 DIST jnoise-0.4.0.tar.bz2 11051 RMD160 d19c47192dc284e48a23e43f578311d327353c5b SHA1 d1a905f1d7345fd3a07d43254e4f5d548cfa19b4 SHA256 5d596bb4a97a3642899b8344f991f0e88c5d59dfe9b241d7182c498b19133e2a
-EBUILD jnoise-0.4.0.ebuild 907 RMD160 8488e69bef53192b9a399e2fa45a897bc526cdf7 SHA1 1bdd265c7e7511d9f438b68f71a6d909d0a406e7 SHA256 1a90833fb7669706410b92065d5a92266c3a48730283b10718d0f9190c4bea06
+EBUILD jnoise-0.4.0.ebuild 864 RMD160 d2b553e635cd1f43d7fccd2173bed50ca298f303 SHA1 f4fa6b001c0848ddf0667cd5d5725e4b06d4be86 SHA256 5a4fc8dd9f88d596a904cdad7fb69387fa051fc2a5ade8eec33a8cda49dfb56c
 MISC ChangeLog 454 RMD160 dc82d3cd499c1b82f49def7fd53bc7b1f05b8dfe SHA1 1519876f5423916394626a47e1e17ad7602ac904 SHA256 1b5b32372dfecb9cff5ce995b949ec5319f97cb7b59cb7db6311873254e11ab9
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

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 01:55:24 UTC (rev 1629)
+++ trunk/overlays/proaudio/media-sound/jnoise/jnoise-0.4.0.ebuild	2010-04-11 10:54:28 UTC (rev 1630)
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils multilib
+inherit exteutils toolchain-funcs multilib
 
 RESTRICT="mirror"
 DESCRIPTION="A command line JACK app generating white and pink gaussian noise"
@@ -22,15 +22,13 @@
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-makefile.patch"
-	sed -i -e 's@g++@\$(CXX)@g' \
-		-e '/^CPPFLAGS/ s/-O3//' \
-		-e '/^PREFIX/ s@/usr/local@/usr@' \
-		-e "/^LIBDIR/ s/lib\$(SUFFIX)/$(get_libdir)/" "${S}/Makefile" \
-		|| die "sed of Makefile failed"
+	esed_check -i -e 's@g++@\$(CXX)@g' \
+		-e '/^CPPFLAGS/ s/-O3//' "${S}/Makefile"
 }
 
 src_compile() {
-	emake || die "make failed"
+	tc-export CC CXX
+	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "make failed"
 }
 
 src_install() {