[gentoo-commits] proj/kde:master commit in: kde-apps/parley/

[Johannes Huber]

commit:     5dfd5e48f37f4b86d74dd35254a171398d5d4869
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 18:01:50 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 18:01:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5dfd5e48

kde-apps/parley: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/parley/parley-15.12.3.ebuild       | 47 -----------------------------
 kde-apps/parley/parley-16.04.49.9999.ebuild |  2 +-
 kde-apps/parley/parley-9999.ebuild          |  6 ++--
 3 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/kde-apps/parley/parley-15.12.3.ebuild b/kde-apps/parley/parley-15.12.3.ebuild
deleted file mode 100644
index 46a4063..0000000
--- a/kde-apps/parley/parley-15.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_DOC_DIR="docs"
-inherit kde5
-
-DESCRIPTION="KDE Educational: vocabulary trainer"
-HOMEPAGE="https://www.kde.org/applications/education/parley
-https://edu.kde.org/applications/school/parley"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-"

diff --git a/kde-apps/parley/parley-16.04.49.9999.ebuild b/kde-apps/parley/parley-16.04.49.9999.ebuild
index 4c2460f..777f653 100644
--- a/kde-apps/parley/parley-16.04.49.9999.ebuild
+++ b/kde-apps/parley/parley-16.04.49.9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
 KDE_DOC_DIR="docs"
 inherit kde5
 
-DESCRIPTION="A vocabulary trainer to help you memorize things"
+DESCRIPTION="KDE Educational: vocabulary trainer"
 HOMEPAGE="https://www.kde.org/applications/education/parley
 https://edu.kde.org/applications/school/parley"
 KEYWORDS=""

diff --git a/kde-apps/parley/parley-9999.ebuild b/kde-apps/parley/parley-9999.ebuild
index 133dfb9..777f653 100644
--- a/kde-apps/parley/parley-9999.ebuild
+++ b/kde-apps/parley/parley-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_DOC_DIR="docs"
@@ -33,14 +33,14 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
-	dev-libs/libxml2:2
-	dev-libs/libxslt
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtmultimedia)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdeedu-data)