--- /usr/portage/app-text/djvu/djvu-3.5.14.ebuild	2005-01-01 17:13:59.000000000 +0100
+++ djvu-3.5.14.ebuild	2005-02-25 14:42:12.054078848 +0100
@@ -2,42 +2,64 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.14.ebuild,v 1.5 2005/01/01 16:08:56 eradicator Exp $
 
-inherit nsplugins flag-o-matic
+inherit nsplugins flag-o-matic fdo-mime
 
 MY_P="${PN}libre-${PV}"
 
-DESCRIPTION="A web-centric format and software platform for distributing documents and images."
+DESCRIPTION="DjVu viewers, encoders and utilities."
 HOMEPAGE="http://djvu.sourceforge.net"
 SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ~amd64 ppc"
-IUSE="xml qt"
+IUSE="xml qt jpeg tiff debug threads nls pic nsplugin kde"
 
-DEPEND=">=media-libs/jpeg-6b-r2
+DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( media-libs/tiff )
 	qt? ( >=x11-libs/qt-2.3 )"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	
+	# Replace autochecking acdesktop.m4 with a gentoo-specific one
+	cp ${FILESDIR}/gentoo-acdesktop.m4 ${S}/gui/desktop/acdesktop.m4
+
+	cd ${S}
+	aclocal -I config -I gui/desktop || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	libtoolize --copy --force
+}
+
 src_compile() {
 	# assembler problems and hence non-building with pentium4 
 	# <obz@gentoo.org>
 	replace-flags -march=pentium4 -march=pentium3
 
-	local myconf=""
-	use xml \
-		&& myconf="${myconf} --enable-xmltools"
-	use qt \
-		|| myconf="${myconf} --without-qt"
+	if use kde; then
+		export kde_mimelnk=/usr/share/mimelnk
+	fi
+
+	econf --enable-desktopfiles \
+		$(use_enable xml xmltools) \
+		$(use_with qt) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		$(use_with pic) \
+		$(use_enable threads) \
+		$(use_enable nls i18n) \
+		$(use_enable debug) \
+		|| die "econf failed"
+
+	if use ! nsplugin; then
+		sed -e 's:nsdjvu::' -i ${S}/gui/Makefile
+	fi
 
-	econf ${myconf} || die "econf failed"
-	make depend || die "make depend failed"
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	einstall || die
-	# plugin installation from eclass
-	inst_plugin /usr/lib/netscape/plugins/nsdejavu.so
+	make DESTDIR=${D} plugindir=${D}/usr/lib/${PLUGINS_DIR} install
 }