diff options
Diffstat (limited to 'kde-base/marble')
| -rw-r--r-- | kde-base/marble/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/marble/Manifest | 10 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.0.1.ebuild | 19 |
3 files changed, 22 insertions, 12 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog index e1e39a07a53f..cb0526a8fb8d 100644 --- a/kde-base/marble/ChangeLog +++ b/kde-base/marble/ChangeLog @@ -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 diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest index 7685dcc4f05d..e0333a7e03e2 100644 --- a/kde-base/marble/Manifest +++ b/kde-base/marble/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 AUX marble-4.0.0-fix-tests.patch 387 RMD160 027940172b552edf909e60e6418f2ef3cb639eaf SHA1 039e91f2f05e972f87a464d1d13ce074ccde7d3d SHA256 809db4563e9689c7ff34a4f41c01bd092f24dcf224222688e8cb36e1d1083d8f DIST kdeedu-4.0.1.tar.bz2 42162898 RMD160 ef2cfcad6280a748dd1e6e5c953f9409a394ce63 SHA1 d192bd457ecac281a599b0ab6862e258a9d574e2 SHA256 73d48a4c9d2eb22c9df52065566f98aab7e2e2a1a4db26ea57a0378c86e41ac8 -EBUILD marble-4.0.1.ebuild 1158 RMD160 1f4186084968ad88e6752cd0ce1334cd0544a8a7 SHA1 5d6892f51956c5ca3fc1707899889280f0abbc6c SHA256 1d170a60585a4443debc8d1eaa1b375c7efb5ba7717cf8a34e64a6638425555d -MISC ChangeLog 721 RMD160 77e92321d4709e8b2649f289bd403aa87ecbdb60 SHA1 27ee721c3c099d180f3f7071d7e71513a548122e SHA256 23c8cd1438cba58f00180685915776e375f5a7db20ed679a7f985fc146ab36c2 +EBUILD marble-4.0.1.ebuild 1283 RMD160 514ebafe8f44609ff7c2d64a117cc6d74b619a08 SHA1 1f8fa67139d0790f53684b5c30b953950f885dbb SHA256 20269d470c426c2ed18cb3817e7ba2f05d0ec88a39b24424a5648e3d2623f659 +MISC ChangeLog 843 RMD160 54d8f856e0186101e28e46ee0b9f5d9c7c92f921 SHA1 1e6f900cf6a1498791315558402ba474e5a631eb SHA256 3eb630c4e3fbb2fb48cf839dc95a9a5002664c6e9b1ab86ba2c0064b0fa97303 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHt5zKB18eXLOpYdkRAvSYAKCukp3hth3STHPeJJBp0g7DgOL1GACfRkMb -cx2tivv6bpPPQ5CtHNfnS8k= -=zb6A +iD8DBQFHubH2B18eXLOpYdkRAlEjAJ0dKqdrVU6OhjhtfuvpK6cKyi8jggCeJBdT +9LDqaJk1lQQqFQiC31E6sK0= +=sD1n -----END PGP SIGNATURE----- diff --git a/kde-base/marble/marble-4.0.1.ebuild b/kde-base/marble/marble-4.0.1.ebuild index 24341bced4f4..9e186a1e2e1d 100644 --- a/kde-base/marble/marble-4.0.1.ebuild +++ b/kde-base/marble/marble-4.0.1.ebuild @@ -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 @@ IUSE="debug designer-plugin htmlhandbook gps test" # 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 @@ src_compile() { marble/Findlibgps.cmake || die "sed to disable gpsd failed." fi + if ! use kde; then + mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON" + fi + kde4-meta_src_compile } |