[gentoo-commits] gentoo-x86 commit in kde-base/marble: marble-4.4.4.ebuild ChangeLog marble-4.4.2-r1.ebuild marble-4.4.3-r1.ebuild

[gentoo-commits] gentoo-x86 commit in kde-base/marble: marble-4.4.4.ebuild ChangeLog marble-4.4.2-r1.ebuild marble-4.4.3-r1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    10/06/06 14:41:34

  Modified:             ChangeLog
  Added:                marble-4.4.4.ebuild
  Removed:              marble-4.4.2-r1.ebuild marble-4.4.3-r1.ebuild
  Log:
  Drop old. Version bump.
  (Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.68                 kde-base/marble/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	15 May 2010 21:14:10 -0000	1.67
+++ ChangeLog	6 Jun 2010 14:41:34 -0000	1.68
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.67 2010/05/15 21:14:10 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.68 2010/06/06 14:41:34 scarabeus Exp $
+
+*marble-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -marble-4.4.2-r1.ebuild, -marble-4.4.3-r1.ebuild, +marble-4.4.4.ebuild:
+  Remove old. Version bump.
 
 *marble-4.4.3-r1 (15 May 2010)
 *marble-4.4.2-r1 (15 May 2010)



1.1                  kde-base/marble/marble-4.4.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/marble-4.4.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/marble/marble-4.4.4.ebuild?rev=1.1&content-type=text/plain

Index: marble-4.4.4.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.4.ebuild,v 1.1 2010/06/06 14:41:34 scarabeus Exp $

EAPI="3"

KMNAME="kdeedu"
CPPUNIT_REQUIRED="optional"
PYTHON_DEPEND="python? 2"
inherit python kde4-meta

DESCRIPTION="Generic geographical map widget"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="debug designer-plugin gps +handbook plasma python"

# tests fail / segfault. Last checked for 4.2.88
RESTRICT=test

DEPEND="
	gps? ( sci-geosciences/gpsd )
	python? (
		>=dev-python/PyQt4-4.4.4-r1
		$(add_kdebase_dep pykde4)
	)
"
RDEPEND="${DEPEND}
	!kdeprefix? ( !sci-geosciences/marble )
"

pkg_setup() {
	python_set_active_version 2
	kde4-meta_pkg_setup
}

src_prepare() {
	kde4-meta_src_prepare
	python_convert_shebangs -r $(python_get_version) .
}

src_configure() {
	mycmakeargs=(
		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
		$(cmake-utils_use_with plasma)
		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
		$(cmake-utils_use_with python PyKDE4)
		$(cmake-utils_use_with python PyQt4)
		$(cmake-utils_use_with python PythonLibrary)
		$(cmake-utils_use_with python SIP)
	)

	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'

	if use gps; then
		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

	kde4-meta_src_configure
}