--- branches/magellan-next/core/pulseaudio/pulseaudio-1.1-r2.smage2	2011/11/28 09:07:03	9371
+++ branches/magellan-next/core/pulseaudio/pulseaudio-1.1-r2.smage2	2011/11/28 10:41:17	9372
@@ -199,49 +199,6 @@
 	# enable avahi support
 	sed -i '/module-zeroconf-publish/s:^#::' ${BINDIR}/etc/pulse/default.pa || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/libpulsecore-*.*
-		usr/lib/pulseaudio
-		usr/lib/pulse-${PVER}/*always*
-		usr/lib/pulse-${PVER}/*augment*
-		usr/lib/pulse-${PVER}/*card*
-		usr/lib/pulse-${PVER}/*combine*
-		usr/lib/pulse-${PVER}/*console*
-		usr/lib/pulse-${PVER}/*cork*
-		usr/lib/pulse-${PVER}/*cli*
-		usr/lib/pulse-${PVER}/*dbus*
-		usr/lib/pulse-${PVER}/*default*
-		usr/lib/pulse-${PVER}/*detect*
-		usr/lib/pulse-${PVER}/*echo*
-		usr/lib/pulse-${PVER}/*equalizer*
-		usr/lib/pulse-${PVER}/*filter*
-		usr/lib/pulse-${PVER}/*hal*
-		usr/lib/pulse-${PVER}/*http*
-		usr/lib/pulse-${PVER}/*intended*
-		usr/lib/pulse-${PVER}/*ladspa*
-		usr/lib/pulse-${PVER}/*loopback*
-		usr/lib/pulse-${PVER}/*match*
-		usr/lib/pulse-${PVER}/*mmkbd*
-		usr/lib/pulse-${PVER}/*native*
-		usr/lib/pulse-${PVER}/*null*
-		usr/lib/pulse-${PVER}/*pipe*
-		usr/lib/pulse-${PVER}/*position*
-		usr/lib/pulse-${PVER}/*remap*
-		usr/lib/pulse-${PVER}/*rtp*
-		usr/lib/pulse-${PVER}/*rygel*
-		usr/lib/pulse-${PVER}/*simple*
-		usr/lib/pulse-${PVER}/*sine*
-		usr/lib/pulse-${PVER}/*stream*
-		usr/lib/pulse-${PVER}/*suspend*
-		usr/lib/pulse-${PVER}/*switch*
-		usr/lib/pulse-${PVER}/*tunnel*
-		usr/lib/pulse-${PVER}/*udev*
-		usr/lib/pulse-${PVER}/*virtual*
-		usr/lib/pulse-${PVER}/*volume*"
-	fi
-
 	zapmost ${BINDIR} \
 		etc/pulse/daemon.conf \
 		etc/pulse/*.pa \
@@ -285,7 +242,44 @@
 		usr/$(mlibdir)/pulse-${PVER}/*udev* \
 		usr/$(mlibdir)/pulse-${PVER}/*virtual* \
 		usr/$(mlibdir)/pulse-${PVER}/*volume* \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo "usr/lib/libpulsecore-*.*
+			usr/lib/pulseaudio
+			usr/lib/pulse-${PVER}/*always*
+			usr/lib/pulse-${PVER}/*augment*
+			usr/lib/pulse-${PVER}/*card*
+			usr/lib/pulse-${PVER}/*combine*
+			usr/lib/pulse-${PVER}/*console*
+			usr/lib/pulse-${PVER}/*cork*
+			usr/lib/pulse-${PVER}/*cli*
+			usr/lib/pulse-${PVER}/*dbus*
+			usr/lib/pulse-${PVER}/*default*
+			usr/lib/pulse-${PVER}/*detect*
+			usr/lib/pulse-${PVER}/*echo*
+			usr/lib/pulse-${PVER}/*equalizer*
+			usr/lib/pulse-${PVER}/*filter*
+			usr/lib/pulse-${PVER}/*hal*
+			usr/lib/pulse-${PVER}/*http*
+			usr/lib/pulse-${PVER}/*intended*
+			usr/lib/pulse-${PVER}/*ladspa*
+			usr/lib/pulse-${PVER}/*loopback*
+			usr/lib/pulse-${PVER}/*match*
+			usr/lib/pulse-${PVER}/*mmkbd*
+			usr/lib/pulse-${PVER}/*native*
+			usr/lib/pulse-${PVER}/*null*
+			usr/lib/pulse-${PVER}/*pipe*
+			usr/lib/pulse-${PVER}/*position*
+			usr/lib/pulse-${PVER}/*remap*
+			usr/lib/pulse-${PVER}/*rtp*
+			usr/lib/pulse-${PVER}/*rygel*
+			usr/lib/pulse-${PVER}/*simple*
+			usr/lib/pulse-${PVER}/*sine*
+			usr/lib/pulse-${PVER}/*stream*
+			usr/lib/pulse-${PVER}/*suspend*
+			usr/lib/pulse-${PVER}/*switch*
+			usr/lib/pulse-${PVER}/*tunnel*
+			usr/lib/pulse-${PVER}/*udev*
+			usr/lib/pulse-${PVER}/*virtual*
+			usr/lib/pulse-${PVER}/*volume*") \
 		usr/share/man/man1/pulseaudio.1 \
 		usr/share/man/man5/default.pa.5 \	
 		usr/share/man/man5/pulse-daemon.conf.5 \
@@ -301,15 +295,9 @@
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/pulse-${PVER}/*alsa*"
-	fi
-
 	zapmost ${BINDIR} \
 		usr/$(mlibdir)/pulse-${PVER}/*alsa* \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*alsa*") \
 		usr/share/pulseaudio/alsa-mixer \
 		|| die
 }
@@ -318,16 +306,10 @@
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/pulse-${PVER}/*esound*"
-	fi
-
 	zapmost ${BINDIR} \
 		usr/bin/esdcompat \
 		usr/$(mlibdir)/pulse-${PVER}/*esound* \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*esound*") \
 		usr/share/pulseaudio/alsa-mixer \
 		usr/share/man/man1/esdcompat.1 \
 		|| die
@@ -337,17 +319,11 @@
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/pulse-${PVER}/*avahi*
-			usr/lib/pulse-${PVER}/*zeroconf*"
-	fi
-
 	zapmost ${BINDIR} \
 		usr/$(mlibdir)/pulse-${PVER}/*avahi* \
 		usr/$(mlibdir)/pulse-${PVER}/*zeroconf* \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*avahi*
+			usr/lib/pulse-${PVER}/*zeroconf*") \
 		|| die
 }
  
@@ -355,37 +331,24 @@
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/pulse-${PVER}/*x11*"
-	fi
-
 	zapmost ${BINDIR} \
 		etc/xdg \
 		usr/bin/start-pulseaudio* \
 		usr/$(mlibdir)/pulse-${PVER}/*x11* \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*x11*") \
 		usr/share/man/man1/start-pulseaudio* \
-		${myzap} \
 		|| die
-
 }
 
 src_install_pulseaudio-bluetooth()
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/pulse-${PVER}/*bluetooth*
-			usr/lib/pulseaudio/proximity-helper"
-	fi
-
 	zapmost ${BINDIR} \
 		usr/$(mlibdir)/pulse-${PVER}/*bluetooth* \
 		usr/$(mlibdir)/pulseaudio/proximity-helper \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*bluetooth*
+			usr/lib/pulseaudio/proximity-helper") \
 		|| die	
 }
 
@@ -393,15 +356,9 @@
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/pulse-${PVER}/*raop*"
-	fi
-
 	zapmost ${BINDIR} \
 		usr/$(mlibdir)/pulse-${PVER}/*raop* \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*raop*") \
 		|| die	
 }
 
@@ -409,16 +366,10 @@
 {
 	mmake DESTDIR=${BINDIR} install || die
 
-	local myzap
-	if [[ $(mlibdir) != lib ]]
-	then
-		myzap="usr/lib/libpulsedsp.*"
-	fi
-
 	zapmost ${BINDIR} \
 		usr/bin/pa* \
 		usr/$(mlibdir)/libpulsedsp.* \
-		${myzap} \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/libpulsedsp.*") \
 		usr/share/man/man1/pa* \
 		|| die	
 }