--- branches/magellan-next/extras/livecdsystem26/livecdsystem26-0.13-r1.smage2	2011/12/01 20:05:53	9474
+++ branches/magellan-next/extras/livecdsystem26/livecdsystem26-0.13-r1.smage2	2011/12/01 20:11:51	9475
@@ -70,6 +70,7 @@
 		>= net-dialup/ppp-2.4
 		>= net-dialup/rp-pppoe-3.10"
 fi
+SPECIAL_VARIABLES="ENABLE_NETWORKMANAGER"
 
 sminclude mtools
 
@@ -91,21 +92,21 @@
 	read
 
 	# kill info
-	[[ -d ${MROOT}/usr/share/info ]] && rm -rf ${MROOT}/usr/share/info
+	[[ -d ${MROOT}/usr/share/info ]] && rm -r ${MROOT}/usr/share/info
 	# kill man
-	[[ -d ${MROOT}/usr/share/man ]] && rm -rf ${MROOT}/usr/share/man
+	[[ -d ${MROOT}/usr/share/man ]] && rm -r ${MROOT}/usr/share/man
 	# kill doc
-	[[ -d ${MROOT}/usr/share/doc ]] && rm -rf ${MROOT}/usr/share/doc
+	[[ -d ${MROOT}/usr/share/doc ]] && rm -r ${MROOT}/usr/share/doc
 	# kill includes
-	[[ -d ${MROOT}/usr/include ]] && rm -rf ${MROOT}/usr/include
+	[[ -d ${MROOT}/usr/include ]] && rm -r ${MROOT}/usr/include
 	# kill pkgconfig
-	[[ -d ${MROOT}/usr/$(mlibdir)/pkgconfig ]] && rm -rf ${MROOT}/usr/$(mlibdir)/pkgconfig
+	[[ -d ${MROOT}/usr/$(mlibdir)/pkgconfig ]] && rm -r ${MROOT}/usr/$(mlibdir)/pkgconfig
 	if [[ $(mlibdir) != lib ]]
 	then
-		[[ -d ${MROOT}/usr/$(mlibdir)/pkgconfig ]] && rm -rf ${MROOT}/usr/$(mlibdir)/pkgconfig
+		[[ -d ${MROOT}/usr/$(mlibdir)/pkgconfig ]] && rm -r ${MROOT}/usr/$(mlibdir)/pkgconfig
 	fi
 	# kill aclocal
-	[[ -d ${MROOT}/usr/share/aclocal ]] && rm -rf ${MROOT}/usr/share/aclocal
+	[[ -d ${MROOT}/usr/share/aclocal ]] && rm -r ${MROOT}/usr/share/aclocal
 
 	# kill tmps
 	rm -rf ${MROOT}/tmp/*
@@ -117,6 +118,17 @@
 	MAGE_UNINSTALL_TIMEOUT=0 MROOT="${MY_MROOT}" mage uninstall texinfo
 	MAGE_UNINSTALL_TIMEOUT=0 MROOT="${MY_MROOT}" mage uninstall gettext
 	MAGE_UNINSTALL_TIMEOUT=0 MROOT="${MY_MROOT}" mage uninstall libtool
+
+	if [[ ${ENABLE_NETWORKMANAGER} = y ]]
+	then
+		for i in nspr nss sqlite eggdbus polkit ppp modemmanager alsa-lib gstreamer \
+				liboil cdparanoia libogg libvorbis libtheora gst-plugins-base flac libsndfile \
+				libjpeg libtiff libpaper lcms poppler-data poppler libdaemon avahi cups bluez
+		do
+			MAGE_UNINSTALL_TIMEOUT=0 MROOT="${MY_MROOT}" mage uninstall ${i}
+		done
+	fi
+
 	MROOT="${MY_MROOT}"
 
 	find ${MROOT}/$(mlibdir) -name '*.la' | xargs rm
@@ -133,27 +145,28 @@
 
 	# strip some packages
 	# awk
-	[[ -d ${MROOT}/usr/$(mlibdir)/awk ]] && rm -rf ${MROOT}/usr/$(mlibdir)/awk
-	[[ -d ${MROOT}/usr/share/awk ]] && rm -rf ${MROOT}/usr/share/awk
+	[[ -d ${MROOT}/usr/$(mlibdir)/awk ]] && rm -r ${MROOT}/usr/$(mlibdir)/awk
+	[[ -d ${MROOT}/usr/share/awk ]] && rm -r ${MROOT}/usr/share/awk
 	if [[ $(mlibdir) != lib ]]
 	then
-		[[ -d ${MROOT}/usr/lib/awk ]] && rm -rf ${MROOT}/usr/lib/awk
+		[[ -d ${MROOT}/usr/lib/awk ]] && rm -r ${MROOT}/usr/lib/awk
 	fi
 	# perl
-	[[ -d ${MROOT}/usr/$(mlibdir)/perl5 ]] && rm -rf ${MROOT}/usr/$(mlibdir)/perl5
+	[[ -d ${MROOT}/usr/$(mlibdir)/perl5 ]] && rm -r ${MROOT}/usr/$(mlibdir)/perl5
 	if [[ $(mlibdir) != lib ]]
 	then
-		[[ -d ${MROOT}/usr/lib/perl5 ]] && rm -rf ${MROOT}/usr/lib/perl5
+		[[ -d ${MROOT}/usr/lib/perl5 ]] && rm -r ${MROOT}/usr/lib/perl5
 	fi
 	# glib2
-	[[ -d ${MROOT}/usr/$(mlibdir)/glib-2.0 ]] && rm -rf ${MROOT}/usr/$(mlibdir)/glib-2.0
-	[[ -d ${MROOT}/usr/share/glib-2.0 ]] && rm -rf ${MROOT}/usr/share/glib-2.0
-	[[ -d ${MROOT}/usr/share/gtk-doc ]] && rm -rf ${MROOT}/usr/share/gtk-doc
+	[[ -d ${MROOT}/usr/$(mlibdir)/glib-2.0 ]] && rm -r ${MROOT}/usr/$(mlibdir)/glib-2.0
+	[[ -d ${MROOT}/usr/share/glib-2.0 ]] && rm -r ${MROOT}/usr/share/glib-2.0
+	[[ -d ${MROOT}/usr/share/gtk-doc ]] && rm -r ${MROOT}/usr/share/gtk-doc
 	if [[ $(mlibdir) != lib ]]
 	then
-		[[ -d ${MROOT}/usr/lib/glib-2.0 ]] && rm -rf ${MROOT}/usr/lib/glib-2.0
+		[[ -d ${MROOT}/usr/lib/glib-2.0 ]] && rm -r ${MROOT}/usr/lib/glib-2.0
 	fi
-
+	# gobject-introspection files
+	[[ -f ${MROOT}/usr/share/gir-1.0 ]] && rm -r ${MROOT}/usr/share/gir-1.0
 	# enable networkmanager
 	if [[ ${ENABLE_NETWORKMANAGER} = y ]]
 	then