commit: 11cc832c7128327074847d5c3d64375ed54ce4c3 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Fri Oct 16 14:01:26 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Oct 16 18:24:10 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=11cc832c
kde-apps/libkgeomap: Frameworks merged to master Package-Manager: portage-2.2.20.1 kde-apps/libkgeomap/libkgeomap-5.9999.ebuild | 36 ---------------------------- kde-apps/libkgeomap/libkgeomap-9999.ebuild | 24 ++++++++++++++----- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/kde-apps/libkgeomap/libkgeomap-5.9999.ebuild b/kde-apps/libkgeomap/libkgeomap-5.9999.ebuild deleted file mode 100644 index 6901d78..0000000 --- a/kde-apps/libkgeomap/libkgeomap-5.9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_BRANCH="frameworks" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap" -HOMEPAGE="https://www.digikam.org/"; - -LICENSE="GPL-2" -KEYWORDS="" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - kde-apps/libkexiv2:5= - kde-apps/marble:5=[kde] -" -RDEPEND="${DEPEND}" diff --git a/kde-apps/libkgeomap/libkgeomap-9999.ebuild b/kde-apps/libkgeomap/libkgeomap-9999.ebuild index c099c1a..bf9ec44 100644 --- a/kde-apps/libkgeomap/libkgeomap-9999.ebuild +++ b/kde-apps/libkgeomap/libkgeomap-9999.ebuild @@ -4,8 +4,9 @@ EAPI=5 +KDE_TEST="true" VIRTUALX_REQUIRED="test" -inherit kde4-base +inherit kde5 DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap" HOMEPAGE="https://www.digikam.org/"; @@ -15,9 +16,20 @@ KEYWORDS="" IUSE="" DEPEND=" - kde-apps/libkexiv2:4= - kde-apps/marble:4=[kde,plasma] -" -RDEPEND="${DEPEND} - !media-libs/libkgeomap + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + kde-apps/libkexiv2:5= + kde-apps/marble:5=[kde] " +RDEPEND="${DEPEND}"
