Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/
Date: Thu, 25 Aug 2016 20:39:05
Message-Id: 1472157415.ecf50a8f05d2d30c0852fb617ee1b41a20910705.johu@gentoo
1 commit: ecf50a8f05d2d30c0852fb617ee1b41a20910705
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 25 20:36:55 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 25 20:36:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf50a8f
7
8 kde-plasma/kactivities-workspace: Remove last-rited pkg
9
10 kde-plasma/kactivities-workspace/Manifest | 1 -
11 .../kactivities-workspace-5.5.0.ebuild | 57 ----------------------
12 kde-plasma/kactivities-workspace/metadata.xml | 8 ---
13 3 files changed, 66 deletions(-)
14
15 diff --git a/kde-plasma/kactivities-workspace/Manifest b/kde-plasma/kactivities-workspace/Manifest
16 deleted file mode 100644
17 index 93a1c45..00000000
18 --- a/kde-plasma/kactivities-workspace/Manifest
19 +++ /dev/null
20 @@ -1 +0,0 @@
21 -DIST kactivities-workspace-5.5.0.tar.xz 64908 SHA256 379f44a8fac6ca5a567453dc79b4fc0cc1004a597ea2a0c2f3815498ecdc3c0c SHA512 509fd321ec12b2552faa8506199d9379e1380559b15d1d0205010f69ea26bda6c926fd85025dc9a18d62376b1980af51b1dfa44a7329829e8301db3cbf61d1b6 WHIRLPOOL f27ccca70ef72abbee9ba02b067e53fe74dc39717ac7e044cc1741021c6494700e56492a4c69c160769f2f0062db6850cc79f37c3be82e90afe7145be940558c
22
23 diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
24 deleted file mode 100644
25 index 0a90f7b..00000000
26 --- a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
27 +++ /dev/null
28 @@ -1,57 +0,0 @@
29 -# Copyright 1999-2016 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -# $Id$
32 -
33 -EAPI=6
34 -
35 -inherit kde5
36 -
37 -DESCRIPTION="Transitional package for activities KCM and KIO modules in Plasma-5.5"
38 -SRC_URI="mirror://kde/stable/kactivities/${P}.tar.xz"
39 -
40 -LICENSE="|| ( GPL-2 GPL-3 )"
41 -KEYWORDS="amd64 ~arm x86"
42 -IUSE=""
43 -
44 -COMMON_DEPEND="
45 - $(add_frameworks_dep kactivities)
46 - $(add_frameworks_dep kconfig)
47 - $(add_frameworks_dep kconfigwidgets)
48 - $(add_frameworks_dep kcoreaddons)
49 - $(add_frameworks_dep kdbusaddons)
50 - $(add_frameworks_dep kglobalaccel)
51 - $(add_frameworks_dep ki18n)
52 - $(add_frameworks_dep kio)
53 - $(add_frameworks_dep kservice)
54 - $(add_frameworks_dep kwidgetsaddons)
55 - $(add_frameworks_dep kxmlgui)
56 - $(add_qt_dep qtdbus)
57 - $(add_qt_dep qtdeclarative)
58 - $(add_qt_dep qtgui)
59 - $(add_qt_dep qtsql)
60 - $(add_qt_dep qtwidgets)
61 -"
62 -DEPEND="${COMMON_DEPEND}
63 - >=dev-libs/boost-1.54
64 -"
65 -RDEPEND="${COMMON_DEPEND}
66 - !>kde-apps/kio-extras-15.12.50
67 - !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
68 - !kde-plasma/kactivitymanagerd:4
69 - !<kde-frameworks/kactivities-5.20.0
70 - !>kde-plasma/plasma-desktop-5.5.90
71 -"
72 -
73 -src_prepare() {
74 - kde5_src_prepare
75 - # Remove conflict with kde-frameworks/kactivities
76 - sed -e "/add_subdirectory.*imports/ s/^/#DONT/" \
77 - -i src/workspace/CMakeLists.txt || die
78 -
79 - # Fix bogus deps (bug #585044)
80 - sed -e "s/KF5KCMUtils/KF5Service/" \
81 - -e "/Declarative/d" \
82 - -e "/KF5::KCMUtils/d" \
83 - -i src/workspace/settings/CMakeLists.txt || die
84 -
85 -}
86
87 diff --git a/kde-plasma/kactivities-workspace/metadata.xml b/kde-plasma/kactivities-workspace/metadata.xml
88 deleted file mode 100644
89 index 2fdbf33..00000000
90 --- a/kde-plasma/kactivities-workspace/metadata.xml
91 +++ /dev/null
92 @@ -1,8 +0,0 @@
93 -<?xml version="1.0" encoding="UTF-8"?>
94 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
95 -<pkgmetadata>
96 - <maintainer type="project">
97 - <email>kde@g.o</email>
98 - <name>Gentoo KDE Project</name>
99 - </maintainer>
100 -</pkgmetadata>