--- /usr/portage/media-video/xine-ui/xine-ui-0.99.3.ebuild	2005-02-17 19:41:36.000000000 +0100
+++ xine-ui-0.99.3.ebuild	2005-03-20 17:21:32.452107232 +0100
@@ -11,15 +11,16 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ppc64 ~sparc ~mips"
-IUSE="X nls directfb lirc aalib"
+IUSE="X nls lirc aalib libcaca readline curl ncurses"
 
 DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-1_rc8
-	>=net-misc/curl-7.10.2
+	>=media-libs/xine-lib-1.0
 	lirc? ( app-misc/lirc )
 	X? ( virtual/x11 )
 	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )"
+	libcaca? ( media-libs/libcaca )
+	curl? ( >=net-misc/curl-7.10.2 )
+	ncurses? ( sys-libs/ncurses )"
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -30,7 +31,10 @@
 	#epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
 
 	epatch ${FILESDIR}/true-false.patch
-	use directfb || sed -i "s:dfb::" src/Makefile.in
+	epatch ${FILESDIR}/${PN}-configure-checks.patch
+	epatch ${FILESDIR}/${PN}-desktop-fixes.patch
+	./autogen.sh
+
 	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib :" src/xitk/Makefile.in
 }
 
@@ -38,14 +42,16 @@
 	rm misc/xine-bugreport
 	local myconf=""
 
-	use X || myconf="${myconf} --disable-x11 --disable-xv"
-	use aalib || sed -e 's:no_aalib="":no_aalib="yes":g' -i configure || die "could not disable aalib"
-
-	econf ${myconf} \
-	$(use_enable nls) \
-	$(use_enable lirc) \
-	|| die "configuration failed!"
-
+	econf \
+		$(use_enable lirc) \
+		$(use_enable nls) \
+		$(use_with X x) \
+		$(use_with aalib) \
+		$(use_with libcaca) \
+		$(use_with curl) \
+		$(use_with readline) \
+		$(use_with ncurses) \
+		${myconf} || die
 	emake || die "Make failed!"
 }
 
@@ -53,4 +59,9 @@
 	make DESTDIR=${D} docdir=/usr/share/doc/${PF} docsdir=/usr/share/doc/${PF} install || die
 
 	dodoc AUTHORS ChangeLog INSTALL NEWS README
+
+	for res in 16 22 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins ${S}/misc/desktops/xine_${res}x${res}.png xine.png
+	done
 }