summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2008-10-02 11:25:43 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2008-10-02 11:25:43 +0000
commit6d39a1a7e36eb5b6227cc3385ebe0693ab363d66 (patch)
treec7b9c4bba3cbee84e92c0f66aab6ee2d28504842 /kde-base/marble
parentalpha/ia64 stable wrt #170220 (diff)
downloadhistorical-6d39a1a7e36eb5b6227cc3385ebe0693ab363d66.tar.gz
historical-6d39a1a7e36eb5b6227cc3385ebe0693ab363d66.tar.bz2
historical-6d39a1a7e36eb5b6227cc3385ebe0693ab363d66.zip
Add kde-4.1.2 into the tree from the kde-testing overlay.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'kde-base/marble')
-rw-r--r--kde-base/marble/ChangeLog8
-rw-r--r--kde-base/marble/marble-4.1.2.ebuild62
-rw-r--r--kde-base/marble/metadata.xml8
3 files changed, 73 insertions, 5 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index b2d636cd4707..dd7f26e62708 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,12 @@
# 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.14 2008/06/09 15:19:45 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.15 2008/10/02 11:03:18 jmbsvicetto Exp $
+
+*marble-4.1.2 (02 Oct 2008)
+
+ 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ metadata.xml, +marble-4.1.2.ebuild:
+ Add kde-4.1.2 into the tree from the kde-testing overlay.
09 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> -marble-4.0.2.ebuild,
-marble-4.0.3.ebuild:
diff --git a/kde-base/marble/marble-4.1.2.ebuild b/kde-base/marble/marble-4.1.2.ebuild
new file mode 100644
index 000000000000..b55d35a4b3f0
--- /dev/null
+++ b/kde-base/marble/marble-4.1.2.ebuild
@@ -0,0 +1,62 @@
+# 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.1.2.ebuild,v 1.1 2008/10/02 11:03:18 jmbsvicetto Exp $
+EAPI="2"
+NEED_KDE="none"
+KMNAME=kdeedu
+
+if use kdeprefix; then
+ KDEDIR="/usr/kde/4.1"
+else
+ KDEDIR="/usr"
+fi
+CPPUNIT_REQUIRED="optional"
+
+# Goes in the ebuild because of NEED_KDE=none
+# Needs to be defined before inheriting kde4-meta
+SLOT="4.1"
+
+inherit kde4-meta
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug designer-plugin htmlhandbook kde gps"
+
+# FIXME: undefined reference when building tests. RESTRICTed for now.
+# Last checked in 4.0.3.
+RESTRICT="test"
+
+COMMONDEPEND="gps? ( sci-geosciences/gpsd )
+ kde? ( >=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=]
+ >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
+ !kdeprefix? ( !sci-geosciences/marble )"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}"
+
+src_configure() {
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
+
+ sed -i -e "s:add_subdirectory(cmake):#dontwantit:g" CMakeLists.txt \
+ || die "disabling cmake includes failed"
+ sed -i -e "s:add_subdirectory( cmake ):#dontwantit:g" CMakeLists.txt \
+ || die "disabling cmake includes failed"
+
+ if use gps; then
+ mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
+ else
+ sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
+ marble/Findlibgps.cmake || die "sed to disable gpsd failed."
+ fi
+
+ if ! use kde; then
+ mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON"
+ fi
+
+ kde4-meta_src_configure
+}
+
+src_test() {
+ mycmakeargs="${mycmakeargs} -DENABLE_TESTS=TRUE"
+ kde4-meta_src_test
+}
diff --git a/kde-base/marble/metadata.xml b/kde-base/marble/metadata.xml
index 61c0cfbfe401..5c6e78a977ba 100644
--- a/kde-base/marble/metadata.xml
+++ b/kde-base/marble/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <use>
- <flag name="designer-plugin">Enable designer plugin</flag>
- </use>
+<use>
+ <flag name="designer-plugin">Enable designer plugin</flag>
+</use>
+<herd>kde</herd>
</pkgmetadata>