Version bump, drop old.

Package-Manager: portage-2.1.9.18/cvs/Linux x86_64

4 files changed, 63 insertions, 45 deletions

diff --git a/app-text/djview4/ChangeLog b/app-text/djview4/ChangeLog
index 46f2938eee90..33da8941d9b6 100644
--- a/app-text/djview4/ChangeLog
+++ b/app-text/djview4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djview4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.30 2010/08/18 04:03:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.31 2010/10/15 14:08:07 pva Exp $
+
+*djview4-4.6 (15 Oct 2010)
+
+  15 Oct 2010; Peter Volkov <pva@gentoo.org> -djview4-4.5.ebuild,
+  +djview4-4.6.ebuild:
+  Version bump, drop old.
 
   18 Aug 2010; Jeroen Roovers <jer@gentoo.org> djview4-4.5-r1.ebuild:
   Stable for HPPA (bug #299574).
diff --git a/app-text/djview4/djview4-4.5.ebuild b/app-text/djview4/djview4-4.6.ebuild
index a557abed0c53..1f8bf0b9db75 100644
--- a/app-text/djview4/djview4-4.5.ebuild
+++ b/app-text/djview4/djview4-4.6.ebuild
@@ -1,38 +1,48 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.5.ebuild,v 1.10 2010/01/06 20:24:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.6.ebuild,v 1.1 2010/10/15 14:08:07 pva Exp $
 
-EAPI=2
+EAPI="3"
 
-inherit eutils versionator qt4 toolchain-funcs fdo-mime
+inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
 
 MY_P=${PN}-$(replace_version_separator 2 '-')
 
 DESCRIPTION="Portable DjVu viewer using Qt4"
 HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
 SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-LICENSE="GPL-2"
 
-KEYWORDS="alpha amd64 hppa ~ia64 ppc64 x86"
+LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
 RDEPEND="
-	>=app-text/djvu-3.5.19
-	x11-libs/qt-gui:4
-"
+	>=app-text/djvu-3.5.22-r1
+	x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-"
+	nsplugin? ( dev-libs/glib:2 )"
 
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+src_prepare() {
+	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
+	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
+	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
+	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
+	AT_M4DIR="config" eautoreconf
+}
 
 src_configure() {
+	# See config/acinclude.m4
+	use debug || append-cppflags "-DNDEBUG"
+
 	# QTDIR is needed because of kde3
 	QTDIR=/usr \
 	econf \
-		$(use_enable debug) \
 		--with-x \
-		--disable-nsdejavu \
+		$(use_enable nsplugin nsdejavu) \
 		--disable-desktopfiles
 }
 
@@ -41,9 +51,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	#remove conflicting symlinks
-	rm -f "${D}/usr/bin/djview" "${D}/usr/share/man/man1/djview.1"
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install || die "emake install failed"
 
 	dodoc README TODO NEWS || die "dodoc failed"
 
diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 6853dfb4b426..9776cd955a71 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djvu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.108 2010/08/18 04:02:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.109 2010/10/15 14:06:47 pva Exp $
+
+*djvu-3.5.23 (15 Oct 2010)
+
+  15 Oct 2010; Peter Volkov <pva@gentoo.org> -djvu-3.5.21_p20090103.ebuild,
+  +djvu-3.5.23.ebuild:
+  Version bump, drop old.
 
   18 Aug 2010; Jeroen Roovers <jer@gentoo.org> djvu-3.5.22-r1.ebuild:
   Stable for HPPA (bug #299574).
diff --git a/app-text/djvu/djvu-3.5.21_p20090103.ebuild b/app-text/djvu/djvu-3.5.23.ebuild
index 104941bb59b3..efc3dd1a0b79 100644
--- a/app-text/djvu/djvu-3.5.21_p20090103.ebuild
+++ b/app-text/djvu/djvu-3.5.23.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.10 2010/01/05 03:08:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.23.ebuild,v 1.1 2010/10/15 14:06:47 pva Exp $
 
-EAPI=1
-inherit fdo-mime flag-o-matic eutils multilib toolchain-funcs
+EAPI="2"
+inherit fdo-mime autotools flag-o-matic
 
 MY_P="${PN}libre-${PV#*_p}"
 
@@ -13,22 +13,27 @@ 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="xml jpeg tiff debug nls kde doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc jpeg nls tiff xml"
 
-RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
+RDEPEND="jpeg? ( virtual/jpeg )
 	tiff? ( media-libs/tiff )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-LANGS="cs de en fr ja zh"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
+# No gui, only manual pages left and only on ja...
+LANGS="ja"
+IUSE+=" $(printf "linguas_%s" ${LANGS})"
 
-src_compile() {
-	local I18N
+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
@@ -45,22 +50,19 @@ src_compile() {
 		I18N="--disable-i18n"
 	fi
 
-	# We install all desktop files by hand and Qt3 is deprecated
+	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}" \
-		$(use_enable debug)
-
-	sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-
-	emake || die "emake failed"
+		"${I18N}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install || die
+	emake DESTDIR="${D}" install || die
 
 	dodoc README TODO NEWS
 
@@ -72,19 +74,13 @@ src_install() {
 	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
-	if use kde ; then
-		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop || die
-		cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop}
-		sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop
-	fi
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	elog "For djviewer or browser plugin, emerge app-text/djview4."
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }