--- smage/trunk/extras/gtk2+/gtk2+-2.24.4-r1.smage2	2011/04/08 07:08:34	1691
+++ smage/trunk/extras/gtk2+/gtk2+-2.24.4-r1.smage2	2011/04/08 10:59:59	1703
@@ -19,18 +19,19 @@
 	>= x11-libs/libXi-1
 	>= x11-libs/libXt-1
 	>= x11-libs/libXext-1
-	>= x11-libs/libXcursor-1.1.10
 	>= x11-libs/libXrandr-1.3
 	>= x11-libs/libXfixes-4
 	>= x11-libs/libXinerama-1.1
-	>= x11-libs/libXcomposite-0.4
 	>= dev-libs/glib2-2.26
 	>= dev-libs/atk-1.33
 	>= x11-libs/pango-1.28
+	>= x11-libs/gdk-pixbuf-2.22
 	>= media-libs/libpng-1.5
 	>= media-libs/libjpeg-8
 	>= media-libs/libtiff-3.9
 	>= x11-libs/cairo-1.10"
+#	>= x11-libs/libXcursor-1.1.10
+#	>= x11-libs/libXcomposite-0.4
 
 SDEPEND=">= dev-util/pkgconfig-0.25
 	>= sys-dev/autoconf-4
@@ -42,7 +43,17 @@
 # simul linux32 to get config things right
 EMUL_LINUX_32=true
 
-sminclude multilib mtools
+MCORE_ONLY_KEEP="etc
+		usr/bin/gtk-update-icon-cache
+		usr/bin/gtk-query-immodules-2.0
+		usr/$(mlibdir)/*.so
+		usr/$(mlibdir)/*.so.*
+		usr/$(mlibdir)/gtk-2.0/2.10.0/engines/*.so
+		usr/$(mlibdir)/gtk-2.0/2.10.0/immodules/*.so
+		usr/$(mlibdir)/gtk-2.0/2.10.0/printbackends/*.so
+		usr/$(mlibdir)/gtk-2.0/modules/*.so
+		usr/share/themes"
+sminclude multilib mtools mcore-split
 
 SRC_URI=(
 	gnome://${PNAME/2+/+}/${PVER%.*}/${SRCFILE}
@@ -71,7 +82,7 @@
 	mpatch ${PNAME}-${PVER}-limit-gtksignal-includes.patch || die
 
 	# use old icon pathes too for compat reasons
-	mpatch ${PNAME}-${PVER}-old-icons.patch || die
+	#mpatch ${PNAME}-${PVER}-old-icons.patch || die
 }
 
 src_compile()
@@ -82,13 +93,9 @@
 	[[ ${ARCH} = x86_64 ]] && myconf=--program-suffix=-$(mabi)
 
 	mconfigure \
-		--with-libjpeg \
-		--with-libtiff \
-		--with-libpng \
 		--with-gdktarget=x11 \
 		--with-xinput \
 		--disable-gtk-doc \
-		--without-libjasper \
 		'$(eval echo \$myconf_${abi})' \
 		${myconf} \
 		|| die
@@ -112,7 +119,6 @@
 
 	if [[ ${ARCH} = x86_64 ]]
 	then
-		mlink multiarch-wrapper /usr/bin/gdk-pixbuf-query-loaders || die
 		mlink multiarch-wrapper /usr/bin/gtk-query-immodules-2.0 || die
 	fi
 }
@@ -128,11 +134,19 @@
 			confdir=/etc/gtk-2.0/i686-pc-linux-gnu
 			install -d ${confdir}
 			gtk-query-immodules-2.0-m32 > ${confdir}/gtk.immodules
-			gdk-pixbuf-query-loaders-m32 > ${confdir}/gdk-pixbuf.loaders
+			# remove old pixbuf loaders, now in an extra package
+			if [[ -f ${confdir}/gdk-pixbuf.loaders ]]
+			then
+				rm ${confdir}/gdk-pixbuf.loaders
+			fi
 		fi
 		confdir=/etc/gtk-2.0/${CHOST}
 		install -d ${confdir}
 		gtk-query-immodules-2.0 > ${confdir}/gtk.immodules
-		gdk-pixbuf-query-loaders > ${confdir}/gdk-pixbuf.loaders
+		# remove old pixbuf loaders, now in an extra package
+		if [[ -f ${confdir}/gdk-pixbuf.loaders ]]
+		then
+			rm ${confdir}/gdk-pixbuf.loaders
+		fi
 	fi
 }