Use nsplugin instead of one in djvu, bug #245841, thank A.C.Heron for report. Respect CFLAGS.

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

4 files changed, 89 insertions, 3 deletions

diff --git a/app-text/djview4/ChangeLog b/app-text/djview4/ChangeLog
index 15a2ed1ef6e0..cd0145ca1463 100644
--- a/app-text/djview4/ChangeLog
+++ b/app-text/djview4/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2010/01/06 20:24:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.23 2010/02/01 07:35:30 pva Exp $
+
+*djview4-4.5-r1 (01 Feb 2010)
+
+  01 Feb 2010; Peter Volkov <pva@gentoo.org> +djview4-4.5-r1.ebuild,
+  metadata.xml:
+  Use nsplugin instead of one in djvu, bug #245841, thank A.C.Heron for
+  report. Respect CFLAGS.
 
   06 Jan 2010; Brent Baude <ranger@gentoo.org> djview4-4.5.ebuild:
   Marking djview4-4.5 ppc64 for bug 287316
diff --git a/app-text/djview4/Manifest b/app-text/djview4/Manifest
index c7df71bddf32..6e8a1ab099ce 100644
--- a/app-text/djview4/Manifest
+++ b/app-text/djview4/Manifest
@@ -1,4 +1,5 @@
 DIST djview4-4.5.tar.gz 895611 RMD160 256abad9cc6d661ba19caf209b74d9937eec4bce SHA1 d2fd259aa88f80393767f6dec921463da7820143 SHA256 8dc1d8013d51d4026a05d7ef4289c4c9b27de9d9b7d6bf960e4a9636b3b71276
+EBUILD djview4-4.5-r1.ebuild 1917 RMD160 33b0db9e9933ac8d26c654df129d4cb6e847b14d SHA1 c945489ca885ce9c52ddaad35ae60ed9b114f50c SHA256 9694c0c4e86b83350b574d9b3452b56d31bcc51573c643a9816faee892b6a1fb
 EBUILD djview4-4.5.ebuild 1518 RMD160 2141750c2645479ca8c1dc8c8e891bbfa13eb6ad SHA1 da584df30940b96b6760fcd4704e347dec5607d5 SHA256 7643d6ea0c568acca947544449532a2ad92c2cf07cea96713a9a336b6fd43e5e
-MISC ChangeLog 2855 RMD160 9ca11442a8d0020e3524aca10b543f422ba4c231 SHA1 d11364ad07b62a1bbac53fd0fb4cdfd97fc56055 SHA256 a3ee7ef752d9d49be19457ae85a4501d751b8e5e0b33b9ee678bbe47ad6f61be
-MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+MISC ChangeLog 3067 RMD160 823bf20d67075d68f0f987bd35ac1d1e815cc01e SHA1 67c4980cc38338d3a68309c86294387e200ccd1c SHA256 04afa9e791547ff74b236c2f834ff9884b75c229e2c9a9e09386f68eb15b7e1c
+MISC metadata.xml 241 RMD160 82bb30f2baae19cecf35e2619cf41501c4b93c0f SHA1 23319951328fb53159640f97e84a8109eef97220 SHA256 674b443e9f1d7bd038d429926e64c40165401c5347f9a6e9ecb1be33c0e8ab93
diff --git a/app-text/djview4/djview4-4.5-r1.ebuild b/app-text/djview4/djview4-4.5-r1.ebuild
new file mode 100644
index 000000000000..eb630a3098bb
--- /dev/null
+++ b/app-text/djview4/djview4-4.5-r1.ebuild
@@ -0,0 +1,74 @@
+# 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-r1.ebuild,v 1.1 2010/02/01 07:35:30 pva Exp $
+
+EAPI=2
+
+inherit autotools versionator qt4 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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=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)
+
+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,ltmain.sh,install-sh}
+	AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+	# See config/acinclude.m4
+	use debug || append-cppflags "-DNDEBUG"
+
+	# QTDIR is needed because of kde3
+	QTDIR=/usr \
+	econf \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install || die "emake install failed"
+
+	dodoc README TODO NEWS || die "dodoc failed"
+
+	cd desktopfiles
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins hi32-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/scalable/apps
+	newins djview.svg djvulibre-djview4.svg
+	domenu djvulibre-djview4.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/djview4/metadata.xml b/app-text/djview4/metadata.xml
index ba6a8a8800d5..17b5cf25f02e 100644
--- a/app-text/djview4/metadata.xml
+++ b/app-text/djview4/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>tex</herd>
+<maintainer>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+</maintainer>
 </pkgmetadata>