4 files changed, 5 insertions, 270 deletions
diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index a5114eea7ccc..e4b94f297492 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/djvu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.127 2012/03/13 22:00:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.128 2012/03/13 22:03:11 ssuominen Exp $
+
+  13 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -djvu-3.5.22-r1.ebuild,
+  -djvu-3.5.23.ebuild, -djvu-3.5.24.ebuild:
+  old
 
 *djvu-3.5.24-r1 (13 Mar 2012)
 
diff --git a/app-text/djvu/djvu-3.5.22-r1.ebuild b/app-text/djvu/djvu-3.5.22-r1.ebuild
deleted file mode 100644
index 6e62d404f524..000000000000
--- a/app-text/djvu/djvu-3.5.22-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22-r1.ebuild,v 1.10 2012/03/11 16:14:54 ssuominen Exp $
-
-EAPI=2
-inherit fdo-mime autotools flag-o-matic
-
-MY_P="${PN}libre-${PV#*_p}"
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc jpeg nls tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-# No gui, only manual pages left and only on ja...
-LANGS="ja"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare() {
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	local X I18N
-	if use nls; then
-		for X in ${LANGS}; do
-			if use linguas_${X}; then
-				I18N="${I18N} ${X}"
-			fi
-		done
-		I18N="${I18N# }"
-		if test -n "$I18N"; then
-			I18N="--enable-i18n=${I18N}"
-		else
-			I18N="--enable-i18n"
-		fi
-	else
-		I18N="--disable-i18n"
-	fi
-
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		--without-qt \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		"${I18N}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png || die
-	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png || die
-	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png || die
-	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml || die
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	elog "For djviewer or browser plugin, emerge app-text/djview4."
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.23.ebuild b/app-text/djvu/djvu-3.5.23.ebuild
deleted file mode 100644
index 7dfbbfcc1239..000000000000
--- a/app-text/djvu/djvu-3.5.23.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.23.ebuild,v 1.11 2012/03/11 16:14:54 ssuominen Exp $
-
-EAPI=2
-inherit fdo-mime autotools flag-o-matic
-
-MY_P="${PN}libre-${PV#*_p}"
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc jpeg nls tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-# No gui, only manual pages left and only on ja...
-LANGS="ja"
-IUSE+=" $(printf "linguas_%s" ${LANGS})"
-
-src_prepare() {
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	local X I18N
-	if use nls; then
-		for X in ${LANGS}; do
-			if use linguas_${X}; then
-				I18N="${I18N} ${X}"
-			fi
-		done
-		I18N="${I18N# }"
-		if test -n "$I18N"; then
-			I18N="--enable-i18n=${I18N}"
-		else
-			I18N="--enable-i18n"
-		fi
-	else
-		I18N="--disable-i18n"
-	fi
-
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		--without-qt \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		"${I18N}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	for i in {22,32,48}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
-		newins hi${i}-djvu.png image-vnd.djvu.png || die
-	done
-	insinto /usr/share/mime/packages
-	doins djvulibre-mime.xml || die
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	elog "For djviewer or browser plugin, emerge app-text/djview4."
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.24.ebuild b/app-text/djvu/djvu-3.5.24.ebuild
deleted file mode 100644
index 2c99ead8e252..000000000000
--- a/app-text/djvu/djvu-3.5.24.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.24.ebuild,v 1.9 2012/03/11 16:14:54 ssuominen Exp $
-
-EAPI=4
-inherit eutils fdo-mime autotools flag-o-matic
-
-MY_P="${PN}libre-${PV#*_p}"
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc jpeg nls tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-# No gui, only manual pages left and only on ja...
-LANGS="ja"
-IUSE+=" $(printf "linguas_%s" ${LANGS})"
-
-src_prepare() {
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh}
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	local X I18N
-	if use nls; then
-		for X in ${LANGS}; do
-			if use linguas_${X}; then
-				I18N="${I18N} ${X}"
-			fi
-		done
-		I18N="${I18N# }"
-		if test -n "$I18N"; then
-			I18N="--enable-i18n=${I18N}"
-		else
-			I18N="--enable-i18n"
-		fi
-	else
-		I18N="--disable-i18n"
-	fi
-
-	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		--without-qt \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		"${I18N}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc README TODO NEWS
-	use doc && dodoc -r doc
-
-	# Install desktop files.
-	cd desktopfiles
-	for i in {22,32,48,64}; do
-		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
-		newins hi${i}-djvu.png image-vnd.djvu.png
-	done
-	insinto /usr/share/mime/packages
-	doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	if ! has_version app-text/djview4 || ! has_version app-text/djview; then
-		elog "For djviewer or browser plugin, emerge app-text/djview."
-	fi
-	if has_version app-text/djview4; then
-		ewarn "Note, that app-text/djview4 has changed its name to app-text/djview."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}