From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-819628-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 AF295138D14
for <garchives@archives.gentoo.org>; Sun, 12 Jul 2015 19:43:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 395C7E085E;
Sun, 12 Jul 2015 19:43:12 +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 83299E085E
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jul 2015 19:43:11 +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 3AE15340814
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jul 2015 19:43:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 14581738
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jul 2015 19:43:08 +0000 (UTC)
From: "Manuel Rüger" <mrueg@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, "Manuel Rüger" <mrueg@gentoo.org>
Message-ID: <1436730177.f4b383b9354139918966266744edcf64af39e8c2.mrueg@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ark/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/ark/ark-5.9999.ebuild kde-apps/ark/ark-9999.ebuild
X-VCS-Directories: kde-apps/ark/
X-VCS-Committer: mrueg
X-VCS-Committer-Name: Manuel Rüger
X-VCS-Revision: f4b383b9354139918966266744edcf64af39e8c2
X-VCS-Branch: master
Date: Sun, 12 Jul 2015 19:43:08 +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: 926fa6ac-3610-45ec-9a2d-a7f9e0c1f69b
X-Archives-Hash: 02f0976fa5c7d0f3f99292c4669bbd44
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"