commit: f4b383b9354139918966266744edcf64af39e8c2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Sun Jul 12 19:42:57 2015 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Sun Jul 12 19:42:57 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4b383b9
[kde-apps/ark] Frameworks branch has been merged to master. Package-Manager: portage-2.2.20 kde-apps/ark/ark-5.9999.ebuild | 56 ------------------------------------------ kde-apps/ark/ark-9999.ebuild | 44 +++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 72 deletions(-) diff --git a/kde-apps/ark/ark-5.9999.ebuild b/kde-apps/ark/ark-5.9999.ebuild deleted file mode 100644 index 35af4b2..0000000 --- a/kde-apps/ark/ark-5.9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_HANDBOOK=true -EGIT_BRANCH="frameworks" -KDE_TEST="true" -inherit kde5 - -DESCRIPTION="KDE Archiving tool" -HOMEPAGE="http://www.kde.org/applications/utilities/ark -http://utils.kde.org/projects/ark"; -KEYWORDS="" -IUSE="dolphin" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep khtml) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - dolphin? ( $(add_kdeapps_dep libkonq) ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package dolphin KF5Konq) - ) - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - if ! has_version app-arch/rar ; then - elog "For creating rar archives, install app-arch/rar" - fi -} diff --git a/kde-apps/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild index 6ff157b..0170654 100644 --- a/kde-apps/ark/ark-9999.ebuild +++ b/kde-apps/ark/ark-9999.ebuild @@ -4,36 +4,48 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK=true +KDE_TEST="true" +inherit kde5 DESCRIPTION="KDE Archiving tool" HOMEPAGE="http://www.kde.org/applications/utilities/ark http://utils.kde.org/projects/ark"; KEYWORDS="" -IUSE="+archive +bzip2 debug lzma" - -DEPEND=" - $(add_kdeapps_dep libkonq) +IUSE="dolphin" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdoctools) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep khtml) + $(add_frameworks_dep kio) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kpty) + $(add_frameworks_dep kwidgetsaddons) + >=app-arch/libarchive-3.0.0 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 sys-libs/zlib - archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] ) + dolphin? ( $(add_kdeapps_dep libkonq '' '5.9999') ) " -RDEPEND="${DEPEND}" - -RESTRICT="test" -# dbus problem +DEPEND="${RDEPEND} + sys-devel/gettext" src_configure() { local mycmakeargs=( - $(cmake-utils_use_with archive LibArchive) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_find_package dolphin KF5Konq) ) - kde4-base_src_configure + kde5_src_configure } pkg_postinst() { - kde4-base_pkg_postinst + kde5_pkg_postinst if ! has_version app-arch/rar ; then elog "For creating rar archives, install app-arch/rar"
