Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/
Date: Thu, 01 Mar 2018 12:25:08
Message-Id: 1519903701.7ca2dd0dc2ec1a5b65988eba843781beb2757afb.asturm@gentoo
1 commit: 7ca2dd0dc2ec1a5b65988eba843781beb2757afb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 1 11:28:21 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 1 11:28:21 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ca2dd0d
7
8 kde-plasma/plasma-desktop: Drop obsolete pkg_setup check
9
10 net-im/skype is not a thing anymore.
11
12 Package-Manager: Portage-2.3.24, Repoman-2.3.6
13
14 kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild | 7 -------
15 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 7 -------
16 2 files changed, 14 deletions(-)
17
18 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
19 index 01caeaf5de..b30ea480c3 100644
20 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
21 +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild
22 @@ -132,13 +132,6 @@ RDEPEND="${COMMON_DEPEND}
23
24 REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
25
26 -pkg_setup() {
27 - kde5_pkg_setup
28 - if has_version net-im/skype && use legacy-systray && use amd64; then
29 - elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
30 - fi
31 -}
32 -
33 src_configure() {
34 local mycmakeargs=(
35 $(cmake-utils_use_find_package appstream AppStreamQt)
36
37 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
38 index 01caeaf5de..b30ea480c3 100644
39 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
40 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
41 @@ -132,13 +132,6 @@ RDEPEND="${COMMON_DEPEND}
42
43 REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
44
45 -pkg_setup() {
46 - kde5_pkg_setup
47 - if has_version net-im/skype && use legacy-systray && use amd64; then
48 - elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
49 - fi
50 -}
51 -
52 src_configure() {
53 local mycmakeargs=(
54 $(cmake-utils_use_find_package appstream AppStreamQt)