Version bump. Set proper depend on x11-libs/qt-gui[dbus] (bug #420907).

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 106 insertions, 5 deletions

diff --git a/app-text/djview/ChangeLog b/app-text/djview/ChangeLog
index 53c8bb02c68c..9306e5a4fe06 100644
--- a/app-text/djview/ChangeLog
+++ b/app-text/djview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/ChangeLog,v 1.14 2012/06/07 18:47:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/ChangeLog,v 1.15 2012/08/20 23:43:23 jer Exp $
+
+*djview-4.9 (20 Aug 2012)
+
+  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> djview-4.8.ebuild,
+  +djview-4.9.ebuild:
+  Version bump. Set proper depend on x11-libs/qt-gui[dbus] (bug #420907).
 
   07 Jun 2012; Brent Baude <ranger@gentoo.org> djview-4.8.ebuild:
   Marking djview-4.8 ppc for bug 414369
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 28f098485bc9..ee1b7daabf36 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX djview-4.8-qt48.patch 1580 SHA256 11bbbc18025218f0f29631903fbe569fff69dff8a4c558b4621e438bad219332 SHA512 803906c6874557689c81ebe3758fa25dd18dfda7b33b0685112f5cfd86a80614476c094df52dac7be788687a77819f8466ff580b47cb9d58a4eed60d33f0664b WHIRLPOOL 51580693d2c6e7cb117b44799b016e007daaa6bcb3186c3528f7367087b8fb0a65f15e4e0382980b2d36736f8aee36d8b07b179045d64fc866f8789c0c1019e2
 DIST djview-4.7.tar.gz 876307 SHA256 2c5df0f96031e2f4b1b1c05728396e918a404f715f981da7ab6fbb0ee7c8ef2d SHA512 312abbe02dcef49e8deb7251a333efdfbcbdbd7aab31e2a0037cbd20acab148bb05a31b9fb1020fb825cafe6b6ca9509740970ff1bc2ea7931c98ae5070f24ec WHIRLPOOL e56d24ad87a5468208a3d0002d006662732533224ac020b4a909ce9ddc79a45f773bdb9ecf5b2c09fc8084961f0b398d77c3e47d6a35d4d0512951a45e740892
 DIST djview-4.8.tar.gz 883481 SHA256 8c746e7c2945ca6e08046b49d0d0aeca95d389d82365cd71111025b9d796c89f SHA512 21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c WHIRLPOOL 028f2d865c03e61cc341bcea368f2b3cc4689108d0ceabbc6830cb1f1160f444838125a8551576c50cffc6908ca8dd791527bbf5eb3d5bacc9bcd965c9d9eb69
+DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
 EBUILD djview-4.7.ebuild 1965 SHA256 e4aee85ee3261fa576fda25b4595155fa2cb99e61e6c432539c0e9660f3513b0 SHA512 1eaa111dbb404790afe7b0953c83e9334f27b031f613237df0731b6b04a7c457fbb5ae4d2146a50b73d762dbc4087710e19677fa0d8a553595c6d11551d33095 WHIRLPOOL 14af8bbee55ae0ca97f8364ba8468de9aa180e274114e9cf9c48e3c13f5f117f82651f5670f7b05178a7866b3f74816cf84995ad3bc129f8d52c037a42dde10f
-EBUILD djview-4.8.ebuild 2114 SHA256 f49bc00d710a50a6ac91364b917307b4514163d15ad9f910a93a365a3f5126f4 SHA512 802d788a1653b9092c726a3f024a1793ab079b1cf0b088fdd3fab5aa7b5b972087ede951689d2a010c7ff7fa1362b4c448f1ec17b0d1ae155702e3601f5cd96e WHIRLPOOL d8d33280de5f5c19d9f0f355d2a405bc97adff8e64ef9608c5cb5083ec8d48b96126361d0241a4a4a46c16636e38ef55d28eb63c2c50e38ae982d2eb3f7dbc4c
-MISC ChangeLog 1987 SHA256 c1be7bdacdf41b17c027f3087df3a5da2ece0890a9c4320584fa8ea4b0390c31 SHA512 619ab75f5fa05f6cc8392b3dbd550a87475dfcd111a56cebf52232cfef10457f23ca69511e04f11af8295befb8f66bb97be7aa27a27896f19485a85b463c8ed7 WHIRLPOOL ceb00741de8b6a11ef77f335131cfea63cd82575c2d717fe24facd12a3791b3fe6539937e9adf7953fec1d1ddc3c927e913402aa15e13a5534a77b61291be294
+EBUILD djview-4.8.ebuild 2117 SHA256 db29462e5abfc8440fb4af4540c7403687af7238c3a0f7d397bd20459a4064b1 SHA512 058da371b3765a40f1190b1b15bd9a542d4659eb30c24207f13f9078af5c756dc774027bde3ae0b8f39c1154be654e0926792ce8af430462dd9cc5f3efe7dbdf WHIRLPOOL 15bb84edef591c666d887bb56fa916a8cd920446c515a34c3a5e9b04e8df72e6d18519b2280d6f5a311db1e3d50683747cf5dba1ff15a9bfb263cb5f0aa215d3
+EBUILD djview-4.9.ebuild 2047 SHA256 19e7478f0047cabfeaf12392da6c98ecd5cc0515fe2f16cf0e069ee77e68ab66 SHA512 ad21789e9fe3c0e5566430d36be6048267fe22692acd5820fb456ae104cfc082456f07a0f94682a2a0ed4f4ed21724c1ee51896ad85a39128b9ad209f9b522a7 WHIRLPOOL e61c867bd4fd1650c12f608d624020d4fbd67f11f6b60505b660cc7a3b87427f50a9493a2ec0ecdc960e484d3c1058db7164d16462cd32dad06014c02064a57b
+MISC ChangeLog 2174 SHA256 8105021d81d39c7bf9d713bb730d7fd25ef6fe8c11eaadac250794cc690f574d SHA512 a2983e6c46e3ff6c06082cfe63b48a6e96454b8543651762a775eb3be7c8e969a805687627b35378db32774dedee44c79c8727c8bfc316171316d6992db1c9f7 WHIRLPOOL 8ef6f116cfa05fb8f30cf1213b091d01f2443a90731827581678b2888f008ff080b014623fd13ecc3c9b9d40904710dc8bd80ef1f17c2a913bce5174f603660f
 MISC metadata.xml 241 SHA256 674b443e9f1d7bd038d429926e64c40165401c5347f9a6e9ecb1be33c0e8ab93 SHA512 45f88f3e164fb9aa32ab947c4fb24836754e2688a96fb2fc888babd1cf5a387fe3f71908cc45b8733806b25113e9f47c279b9de24ef16046398b80a94a061e93 WHIRLPOOL 0aa8dca5f50c70c94f52e677feac60683e9c124dd876f191e345465661ae23dbd4b1eeffac4da0cb54746687491fefb58b69b056b119fad13e6ae33226bda631
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAyy6EACgkQVWmRsqeSphMfOwCeK6tbkf90JvKweRBgGgUDwY8O
+0g4An0GY8qDMY3kr5kDw6fG60CHlsPOP
+=amuI
+-----END PGP SIGNATURE-----
diff --git a/app-text/djview/djview-4.8.ebuild b/app-text/djview/djview-4.8.ebuild
index ca79d1ec51ed..f6ed621f2c38 100644
--- a/app-text/djview/djview-4.8.ebuild
+++ b/app-text/djview/djview-4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.7 2012/06/07 18:47:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.8 2012/08/20 23:43:23 jer Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ IUSE="debug nsplugin"
 
 RDEPEND="
 	>=app-text/djvu-3.5.22-r1
-	x11-libs/qt-gui:4"
+	x11-libs/qt-gui:4[dbus]"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.67
 	virtual/pkgconfig
diff --git a/app-text/djview/djview-4.9.ebuild b/app-text/djview/djview-4.9.ebuild
new file mode 100644
index 000000000000..f98658ed6867
--- /dev/null
+++ b/app-text/djview/djview-4.9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.9.ebuild,v 1.1 2012/08/20 23:43:23 jer Exp $
+
+EAPI=4
+
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	x11-libs/qt-gui:4[dbus]"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+S=${WORKDIR}/${PN}4-${PV}
+
+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 \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	dodoc README NEWS
+
+	cd desktopfiles
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins hi32-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/64x64/apps
+	newins hi64-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/scalable/apps
+	newins djview.svg djvulibre-djview4.svg
+	domenu djvulibre-djview4.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}