--- qt-3.3.4-r8.ebuild.old	2005-10-07 17:06:14.000000000 +0200
+++ qt-3.3.4-r8.ebuild	2005-11-06 23:29:23.000000000 +0100
@@ -17,12 +17,12 @@
 
 SLOT="3"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
+IUSE="jpeg png mng cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
 DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/libmng
+        png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mng? ( media-libs/libmng )
 	>=media-libs/freetype-2
 	nas? ( >=media-libs/nas-1.5 )
 	mysql? ( dev-db/mysql )
@@ -155,6 +155,10 @@
 	use immqt-bc	&& myconf="${myconf} -inputmethod"
 	use immqt	&& myconf="${myconf} -inputmethod -inputmethod-ext"
 
+	use jpeg	&& myconf="${myconf} -qt-imgfmt-jpeg -system-libjpeg"  || myconf="${myconf} -no-imgfmt-jpeg"
+	use png		&& myconf="${myconf} -qt-imgfmt-png  -system-libpng"   || myconf="${myconf} -no-imgfmt-png"
+	use mng		&& myconf="${myconf} -qt-imgfmt-mng  -system-libmng"   || myconf="${myconf} -no-imgfmt-mng"
+
 	if use ppc-macos ; then
 		myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
 		myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
@@ -164,9 +168,8 @@
 
 	export YACC='byacc -d'
 
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -xft -platform ${PLATFORM} -xplatform \
+	./configure -sm -thread -stl -verbose -largefile \
+		-tablet -xft -platform ${PLATFORM} -xplatform \
 		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
 		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die