Version bumped. This closes bug #60882. Cleaned up old ebuilds.

10 files changed, 53 insertions, 169 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index d4700388b9ee..2a91eff97f78 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.14 2004/06/24 22:32:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.15 2004/08/24 10:35:38 usata Exp $
+
+*djvu-3.5.14 (24 Aug 2004)
+
+  24 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +djvu-3.5.14.ebuild,
+  -djvu-3.5.7.ebuild, -djvu-3.5.9-r1.ebuild, -djvu-3.5.9.ebuild:
+  Version bumped. This closes bug #60882. Cleaned up old ebuilds.
 
   02 May 2004; Danny van Dyk <kugelfang@gentoo.org> djvu-3.5.12.ebuild:
   Marked ~amd64.
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index ee1ca27cca83..1e298d6bf190 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,10 +1,6 @@
 MD5 74ccd316ff23f741b5b714809029d1d3 djvu-3.5.12.ebuild 1049
-MD5 b826844f751cf217acdfebbe3210e653 djvu-3.5.7.ebuild 1631
-MD5 900f3d200cc7d1a5d364cb14679abdf8 djvu-3.5.9.ebuild 1529
-MD5 e92a5d394c0fecfaec5cd36745f6e63d djvu-3.5.9-r1.ebuild 1088
 MD5 2831ded3500ebb95797df9f37c8cc708 ChangeLog 1686
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 f8db5b08ecc8fc11cd2a0d7e3e575b20 files/digest-djvu-3.5.7 68
-MD5 c421232f9e058ff996fad8296ca9ed14 files/digest-djvu-3.5.9 68
+MD5 1fafa0c24995979826656a861d03331c djvu-3.5.14.ebuild 1051
+MD5 4a5cc41ce600d15a29fd720f279aaaf1 files/digest-djvu-3.5.14 69
 MD5 376a63d9cbc58a7737d37680734f0ee0 files/digest-djvu-3.5.12 69
-MD5 c421232f9e058ff996fad8296ca9ed14 files/digest-djvu-3.5.9-r1 68
diff --git a/app-text/djvu/djvu-3.5.14.ebuild b/app-text/djvu/djvu-3.5.14.ebuild
new file mode 100644
index 000000000000..a043450c9f5e
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Foundation
+# 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.1 2004/08/24 10:35:38 usata Exp $
+
+inherit nsplugins flag-o-matic
+
+MY_P="${PN}libre-${PV}"
+
+DESCRIPTION="A web-centric format and software platform for distributing documents and images."
+HOMEPAGE="http://djvu.sourceforge.net"
+SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64"
+IUSE="xml qt"
+
+DEPEND=">=media-libs/jpeg-6b-r2
+	qt? ( >=x11-libs/qt-2.3 )"
+
+S=${WORKDIR}/${MY_P}
+
+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"
+
+	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
+}
diff --git a/app-text/djvu/djvu-3.5.7.ebuild b/app-text/djvu/djvu-3.5.7.ebuild
deleted file mode 100644
index cd6f6e9cc7f9..000000000000
--- a/app-text/djvu/djvu-3.5.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.7.ebuild,v 1.12 2004/07/13 20:59:00 agriffis Exp $
-
-MY_P="${PN}libre-${PV}"
-DESCRIPTION="A web-centric format and software platform for distributing documents and images."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-# Build-time dependencies, such as
-DEPEND=">=x11-libs/qt-3.0.4.20020606-r1
-		>=media-libs/jpeg-6b-r2"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make depend || die
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-}
-
-pkg_postinst() {
-	# The package installs the browser plugins into
-	# /usr/lib/netscape/plugins, so we need to move them to the
-	# appropriate mozilla directory. when mozilla is installed.
-	if [ -d /usr/lib/mozilla/plugins/ -a \
-		 -f /usr/lib/netscape/plugins/nsdejavu.so ]
-	then
-		cp /usr/lib/netscape/plugins/nsdejavu.so /usr/lib/mozilla/plugins
-	fi
-}
-
-pkg_postrm() {
-	# Maybe we must remove the plugin from the mozilla plugins dir.
-	if [ -f /usr/lib/mozilla/plugins/nsdejavu.so ]
-	then
-		rm /usr/lib/mozilla/plugins/nsdejavu.so
-	fi
-}
diff --git a/app-text/djvu/djvu-3.5.9-r1.ebuild b/app-text/djvu/djvu-3.5.9-r1.ebuild
deleted file mode 100644
index d5947b10d9fb..000000000000
--- a/app-text/djvu/djvu-3.5.9-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.9-r1.ebuild,v 1.9 2004/07/13 20:59:00 agriffis Exp $
-
-inherit nsplugins
-
-MY_P="${PN}libre-${PV}"
-DESCRIPTION="A web-centric format and software platform for distributing documents and images."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-DEPEND=">=x11-libs/qt-3.0.4.20020606-r1
-		>=media-libs/jpeg-6b-r2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make depend || die
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-
-	# plugin installation
-	inst_plugin /usr/lib/netscape/plugins/nsdejavu.so
-
-}
diff --git a/app-text/djvu/djvu-3.5.9.ebuild b/app-text/djvu/djvu-3.5.9.ebuild
deleted file mode 100644
index 81d7e4b8ba61..000000000000
--- a/app-text/djvu/djvu-3.5.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.9.ebuild,v 1.10 2004/07/13 20:59:00 agriffis Exp $
-
-MY_P="${PN}libre-${PV}"
-DESCRIPTION="A web-centric format and software platform for distributing documents and images."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-DEPEND=">=x11-libs/qt-3.0.4.20020606-r1
-		>=media-libs/jpeg-6b-r2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make depend || die
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-}
-
-pkg_postinst() {
-	# The package installs the browser plugins into
-	# /usr/lib/netscape/plugins, so we need to move them to the
-	# appropriate mozilla directory. when mozilla is installed.
-	if [ -d /usr/lib/mozilla/plugins/ -a \
-		 -f /usr/lib/netscape/plugins/nsdejavu.so ]
-	then
-		cp /usr/lib/netscape/plugins/nsdejavu.so /usr/lib/mozilla/plugins
-	fi
-}
-
-pkg_postrm() {
-	# Maybe we must remove the plugin from the mozilla plugins dir.
-	if [ -f /usr/lib/mozilla/plugins/nsdejavu.so ]
-	then
-		rm /usr/lib/mozilla/plugins/nsdejavu.so
-	fi
-}
diff --git a/app-text/djvu/files/digest-djvu-3.5.14 b/app-text/djvu/files/digest-djvu-3.5.14
new file mode 100644
index 000000000000..7773823ac2f6
--- /dev/null
+++ b/app-text/djvu/files/digest-djvu-3.5.14
@@ -0,0 +1 @@
+MD5 a9b60d0c47d6b98e321100d329c7f3b3 djvulibre-3.5.14.tar.gz 1742428
diff --git a/app-text/djvu/files/digest-djvu-3.5.7 b/app-text/djvu/files/digest-djvu-3.5.7
deleted file mode 100644
index 746eae02a3e7..000000000000
--- a/app-text/djvu/files/digest-djvu-3.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c0fb56408ed06cc49e12118db2f6ed7 djvulibre-3.5.7.tar.gz 1281888
diff --git a/app-text/djvu/files/digest-djvu-3.5.9 b/app-text/djvu/files/digest-djvu-3.5.9
deleted file mode 100644
index 5ba1b2409490..000000000000
--- a/app-text/djvu/files/digest-djvu-3.5.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c404709bf1a4170b8d4b3d789e9911b djvulibre-3.5.9.tar.gz 1285498
diff --git a/app-text/djvu/files/digest-djvu-3.5.9-r1 b/app-text/djvu/files/digest-djvu-3.5.9-r1
deleted file mode 100644
index 5ba1b2409490..000000000000
--- a/app-text/djvu/files/digest-djvu-3.5.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c404709bf1a4170b8d4b3d789e9911b djvulibre-3.5.9.tar.gz 1285498