public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/djvu: djvu-3.5.22.ebuild ChangeLog
@ 2009-10-09 18:24 Patrick Lauer (patrick)
  0 siblings, 0 replies; 3+ messages in thread
From: Patrick Lauer (patrick) @ 2009-10-09 18:24 UTC (permalink / raw
  To: gentoo-commits

patrick     09/10/09 18:24:00

  Modified:             ChangeLog
  Added:                djvu-3.5.22.ebuild
  Log:
  Bump to 3.5.22, fixes #287339
  (Portage version: 2.2_rc44/cvs/Linux x86_64)

Revision  Changes    Path
1.96                 app-text/djvu/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	15 Apr 2009 16:53:46 -0000	1.95
+++ ChangeLog	9 Oct 2009 18:24:00 -0000	1.96
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/djvu
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.95 2009/04/15 16:53:46 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.96 2009/10/09 18:24:00 patrick Exp $
+
+*djvu-3.5.22 (09 Oct 2009)
+
+  09 Oct 2009; Patrick Lauer <patrick@gentoo.org> +djvu-3.5.22.ebuild:
+  Bump to 3.5.22, fixes #287339
 
   15 Apr 2009; Brent Baude <ranger@gentoo.org> djvu-3.5.21_p20090103.ebuild:
   Marking djvu-3.5.21_p20090103 ppc64 for bug 262776



1.1                  app-text/djvu/djvu-3.5.22.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?rev=1.1&content-type=text/plain

Index: djvu-3.5.22.ebuild
===================================================================
# Copyright 1999-2009 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.ebuild,v 1.1 2009/10/09 18:24:00 patrick Exp $

EAPI=1
inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils

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="xml qt3 jpeg tiff debug nls nsplugin kde doc"

RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
	tiff? ( media-libs/tiff )
	qt3? ( x11-libs/qt:3 )"
DEPEND="${RDEPEND}
	qt3? ( nsplugin? ( x11-libs/libXt ) )"

S=${WORKDIR}/${MY_P}

LANGS="cs de en fr ja zh"
for X in ${LANGS}; do
	IUSE="${IUSE} linguas_${X}"
done

pkg_setup() {
	if ! use qt3; then
		ewarn
		ewarn "The standalone djvu viewer, djview, will not be compiled."
		ewarn "Add \"qt3\" to your USE flags if you want it."
		ewarn
	fi

	confutils_use_depend_all nsplugin qt3
}

src_compile() {
	local 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

	# We install all desktop files by hand.
	econf --disable-desktopfiles \
		$(use_with qt3 qt) \
		$(use_enable xml xmltools) \
		$(use_with jpeg) \
		$(use_with tiff) \
		"${I18N}" \
		$(use_enable debug) \
		${QTCONF}

	if ! use nsplugin; then
		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
	fi

	emake || die "emake failed"
}

src_install() {
	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install

	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
	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

	if use qt3 ; then
		insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png || die
		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop || die
	fi
}

pkg_postinst() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
}

pkg_postrm() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/djvu: djvu-3.5.22.ebuild ChangeLog
@ 2010-01-18 10:05 Peter Volkov (pva)
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2010-01-18 10:05 UTC (permalink / raw
  To: gentoo-commits

pva         10/01/18 10:05:45

  Modified:             djvu-3.5.22.ebuild ChangeLog
  Log:
  Revert qt3 drop, nsplugin should stay.
  (Portage version: 2.1.7.16/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  app-text/djvu/djvu-3.5.22.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?r1=1.4&r2=1.5

Index: djvu-3.5.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- djvu-3.5.22.ebuild	5 Jan 2010 11:17:24 -0000	1.4
+++ djvu-3.5.22.ebuild	18 Jan 2010 10:05:45 -0000	1.5
@@ -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.22.ebuild,v 1.4 2010/01/05 11:17:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.5 2010/01/18 10:05:45 pva Exp $
 
 EAPI=1
-inherit fdo-mime flag-o-matic eutils multilib toolchain-funcs
+inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
 
 MY_P="${PN}libre-${PV#*_p}"
 
@@ -14,11 +14,13 @@
 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"
+IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc"
 
 RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}"
+	tiff? ( media-libs/tiff )
+	qt3? ( x11-libs/qt:3 )"
+DEPEND="${RDEPEND}
+	qt3? ( nsplugin? ( x11-libs/libXt ) )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -27,6 +29,17 @@
 	IUSE="${IUSE} linguas_${X}"
 done
 
+pkg_setup() {
+	if ! use qt3; then
+		ewarn
+		ewarn "The standalone djvu viewer, djview, will not be compiled."
+		ewarn "Add \"qt3\" to your USE flags if you want it."
+		ewarn
+	fi
+
+	confutils_use_depend_all nsplugin qt3
+}
+
 src_compile() {
 	local I18N
 	if use nls; then
@@ -45,17 +58,19 @@
 		I18N="--disable-i18n"
 	fi
 
-	# We install all desktop files by hand and Qt3 is deprecated
-	econf \
-		--disable-desktopfiles \
-		--without-qt \
+	# We install all desktop files by hand.
+	econf --disable-desktopfiles \
+		$(use_with qt3 qt) \
 		$(use_enable xml xmltools) \
 		$(use_with jpeg) \
 		$(use_with tiff) \
 		"${I18N}" \
-		$(use_enable debug)
+		$(use_enable debug) \
+		${QTCONF}
 
-	sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
+	if ! use nsplugin; then
+		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
+	fi
 
 	emake || die "emake failed"
 }
@@ -78,6 +93,11 @@
 		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
+
+	if use qt3 ; then
+		insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png || die
+		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop || die
+	fi
 }
 
 pkg_postinst() {



1.99                 app-text/djvu/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?r1=1.98&r2=1.99

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog	5 Jan 2010 03:08:54 -0000	1.98
+++ ChangeLog	18 Jan 2010 10:05:45 -0000	1.99
@@ -1,6 +1,9 @@
 # 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.98 2010/01/05 03:08:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.99 2010/01/18 10:05:45 pva Exp $
+
+  18 Jan 2010; Peter Volkov <pva@gentoo.org> djvu-3.5.22.ebuild:
+  Revert qt3 drop, nsplugin should stay.
 
   05 Jan 2010; Ben de Groot <yngwin@gentoo.org>
   djvu-3.5.21_p20090103.ebuild, djvu-3.5.22.ebuild:






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/djvu: djvu-3.5.22.ebuild ChangeLog
@ 2010-01-25 13:32 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-01-25 13:32 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/01/25 13:32:05

  Modified:             djvu-3.5.22.ebuild ChangeLog
  Log:
  Require SLOT="0" of media-libs/jpeg for headers.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  app-text/djvu/djvu-3.5.22.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild?r1=1.5&r2=1.6

Index: djvu-3.5.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- djvu-3.5.22.ebuild	18 Jan 2010 10:05:45 -0000	1.5
+++ djvu-3.5.22.ebuild	25 Jan 2010 13:32:04 -0000	1.6
@@ -1,6 +1,6 @@
 # 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.22.ebuild,v 1.5 2010/01/18 10:05:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.6 2010/01/25 13:32:04 ssuominen Exp $
 
 EAPI=1
 inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
@@ -16,7 +16,7 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc"
 
-RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2:0 )
 	tiff? ( media-libs/tiff )
 	qt3? ( x11-libs/qt:3 )"
 DEPEND="${RDEPEND}



1.100                app-text/djvu/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/djvu/ChangeLog?r1=1.99&r2=1.100

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog	18 Jan 2010 10:05:45 -0000	1.99
+++ ChangeLog	25 Jan 2010 13:32:04 -0000	1.100
@@ -1,6 +1,9 @@
 # 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.99 2010/01/18 10:05:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.100 2010/01/25 13:32:04 ssuominen Exp $
+
+  25 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> djvu-3.5.22.ebuild:
+  Require SLOT="0" of media-libs/jpeg for headers.
 
   18 Jan 2010; Peter Volkov <pva@gentoo.org> djvu-3.5.22.ebuild:
   Revert qt3 drop, nsplugin should stay.






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-01-25 13:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-25 13:32 [gentoo-commits] gentoo-x86 commit in app-text/djvu: djvu-3.5.22.ebuild ChangeLog Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2010-01-18 10:05 Peter Volkov (pva)
2009-10-09 18:24 Patrick Lauer (patrick)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox