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

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

[Andreas HAttel (dilfridge)]

dilfridge    11/07/31 18:24:35

  Modified:             ChangeLog
  Added:                marble-4.7.0-r1.ebuild
  Log:
  Add support for qt-only build, bug 356457
  
  (Portage version: 2.1.10.8/cvs/Linux x86_64)

Revision  Changes    Path
1.103                kde-base/marble/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog	28 Jul 2011 20:02:13 -0000	1.102
+++ ChangeLog	31 Jul 2011 18:24:35 -0000	1.103
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.102 2011/07/28 20:02:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.103 2011/07/31 18:24:35 dilfridge Exp $
+
+*marble-4.7.0-r1 (31 Jul 2011)
+
+  31 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/marble-4.7-magic-r1.patch, +marble-4.7.0-r1.ebuild:
+  Add support for qt-only build, bug 356457
 
   28 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org>
   +files/marble-4.5.5-gpsd.patch, marble-4.7.0.ebuild:



1.1                  kde-base/marble/marble-4.7.0-r1.ebuild

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

Index: marble-4.7.0-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $

EAPI=3

KDE_HANDBOOK="optional"
KDE_REQUIRED="optional"
CPPUNIT_REQUIRED="optional"
PYTHON_DEPEND="python? 2"
KDE_SCM="git"
inherit kde4-base python

DESCRIPTION="Generic geographical map widget"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug designer-plugin gps +kde plasma python"

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

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

PATCHES=(
			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
)

pkg_setup() {
	python_set_active_version 2
	kde4-base_pkg_setup
}

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

src_configure() {
	mycmakeargs=(
		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
		$(cmake-utils_use_with python PyQt4)
		$(cmake-utils_use_with python PythonLibrary)
		$(cmake-utils_use_with python SIP)
		$(cmake-utils_use_with gps libgps)
		-DWITH_liblocation=0
	)
	use kde || mycmakeargs=(
		-DQTONLY=ON
		${mycmakeargs[@]}
	)
	use kde && mycmakeargs=(
		$(cmake-utils_use_with plasma)
		$(cmake-utils_use_with python PyKDE4)
		${mycmakeargs[@]}
	)

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

	kde4-base_src_configure
}

src_install() {
	if use plasma; then
		insinto /usr/share/apps/cmake/modules
		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
	fi
	kde4-base_src_install
}