[proaudio] [1122] cleanup libdsp-5.0.2 ebuild

[subversion@xxxxxxxxxxxxx]

Revision: 1122
Author:   evermind
Date:     2008-01-14 08:32:00 +0000 (Mon, 14 Jan 2008)

Log Message:
-----------
cleanup libdsp-5.0.2 ebuild

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libdsp/ChangeLog
    trunk/overlays/proaudio/media-libs/libdsp/Manifest
    trunk/overlays/proaudio/media-libs/libdsp/libdsp-5.0.2.ebuild


Modified: trunk/overlays/proaudio/media-libs/libdsp/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libdsp/ChangeLog	2008-01-13 21:48:52 UTC (rev 1121)
+++ trunk/overlays/proaudio/media-libs/libdsp/ChangeLog	2008-01-14 08:32:00 UTC (rev 1122)
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jan 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
+  libdsp-5.0.2.ebuild:
+  cleanup ebuild patching
+
   11 Jan 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx> ChangeLog:
   add support for amd64
 

Modified: trunk/overlays/proaudio/media-libs/libdsp/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libdsp/Manifest	2008-01-13 21:48:52 UTC (rev 1121)
+++ trunk/overlays/proaudio/media-libs/libdsp/Manifest	2008-01-14 08:32:00 UTC (rev 1122)
@@ -1,6 +1,6 @@
 AUX libdsp-5.0.2-Makefile.patch 3275 RMD160 0920b3e8a54fb762732f62d8eb84957710935244 SHA1 8538368daf6054cc0360c574d807a6493f26865e SHA256 cb405558701b4e0799374f605fd812b1348a996a3c5df5767790157bf5109aea
 DIST libdsp-doc-html.tar.gz 1202736 RMD160 8da583b0f5483eb0e904ad0712bc86296cefbe40 SHA1 9204f1964abf3fb9f73c946f71ed95fc6614a635 SHA256 35060d3c658686d67cd434dc09548da8288f81d108e5d3bed8a3a76bac4fb32d
 DIST libdsp-src-5.0.2.tar.gz 218725 RMD160 6d38dc7acfdeed7626923f4d8ac2be362f6ff873 SHA1 6745d42465df7637e0527380df7d722786837acc SHA256 0bb084e02d0d460b7d78b6d3512c9ed23577d834d472cf5569bba0b4e7c09efe
-EBUILD libdsp-5.0.2.ebuild 2664 RMD160 4ef4dcc16d3d1057ff043b36b52432e8bdd1458f SHA1 e3e4edb3f125b6b7a509fde951742063fe4cf5c6 SHA256 563c4ac5b9c81517d4d5f13685f369e98b43122a6214d40e6658039d09bae0f3
-MISC ChangeLog 298 RMD160 8a5cd5023e83dbd2cb5ae6500e88054c3dc2e963 SHA1 0e3ebf11e3595311ece8b7f6c4c53cdcf991ad30 SHA256 26ccffb8ac9a81234cc13614649e8c235cf460c2dd37004c0c25005c47a27dd8
+EBUILD libdsp-5.0.2.ebuild 2760 RMD160 b5d8dec8f1d7cc5b094a71f6b15ff266e8299511 SHA1 c1ccbe3fd0bab88b1fefb730641a6aee11cdc4ff SHA256 05ac038bdef8169647ee07536d45eb30be402e9e18b9d03c7a4e6dd61fd8b9df
+MISC ChangeLog 406 RMD160 8dd95e3c33362c0d04f9d12d36b40559e10d89d4 SHA1 92842c8e2f8388110d9af5328a2dc76aa75afca0 SHA256 990c6bdb177a1a430538e9c6e1b667580de5f359ae1074aebf1df4d152619341
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-libs/libdsp/libdsp-5.0.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libdsp/libdsp-5.0.2.ebuild	2008-01-13 21:48:52 UTC (rev 1121)
+++ trunk/overlays/proaudio/media-libs/libdsp/libdsp-5.0.2.ebuild	2008-01-14 08:32:00 UTC (rev 1122)
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,56 +21,75 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	local ap_arch=""
 
-	# fixes some Makefile weirdness
-	epatch "${FILESDIR}"/${P}-Makefile.patch
+	if use x86;then
+		ap_arch=""
+		# disable assembler optimization (gcc 4 fails)
+		esed_check -i -e "s@\(^DEFS.*-DDSP_X86\)@# \1@" \
+			-e "s@^#\(DEFS.*-DUSE_MEMMOVE\)@\1@" "libDSP/Makefile"
+	fi
 
-	# use our CFLAGS/CXXFLAGS instead
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" -i libDSP/Makefile
-	sed -e "s:^CXXFLAGS.*:CXXFLAGS = ${CXXFLAGS}:" -i DynThreads/Makefile
+	use amd64 && ap_arch=".x86-64"
 
-	# use our PREFIX too
-	esed_check -i -e "s:^PREFIX.*:PREFIX = ${D}/usr:" Inlines/Makefile \
-		libDSP/Makefile DynThreads/Makefile
+	# begin -- patch make files
+	patch_prefix "Inlines/Makefile" "libDSP/Makefile${ap_arch}" \
+		"DynThreads/Makefile${ap_arch}"
 
-	if use amd64;then
+	patch_cflags_include "libDSP/Makefile${ap_arch}" \
+		"DynThreads/Makefile${ap_arch}"
+
+	patch_used_compiler "libDSP/Makefile${ap_arch}" \
+		"DynThreads/Makefile${ap_arch}"
+
+	patch_libtool "libDSP/Makefile${ap_arch}"
+
+	patch_optcflags "libDSP/Makefile${ap_arch}"
+	# end -- patch make files
+
+	# fix NPTL includes
+	for filename in $(grep -rl nptl/pthread libDSP/* Inlines/* DynThreads/*); do
+		esed_check -i -e "s:nptl/pthread.h:pthread.h:g"  $filename
+	done
+}
+
+patch_cflags_include() {
 		esed_check -i -e "1iCFLAGS = ${CFLAGS}" \
 			-e "s:\(^CFLAGS.*\):#\1:" \
 			-e "s:\(^INCS.*\):INCS = -I. -I../Inlines -I/usr/include:" \
-			libDSP/Makefile.x86-64
+			-e "1iCXXFLAGS = ${CXXFLAGS}" \
+			-e "s:\(^CXXFLAGS.*\):#\1:" $@
+}
 
-		esed_check -i -e "1iCXXFLAGS = ${CXXFLAGS}" \
-			-e "s:\(^CXXFLAGS.*\):#\1:" \
-			-e "s:\(^INCS.*\):INCS = -I. -I../Inlines -I/usr/include:" \
-			DynThreads/Makefile.x86-64
+patch_optcflags() {
+	#remove optional flags
+	esed_check -i -e "s:\(^OPTCFLAGS.*\):#\1:" $@
+}
 
-		esed_check -i -e "s:^PREFIX.*:PREFIX = ${D}/usr:" \
-			libDSP/Makefile.x86-64 DynThreads/Makefile.x86-64
+patch_prefix() {
+	# use our PREFIX too
+	esed_check -i -e "s:^PREFIX.*:PREFIX = ${D}/usr:" $@
+}
 
-	fi
+patch_used_compiler() {
+	# use our CC / CXX variables
 	tc-export CC CXX
-	# use our CC / CXX variables
 	esed_check -i -e "s:^CC\ *=.*:CC = ${CC}:g" \
-		-e "s:^CXX\ *=.*:CXX = ${CXX}:g" \
-		libDSP/Makefile libDSP/Makefile.x86-64 \
-		DynThreads/Makefile DynThreads/Makefile.x86-64
+		-e "s:^CXX\ *=.*:CXX = ${CXX}:g" $@
 
-	# fix NPTL includes
-	for filename in $(grep -rl nptl/pthread libDSP/* Inlines/* DynThreads/*); do
-		esed_check -i -e "s:nptl/pthread.h:pthread.h:g"  $filename
-	done
+}
 
+patch_libtool() {
 	# libtool only supports the --tag option from v1.5 onwards
 	if ! has_version ">=sys-devel/libtool-1.5.0"; then
-		esed_check -i -e "s/^LIBTOOL = libtool --tag=CXX/LIBTOOL = libtool/" libDSP/Makefile
-		use amd64 && esed_check -i -e \
-			"s/^LIBTOOL = libtool --tag=CXX/LIBTOOL = libtool/" libDSP/Makefile.x86_64
+		esed_check -i -e "s/^LIBTOOL = libtool --tag=CXX/LIBTOOL = libtool/" $@
 	fi
 }
 
 src_compile() {
 	myconf=""
-	use amd64 myconf="-f Makefile.x86-64"
+	use x86 && myconf=""
+	use amd64 && myconf="-f Makefile.x86-64"
 	cd ${S}/DynThreads
 	emake ${myconf} || die "DynThreads make failed!"