From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-844294-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 2FF3F1384B4
for <garchives@archives.gentoo.org>; Thu, 5 Nov 2015 16:57:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 366C6E087F;
Thu, 5 Nov 2015 16:57:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 94DEEE085A
for <gentoo-commits@lists.gentoo.org>; Thu, 5 Nov 2015 16:57:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ABC5834063E
for <gentoo-commits@lists.gentoo.org>; Thu, 5 Nov 2015 16:57:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DFA5E210A
for <gentoo-commits@lists.gentoo.org>; Thu, 5 Nov 2015 16:57:42 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1446742404.3d4588ac45afb30fca792f20f495bfae70db6274.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/knavalbattle/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/knavalbattle/knavalbattle-5.9999.ebuild kde-apps/knavalbattle/knavalbattle-9999.ebuild
X-VCS-Directories: kde-apps/knavalbattle/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 3d4588ac45afb30fca792f20f495bfae70db6274
X-VCS-Branch: master
Date: Thu, 5 Nov 2015 16:57:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 879fa340-aafb-408b-ac85-a1377bea7a68
X-Archives-Hash: 5e1830c35461ad1ed257c03201894f96
commit: 3d4588ac45afb30fca792f20f495bfae70db6274
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 16:53:24 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 16:53:24 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d4588ac
kde-apps/knavalbattle: frameworks merged to master
Package-Manager: portage-2.2.20.1
kde-apps/knavalbattle/knavalbattle-5.9999.ebuild | 38 ------------------------
kde-apps/knavalbattle/knavalbattle-9999.ebuild | 27 +++++++++++++----
2 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/kde-apps/knavalbattle/knavalbattle-5.9999.ebuild b/kde-apps/knavalbattle/knavalbattle-5.9999.ebuild
deleted file mode 100644
index 4de9234..0000000
--- a/kde-apps/knavalbattle/knavalbattle-5.9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=true
-KDE_SELINUX_MODULE="games"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
- https://www.kde.org/applications/games/navalbattle/
- https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdnssd)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep libkdegames)
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/phonon[qt5]
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
index 426c4c3..1ac25a6 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
@@ -4,17 +4,34 @@
EAPI=5
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK=true
KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
-DESCRIPTION="The KDE Battleship clone"
+DESCRIPTION="Battleship clone by KDE"
HOMEPAGE="
https://www.kde.org/applications/games/navalbattle/
https://games.kde.org/game.php?game=kbattleship
"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdnssd)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep libkdegames)
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/phonon[qt5]
+"
-DEPEND="$(add_kdeapps_dep libkdegames)"
RDEPEND="${DEPEND}"