* [gentoo-commits] gentoo-x86 commit in kde-base/marble: marble-4.0.1.ebuild ChangeLog
@ 2008-02-18 16:28 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 2+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-02-18 16:28 UTC (permalink / raw
To: gentoo-commits
ingmar 08/02/18 16:28:23
Modified: marble-4.0.1.ebuild ChangeLog
Log:
Addded a kde USE-flag to compile without KDE.
(Portage version: 2.1.4.4)
Revision Changes Path
1.2 kde-base/marble/marble-4.0.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?r1=1.1&r2=1.2
Index: marble-4.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- marble-4.0.1.ebuild 7 Feb 2008 00:10:58 -0000 1.1
+++ marble-4.0.1.ebuild 18 Feb 2008 16:28:22 -0000 1.2
@@ -1,10 +1,11 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v 1.1 2008/02/07 00:10:58 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v 1.2 2008/02/18 16:28:22 ingmar Exp $
EAPI="1"
-
+NEED_KDE="none"
KMNAME=kdeedu
+SLOT="kde-4" # Goes in the ebuild because of NEED_KDE=none
inherit kde4-meta
DESCRIPTION="KDE: generic geographical map widget"
@@ -13,11 +14,13 @@
# FIXME: undefined reference when building tests. RESTRICTed for now.
RESTRICT="test"
-# FIXME: marble can install without kdelibs. there should be USE=kde for this..
-COMMONDEPEND="gps? ( sci-geosciences/gpsd )"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+COMMONDEPEND="
+ gps? ( sci-geosciences/gpsd )
+ kde? ( >=kde-base/kdelibs-${PV}:${SLOT}
+ >=kde-base/kdepimlibs-${PV}:${SLOT} )"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}"
src_compile() {
epatch "${FILESDIR}/${PN}-4.0.0-fix-tests.patch"
@@ -32,6 +35,10 @@
marble/Findlibgps.cmake || die "sed to disable gpsd failed."
fi
+ if ! use kde; then
+ mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON"
+ fi
+
kde4-meta_src_compile
}
1.5 kde-base/marble/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?r1=1.4&r2=1.5
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 17 Feb 2008 02:33:09 -0000 1.4
+++ ChangeLog 18 Feb 2008 16:28:22 -0000 1.5
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/marble
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.4 2008/02/17 02:33:09 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.5 2008/02/18 16:28:22 ingmar Exp $
+
+ 18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> marble-4.0.1.ebuild:
+ Addded a kde USE-flag to compile without KDE.
16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -marble-4.0.0.ebuild:
Spring cleaning
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/marble: marble-4.0.1.ebuild ChangeLog
@ 2008-02-18 18:01 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 2+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-02-18 18:01 UTC (permalink / raw
To: gentoo-commits
ingmar 08/02/18 18:01:13
Modified: marble-4.0.1.ebuild ChangeLog
Log:
Set KDEDIR.
(Portage version: 2.1.4.4)
Revision Changes Path
1.3 kde-base/marble/marble-4.0.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?r1=1.2&r2=1.3
Index: marble-4.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- marble-4.0.1.ebuild 18 Feb 2008 16:28:22 -0000 1.2
+++ marble-4.0.1.ebuild 18 Feb 2008 18:01:12 -0000 1.3
@@ -1,11 +1,12 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v 1.2 2008/02/18 16:28:22 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v 1.3 2008/02/18 18:01:12 ingmar Exp $
EAPI="1"
NEED_KDE="none"
KMNAME=kdeedu
SLOT="kde-4" # Goes in the ebuild because of NEED_KDE=none
+KDEDIR="/usr/kde/4.0"
inherit kde4-meta
DESCRIPTION="KDE: generic geographical map widget"
1.6 kde-base/marble/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 18 Feb 2008 16:28:22 -0000 1.5
+++ ChangeLog 18 Feb 2008 18:01:12 -0000 1.6
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/marble
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.5 2008/02/18 16:28:22 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.6 2008/02/18 18:01:12 ingmar Exp $
+
+ 18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> marble-4.0.1.ebuild:
+ Set KDEDIR.
18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> marble-4.0.1.ebuild:
Addded a kde USE-flag to compile without KDE.
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-18 18:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-18 18:01 [gentoo-commits] gentoo-x86 commit in kde-base/marble: marble-4.0.1.ebuild ChangeLog Ingmar Vanhassel (ingmar)
-- strict thread matches above, loose matches on Subject: below --
2008-02-18 16:28 Ingmar Vanhassel (ingmar)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox