* [gentoo-commits] proj/kde:master commit in: kde-base/knavalbattle/
@ 2012-11-13 18:01 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2012-11-13 18:01 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/knavalbattle/
@ 2013-08-27 17:35 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2013-08-27 17:35 UTC (permalink / raw
To: gentoo-commits
commit: d4d9dbf097e3164a058a3915c29f4bd194142fc0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 17:32:27 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 17:32:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4d9dbf0
[kde-base/knavalbattle] Update HOMEPAGE wrt bug #479128.
Package-Manager: portage-2.2.1
---
kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild | 4 ++++
kde-base/knavalbattle/knavalbattle-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild b/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild
index 0f3492b..c567ef9 100644
--- a/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild
@@ -9,6 +9,10 @@ KDE_SELINUX_MODULE="games"
inherit kde4-base
DESCRIPTION="The KDE Battleship clone"
+HOMEPAGE="
+ http://www.kde.org/applications/games/navalbattle/
+ http://games.kde.org/game.php?game=kbattleship
+"
KEYWORDS=""
IUSE="debug"
diff --git a/kde-base/knavalbattle/knavalbattle-9999.ebuild b/kde-base/knavalbattle/knavalbattle-9999.ebuild
index 0f3492b..c567ef9 100644
--- a/kde-base/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-9999.ebuild
@@ -9,6 +9,10 @@ KDE_SELINUX_MODULE="games"
inherit kde4-base
DESCRIPTION="The KDE Battleship clone"
+HOMEPAGE="
+ http://www.kde.org/applications/games/navalbattle/
+ http://games.kde.org/game.php?game=kbattleship
+"
KEYWORDS=""
IUSE="debug"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/knavalbattle/
@ 2013-07-11 11:35 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2013-07-11 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 7c88cdcd2b5c45f777ed55a17d1ea9bd383ba9ef
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 11:32:47 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 11:32:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7c88cdcd
[kde-base/knavalbattle] Avoid add_blocker.
Package-Manager: portage-2.1.12.13
---
kde-base/knavalbattle/knavalbattle-4.10.90.ebuild | 8 ++++----
kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild | 6 +++---
kde-base/knavalbattle/knavalbattle-9999.ebuild | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kde-base/knavalbattle/knavalbattle-4.10.90.ebuild b/kde-base/knavalbattle/knavalbattle-4.10.90.ebuild
index 87e2fca..0bac962 100644
--- a/kde-base/knavalbattle/knavalbattle-4.10.90.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-4.10.90.ebuild
@@ -9,10 +9,10 @@ KDE_SELINUX_MODULE="games"
inherit kde4-base
DESCRIPTION="The KDE Battleship clone"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="$(add_kdebase_dep libkdegames)"
-RDEPEND="${DEPEND}"
-
-add_blocker kbattleship
+RDEPEND="${DEPEND}
+ !kde-base/kbattleship:4
+"
diff --git a/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild b/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild
index 6370e3f..0f3492b 100644
--- a/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-4.11.49.9999.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
IUSE="debug"
DEPEND="$(add_kdebase_dep libkdegames)"
-RDEPEND="${DEPEND}"
-
-add_blocker kbattleship
+RDEPEND="${DEPEND}
+ !kde-base/kbattleship:4
+"
diff --git a/kde-base/knavalbattle/knavalbattle-9999.ebuild b/kde-base/knavalbattle/knavalbattle-9999.ebuild
index 6370e3f..0f3492b 100644
--- a/kde-base/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-9999.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
IUSE="debug"
DEPEND="$(add_kdebase_dep libkdegames)"
-RDEPEND="${DEPEND}"
-
-add_blocker kbattleship
+RDEPEND="${DEPEND}
+ !kde-base/kbattleship:4
+"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/knavalbattle/
@ 2012-10-01 16:05 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2012-10-01 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 7552e071ca09a31b40a6f23a856c197b3034ff7f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 15:31:31 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 15:31:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7552e071
[kde-base/knavalbattle] Moved from kde-base/kbattleship. Following upstream naming.
(Portage version: 2.2.0_alpha134/git/Linux x86_64, unsigned Manifest commit)
---
.../knavalbattle/knavalbattle-4.9.49.9999.ebuild | 38 ++++++++++++++++++++
kde-base/knavalbattle/knavalbattle-9999.ebuild | 27 ++++++++++++++
kde-base/knavalbattle/metadata.xml | 5 +++
3 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild b/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild
new file mode 100644
index 0000000..4f496ab
--- /dev/null
+++ b/kde-base/knavalbattle/knavalbattle-4.9.49.9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]]; then
+ eclass="kde4-base"
+else
+ eclass="kde4-meta"
+ KMNAME="kdegames"
+fi
+KDE_HANDBOOK="optional"
+inherit games-ggz ${eclass}
+
+DESCRIPTION="The KDE Battleship clone"
+KEYWORDS=""
+IUSE="debug"
+
+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
new file mode 100644
index 0000000..0c7b3db
--- /dev/null
+++ b/kde-base/knavalbattle/knavalbattle-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit games-ggz kde4-base
+
+DESCRIPTION="The KDE Battleship clone"
+KEYWORDS=""
+IUSE="debug"
+
+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
+}
diff --git a/kde-base/knavalbattle/metadata.xml b/kde-base/knavalbattle/metadata.xml
new file mode 100644
index 0000000..8d1e86a
--- /dev/null
+++ b/kde-base/knavalbattle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-27 17:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-13 18:01 [gentoo-commits] proj/kde:master commit in: kde-base/knavalbattle/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2013-08-27 17:35 Michael Palimaka
2013-07-11 11:35 Michael Palimaka
2012-10-01 16:05 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox