summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-01-08 13:06:56 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-01-08 13:06:56 +0000
commite099b85a16d288aeab9aaa26b3f142e946bcadf1 (patch)
treeabbedeb82c7e3733d632a0c945a7327900248f0b /x11-misc/vym
parentImprove --as-needed patch so that it works with examples and other packages l... (diff)
downloadgentoo-2-e099b85a16d288aeab9aaa26b3f142e946bcadf1.tar.gz
gentoo-2-e099b85a16d288aeab9aaa26b3f142e946bcadf1.tar.bz2
gentoo-2-e099b85a16d288aeab9aaa26b3f142e946bcadf1.zip
modular depends, bug 118241
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-misc/vym')
-rw-r--r--x11-misc/vym/ChangeLog5
-rw-r--r--x11-misc/vym/vym-1.7.0.ebuild21
2 files changed, 11 insertions, 15 deletions
diff --git a/x11-misc/vym/ChangeLog b/x11-misc/vym/ChangeLog
index 290f79607f05..b6170992664a 100644
--- a/x11-misc/vym/ChangeLog
+++ b/x11-misc/vym/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/vym
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.7 2006/01/07 18:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.8 2006/01/08 13:06:56 genstef Exp $
+
+ 08 Jan 2006; Stefan Schweizer <genstef@gentoo.org> vym-1.7.0.ebuild:
+ modular depends, bug 118241
07 Jan 2006; Carsten Lohrke <carlo@gentoo.org> vym-1.7.0.ebuild:
QA: need-qt() needs to be called after R/DEPEND.
diff --git a/x11-misc/vym/vym-1.7.0.ebuild b/x11-misc/vym/vym-1.7.0.ebuild
index 35ca1d1b34bc..385e4d39286d 100644
--- a/x11-misc/vym/vym-1.7.0.ebuild
+++ b/x11-misc/vym/vym-1.7.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.7.0.ebuild,v 1.2 2006/01/07 18:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.7.0.ebuild,v 1.3 2006/01/08 13:06:56 genstef Exp $
-inherit eutils kde-functions
+inherit eutils qt3
DESCRIPTION="View Your Mind -- a mindmap tool"
HOMEPAGE="http://www.insilmaril.de/vym/"
@@ -11,18 +11,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
-DEPEND="virtual/x11 \
- >=dev-libs/expat-1.95.8 \
- >=media-libs/fontconfig-2.2.3 \
- >=media-libs/freetype-2.1.5-r1 \
- >=media-libs/jpeg-6b-r4 \
- >=media-libs/libmng-1.0.4 \
- >=media-libs/libpng-1.2.7 \
- >=sys-devel/gcc-3.3.4-r1 \
- >=sys-libs/glibc-2.3.4.20040808-r1 \
- >=sys-libs/zlib-1.2.1-r3 \
+DEPEND="$(qt_min_version 3.3.3)
dev-lang/perl"
-need-qt 3
+RDEPEND="${DEPEND}
+ || ( ( x11-libs/libX11
+ x11-libs/libXext )
+ virtual/x11 )"
src_unpack() {
unpack ${A}
@@ -34,7 +28,6 @@ src_unpack() {
}
src_compile() {
-
${QTDIR}/bin/qmake -o Makefile vym.pro
emake || die "emake failed"