summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-06-06 14:42:20 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-06-06 14:42:20 +0000
commite7f6f629021b5b1313abfdbd99e5315bc37bd253 (patch)
treecd026859ffaed41b841bbeb1b61682c330f5c75a /kde-base/marble
parentarm stable wrt #300828 (diff)
downloadgentoo-2-e7f6f629021b5b1313abfdbd99e5315bc37bd253.tar.gz
gentoo-2-e7f6f629021b5b1313abfdbd99e5315bc37bd253.tar.bz2
gentoo-2-e7f6f629021b5b1313abfdbd99e5315bc37bd253.zip
Drop old. Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base/marble')
-rw-r--r--kde-base/marble/ChangeLog8
-rw-r--r--kde-base/marble/marble-4.4.3-r1.ebuild61
-rw-r--r--kde-base/marble/marble-4.4.4.ebuild (renamed from kde-base/marble/marble-4.4.2-r1.ebuild)2
3 files changed, 8 insertions, 63 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index e09b6e1dce2a..34d6ed298a6c 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -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)
diff --git a/kde-base/marble/marble-4.4.3-r1.ebuild b/kde-base/marble/marble-4.4.3-r1.ebuild
deleted file mode 100644
index b16861fd8dba..000000000000
--- a/kde-base/marble/marble-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.3-r1.ebuild,v 1.1 2010/05/15 21:14:10 reavertm 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
-}
diff --git a/kde-base/marble/marble-4.4.2-r1.ebuild b/kde-base/marble/marble-4.4.4.ebuild
index 99658515e720..201086439c72 100644
--- a/kde-base/marble/marble-4.4.2-r1.ebuild
+++ b/kde-base/marble/marble-4.4.4.ebuild
@@ -1,6 +1,6 @@
# 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.2-r1.ebuild,v 1.1 2010/05/15 21:14:10 reavertm Exp $
+# $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"