Bump KDE 4.2.1

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 78 insertions, 1 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 4e74ff88f5a8..9ba8c6112853 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.23 2009/02/17 14:31:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.24 2009/03/04 22:47:26 alexxy Exp $
+
+*marble-4.2.1 (04 Mar 2009)
+
+  04 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> +marble-4.2.1.ebuild:
+  Bump KDE 4.2.1
 
   17 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> -marble-4.1.4.ebuild:
   Drop KDE 4.1.4
diff --git a/kde-base/marble/marble-4.2.1.ebuild b/kde-base/marble/marble-4.2.1.ebuild
new file mode 100644
index 000000000000..96cda2e7bbf9
--- /dev/null
+++ b/kde-base/marble/marble-4.2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.2.1.ebuild,v 1.1 2009/03/04 22:47:26 alexxy Exp $
+
+EAPI="2"
+
+KMNAME="kdeedu"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug designer-plugin +kde gps plasma python"
+
+DEPEND="
+	gps? ( sci-geosciences/gpsd )
+	kde? (
+		>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=]
+		>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+	)
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
+	)
+"
+RDEPEND="${DEPEND}
+	!kdeprefix? ( !sci-geosciences/marble )
+"
+
+pkg_setup() {
+	if use plasma && ! use kde; then
+		echo
+		eerror "KDE integration is required to build marble world clock applet."
+		eerror
+		eerror "Either enable 'kde' USE flag or disable 'plasma'."
+		eerror "You can do this by setting these flags in /etc/portage/package.use, like:"
+		eerror "    =${CATEGORY}/${PN}-${PV} kde plasma"
+		echo
+		die "Conflicting USE flags found"
+	fi
+
+	kde4-meta_pkg_setup
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use_with plasma Plasma)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)"
+
+	sed -i -e 's:add_subdirectory(cmake):#dontwantit:g' CMakeLists.txt \
+		|| die "sed to disable file collisions failed"
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
+
+	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} $(cmake-utils_use_with python PyKDE4)"
+	else
+		mycmakeargs="${mycmakeargs} -DQTONLY=ON -DWITH_PyKDE4=OFF"
+	fi
+
+	kde4-meta_src_configure
+}