summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-03-17 08:07:48 +0000
committerPeter Volkov <pva@gentoo.org>2009-03-17 08:07:48 +0000
commitc3eb36b85a0022627f373f96fd58c2edcf2ad5f0 (patch)
treebc5a578bf2b873115600f801fe6ced1f750e2fbc /app-text/djvu
parentMask =gnome-session-2.24* and stuff that directly or indirectly needs itReaso... (diff)
downloadhistorical-c3eb36b85a0022627f373f96fd58c2edcf2ad5f0.tar.gz
historical-c3eb36b85a0022627f373f96fd58c2edcf2ad5f0.tar.bz2
historical-c3eb36b85a0022627f373f96fd58c2edcf2ad5f0.zip
Don't make threads optional as it's debugging feature: https://sourceforge.net/tracker/?func=detail&atid=406583&aid=2689112&group_id=32953 , fixes bug #250719, thank David Radice for report.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'app-text/djvu')
-rw-r--r--app-text/djvu/ChangeLog7
-rw-r--r--app-text/djvu/Manifest4
-rw-r--r--app-text/djvu/djvu-3.5.21_p20090103.ebuild14
3 files changed, 11 insertions, 14 deletions
diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 843bf9d38185..30662832d20c 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -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.88 2009/01/20 19:00:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.89 2009/03/17 08:07:48 pva Exp $
+
+ 17 Mar 2009; Peter Volkov <pva@gentoo.org> djvu-3.5.21_p20090103.ebuild:
+ Don't make threads optional as it's debugging feature:
+ https://sourceforge.net/tracker/?func=detail&atid=406583&aid=2689112&group
+ _id=32953 , fixes bug #250719, thank David Radice for report.
*djvu-3.5.21_p20090103 (20 Jan 2009)
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index f037100011a9..713fd9660ed2 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -7,6 +7,6 @@ DIST djvulibre-3.5.21.tar.gz 2993718 RMD160 2163b784d705cc7b55bb3d9c9eb85edec44f
EBUILD djvu-3.5.19.ebuild 3295 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 SHA1 965f1fc093303026bba9eaf4829e1438ed84f898 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce
EBUILD djvu-3.5.20-r1.ebuild 3524 RMD160 f9d14a06cdb2f57eeb4f41ff1ca3de87656551f1 SHA1 b9cdaec5cb6decb40a2d0aa49f639e71bc0dfef2 SHA256 b9ea8ac19f23d61e8db831eff08af6bae3b1c33f83880ce397ef0d9c8de8bc04
EBUILD djvu-3.5.21.ebuild 3327 RMD160 98f91477ad1eb10d1ddb434726eef015c21bac8a SHA1 895d1553ebb388e32f5b08dfcf4c15eab7afdc8f SHA256 80a93fd443611de1a5f8da5cb7989cc94007a44f60e9d6d59b54441f02de5c1e
-EBUILD djvu-3.5.21_p20090103.ebuild 3231 RMD160 a401de55ce95aa023673743bbbe184348d3d44d8 SHA1 c297c45756a216f60881b976e58c724c6284ed91 SHA256 b966689496c50118148399634e4843bc28cd52f1ec2d0d35cf885960d60e7ffd
-MISC ChangeLog 11358 RMD160 a2b0e0614e7c166691e290fcc031863a684491bf SHA1 67e74700a7d296f6bab6cb6269e627ac37d73362 SHA256 9b34c4aee4cbd2abedcdeabb72abdf110dafc790b3ab3062faff9a9f3ec0dc84
+EBUILD djvu-3.5.21_p20090103.ebuild 2960 RMD160 b2697b4423dce543a3ada8a92254e397e333ab8b SHA1 b8fce958897735e363ff4926396fd6db2676d32a SHA256 105575d77ab0f4eaba8df14643ef02ac67b4e3399585a1d5130b0ae087de05aa
+MISC ChangeLog 11632 RMD160 9663fb0e62e04584e01341949b5c04b80d4fe530 SHA1 f2945de41827a2949f32f078b95f80c25853ab57 SHA256 9e40bade974cc731b3a68f46ce0639bad6ecb17194b31e0925023644b612ebf7
MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
diff --git a/app-text/djvu/djvu-3.5.21_p20090103.ebuild b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
index 7e24e90bf671..25fcac18920c 100644
--- a/app-text/djvu/djvu-3.5.21_p20090103.ebuild
+++ b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
@@ -1,6 +1,6 @@
# 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.21_p20090103.ebuild,v 1.1 2009/01/20 18:38:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.2 2009/03/17 08:07:48 pva Exp $
EAPI=1
inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
@@ -14,7 +14,7 @@ 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 threads nls nsplugin kde doc"
+IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc"
RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
tiff? ( media-libs/tiff )
@@ -58,17 +58,9 @@ src_compile() {
I18N="--disable-i18n"
fi
- # When enabling qt it must be compiled with threads. See bug #89544.
- if use qt3 ; then
- QTCONF=" --with-qt --enable-threads "
- elif use threads ; then
- QTCONF=" --without-qt --disable-djview --enable-threads "
- else
- QTCONF=" --without-qt --disable-djview --disable-threads "
- 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) \