summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-07-04 15:39:04 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-07-04 15:39:04 +0000
commitabff8aaf57987f12717098664ffee8d1b276d301 (patch)
treea7d400b488521777cad2bf49c9523a35a4f74ed2 /app-text/djview4
parentversion bump, add a note to the 0.47 ebuilds that local configuration files a... (diff)
downloadgentoo-2-abff8aaf57987f12717098664ffee8d1b276d301.tar.gz
gentoo-2-abff8aaf57987f12717098664ffee8d1b276d301.tar.bz2
gentoo-2-abff8aaf57987f12717098664ffee8d1b276d301.zip
Adjust the deps on qt4. Bit format the deps.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'app-text/djview4')
-rw-r--r--app-text/djview4/ChangeLog5
-rw-r--r--app-text/djview4/djview4-4.5.ebuild24
2 files changed, 20 insertions, 9 deletions
diff --git a/app-text/djview4/ChangeLog b/app-text/djview4/ChangeLog
index 55c9991c4135..b7a7bed1fca5 100644
--- a/app-text/djview4/ChangeLog
+++ b/app-text/djview4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/djview4
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.13 2009/06/04 14:14:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.14 2009/07/04 15:39:04 scarabeus Exp $
+
+ 04 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> djview4-4.5.ebuild:
+ Adjust the deps on qt4. Bit format the deps.
*djview4-4.5 (04 Jun 2009)
diff --git a/app-text/djview4/djview4-4.5.ebuild b/app-text/djview4/djview4-4.5.ebuild
index e4e22852df64..3ef3624afa2e 100644
--- a/app-text/djview4/djview4-4.5.ebuild
+++ b/app-text/djview4/djview4-4.5.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/djview4/djview4-4.5.ebuild,v 1.2 2009/06/05 16:16:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.5.ebuild,v 1.3 2009/07/04 15:39:04 scarabeus Exp $
EAPI=2
@@ -12,20 +12,28 @@ 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="~amd64 ~ppc64 ~x86"
+SLOT="0"
IUSE="debug"
-RDEPEND=">=app-text/djvu-3.5.19
- || ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2:4 )"
+RDEPEND="
+ >=app-text/djvu-3.5.19
+ x11-libs/qt-gui:4
+"
DEPEND="${RDEPEND}
- dev-util/pkgconfig"
+ dev-util/pkgconfig
+"
S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
src_configure() {
- QTDIR=/usr econf $(use_enable debug) \
+ # QTDIR is needed because of kde3
+ QTDIR=/usr \
+ econf \
+ $(use_enable debug) \
+ --with-x \
--disable-nsdejavu \
- --disable-desktopfiles || die "econf failed"
+ --disable-desktopfiles
}
src_compile() {
@@ -37,7 +45,7 @@ src_install() {
#remove conflicting symlinks
rm -f "${D}/usr/bin/djview" "${D}/usr/share/man/man1/djview.1"
- dodoc README TODO NEWS
+ dodoc README TODO NEWS || die "dodoc failed"
cd desktopfiles
insinto /usr/share/icons/hicolor/32x32/apps