[gentoo-commits] proj/kde:master commit in: kde-base/knavalbattle/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     21a4e51b07dd886a2394f5a57ba15f30cd5002ac
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 17:59:34 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 17:59:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=21a4e51b

[kde-base/knavalbattle] GGZ support has been removed upstream.

Package-Manager: portage-2.1.11.31

---
 .../knavalbattle/knavalbattle-4.9.49.9999.ebuild   |   17 +----------------
 kde-base/knavalbattle/knavalbattle-9999.ebuild     |   11 +----------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild b/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild
index 4f496ab..21583a6 100644
--- a/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild
@@ -11,7 +11,7 @@ else
 	KMNAME="kdegames"
 fi
 KDE_HANDBOOK="optional"
-inherit games-ggz ${eclass}
+inherit ${eclass}
 
 DESCRIPTION="The KDE Battleship clone"
 KEYWORDS=""
@@ -21,18 +21,3 @@ DEPEND="$(add_kdebase_dep libkdegames)"
 RDEPEND="${DEPEND}"
 
 add_blocker kbattleship
-
-src_prepare() {
-	# cmake is doing this really weird
-	if [[ ${PV} == *9999 ]]; then
-		sed -i \
-			-e "s:register_ggz_module:#register_ggz_module:g" \
-			src/CMakeLists.txt || die "ggz removal failed"
-	else
-		sed -i \
-			-e "s:register_ggz_module:#register_ggz_module:g" \
-			"${PN}"/src/CMakeLists.txt || die "ggz removal failed"
-	fi
-
-	${eclass}_src_prepare
-}

diff --git a/kde-base/knavalbattle/knavalbattle-9999.ebuild b/kde-base/knavalbattle/knavalbattle-9999.ebuild
index 0c7b3db..a4dcbe6 100644
--- a/kde-base/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
-inherit games-ggz kde4-base
+inherit kde4-base
 
 DESCRIPTION="The KDE Battleship clone"
 KEYWORDS=""
@@ -16,12 +16,3 @@ DEPEND="$(add_kdebase_dep libkdegames)"
 RDEPEND="${DEPEND}"
 
 add_blocker kbattleship
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		src/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-base_src_prepare
-}