Drop KDE 4.7.0

(Portage version: 2.1.10.27/cvs/Linux x86_64)

3 files changed, 5 insertions, 150 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index ac6f18d7a074..b2e219838217 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
 # 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.108 2011/10/06 18:11:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.109 2011/10/15 17:25:49 dilfridge Exp $
+
+  15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -marble-4.7.0.ebuild,
+  -marble-4.7.0-r1.ebuild:
+  Drop KDE 4.7.0
 
 *marble-4.7.2 (06 Oct 2011)
 
diff --git a/kde-base/marble/marble-4.7.0-r1.ebuild b/kde-base/marble/marble-4.7.0-r1.ebuild
deleted file mode 100644
index 10b536284f19..000000000000
--- a/kde-base/marble/marble-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
-}
diff --git a/kde-base/marble/marble-4.7.0.ebuild b/kde-base/marble/marble-4.7.0.ebuild
deleted file mode 100644
index 09ac4e88fa65..000000000000
--- a/kde-base/marble/marble-4.7.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.ebuild,v 1.3 2011/07/28 20:21:30 mr_bones_ Exp $
-
-EAPI=3
-
-KDE_HANDBOOK="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 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
-		$(add_kdebase_dep pykde4)
-	)
-"
-RDEPEND="${DEPEND}
-	!sci-geosciences/marble
-"
-
-PATCHES=(
-			"${FILESDIR}/${PN}-4.7-magic.patch"
-			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
-		)
-# note that this patch will not work if we ever make a qt-only build
-
-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_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)
-		$(cmake-utils_use_with gps libgps)
-		-DWITH_liblocation=0
-	)
-
-	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
-}