* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/
@ 2016-03-20 16:44 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-03-20 16:44 UTC (permalink / raw
To: gentoo-commits
commit: e25405fac30c43580045d18bd69c65b57a2345d0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 16:26:01 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 16:43:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25405fa
kde-plasma/kactivities-workspace: new package
Import from kde overlay.
Package-Manager: portage-2.2.28
kde-plasma/kactivities-workspace/Manifest | 1 +
.../kactivities-workspace-5.5.0.ebuild | 50 ++++++++++++++++++++++
kde-plasma/kactivities-workspace/metadata.xml | 8 ++++
3 files changed, 59 insertions(+)
diff --git a/kde-plasma/kactivities-workspace/Manifest b/kde-plasma/kactivities-workspace/Manifest
new file mode 100644
index 0000000..93a1c45
--- /dev/null
+++ b/kde-plasma/kactivities-workspace/Manifest
@@ -0,0 +1 @@
+DIST kactivities-workspace-5.5.0.tar.xz 64908 SHA256 379f44a8fac6ca5a567453dc79b4fc0cc1004a597ea2a0c2f3815498ecdc3c0c SHA512 509fd321ec12b2552faa8506199d9379e1380559b15d1d0205010f69ea26bda6c926fd85025dc9a18d62376b1980af51b1dfa44a7329829e8301db3cbf61d1b6 WHIRLPOOL f27ccca70ef72abbee9ba02b067e53fe74dc39717ac7e044cc1741021c6494700e56492a4c69c160769f2f0062db6850cc79f37c3be82e90afe7145be940558c
diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
new file mode 100644
index 0000000..8f3ead2
--- /dev/null
+++ b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Transitional package for activities KCM and KIO modules in Plasma-5.5"
+SRC_URI="mirror://kde/stable/kactivities/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.54
+"
+RDEPEND="${COMMON_DEPEND}
+ !>kde-apps/kio-extras-15.12.50
+ !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
+ !kde-base/kactivitymanagerd
+ !<kde-frameworks/kactivities-5.20.0
+ !>kde-plasma/plasma-desktop-5.5.90
+"
+
+src_prepare() {
+ kde5_src_prepare
+ # Remove conflict with kde-frameworks/kactivities
+ sed -e "/add_subdirectory.*imports/ s/^/#DONT/" \
+ -i src/workspace/CMakeLists.txt || die
+}
diff --git a/kde-plasma/kactivities-workspace/metadata.xml b/kde-plasma/kactivities-workspace/metadata.xml
new file mode 100644
index 0000000..2fdbf33
--- /dev/null
+++ b/kde-plasma/kactivities-workspace/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/
@ 2016-05-19 13:32 Mikle Kolyada
0 siblings, 0 replies; 5+ messages in thread
From: Mikle Kolyada @ 2016-05-19 13:32 UTC (permalink / raw
To: gentoo-commits
commit: de0bcbf3487e3fd15e62b316cfebd79db38c1f47
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 13:28:24 2016 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May 19 13:31:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0bcbf3
kde-plasma/kactivities-workspace: amd64 stable wrt bug #580248
Package-Manager: portage-2.2.28
kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
index 8f3ead2..d06207a 100644
--- a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
+++ b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Transitional package for activities KCM and KIO modules in Plasma-5
SRC_URI="mirror://kde/stable/kactivities/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE=""
COMMON_DEPEND="
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/
@ 2016-06-01 22:52 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-06-01 22:52 UTC (permalink / raw
To: gentoo-commits
commit: cc40a7c472a31f14ccfe34c3b02e6bdefa062405
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 22:45:06 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 22:52:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc40a7c4
kde-plasma/kactivities-workspace: x86 stable
Package-Manager: portage-2.3.0_rc1
kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
index d06207a..39eabbc 100644
--- a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
+++ b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Transitional package for activities KCM and KIO modules in Plasma-5
SRC_URI="mirror://kde/stable/kactivities/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/
@ 2016-07-13 19:05 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-07-13 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 9f7947070076e5aad1074f2417fb9cf6062f4c32
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 4 22:28:24 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 19:04:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f794707
kde-plasma/kactivities-workspace: Fix bogus deps
Gentoo-bug: 585044
Package-Manager: portage-2.2.28
.../kactivities-workspace/kactivities-workspace-5.5.0.ebuild | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
index a372553..0a90f7b 100644
--- a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
+++ b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
@@ -47,4 +47,11 @@ src_prepare() {
# Remove conflict with kde-frameworks/kactivities
sed -e "/add_subdirectory.*imports/ s/^/#DONT/" \
-i src/workspace/CMakeLists.txt || die
+
+ # Fix bogus deps (bug #585044)
+ sed -e "s/KF5KCMUtils/KF5Service/" \
+ -e "/Declarative/d" \
+ -e "/KF5::KCMUtils/d" \
+ -i src/workspace/settings/CMakeLists.txt || die
+
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/
@ 2016-08-25 20:38 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2016-08-25 20:38 UTC (permalink / raw
To: gentoo-commits
commit: ecf50a8f05d2d30c0852fb617ee1b41a20910705
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 20:36:55 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 20:36:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf50a8f
kde-plasma/kactivities-workspace: Remove last-rited pkg
kde-plasma/kactivities-workspace/Manifest | 1 -
.../kactivities-workspace-5.5.0.ebuild | 57 ----------------------
kde-plasma/kactivities-workspace/metadata.xml | 8 ---
3 files changed, 66 deletions(-)
diff --git a/kde-plasma/kactivities-workspace/Manifest b/kde-plasma/kactivities-workspace/Manifest
deleted file mode 100644
index 93a1c45..00000000
--- a/kde-plasma/kactivities-workspace/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kactivities-workspace-5.5.0.tar.xz 64908 SHA256 379f44a8fac6ca5a567453dc79b4fc0cc1004a597ea2a0c2f3815498ecdc3c0c SHA512 509fd321ec12b2552faa8506199d9379e1380559b15d1d0205010f69ea26bda6c926fd85025dc9a18d62376b1980af51b1dfa44a7329829e8301db3cbf61d1b6 WHIRLPOOL f27ccca70ef72abbee9ba02b067e53fe74dc39717ac7e044cc1741021c6494700e56492a4c69c160769f2f0062db6850cc79f37c3be82e90afe7145be940558c
diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
deleted file mode 100644
index 0a90f7b..00000000
--- a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Transitional package for activities KCM and KIO modules in Plasma-5.5"
-SRC_URI="mirror://kde/stable/kactivities/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.54
-"
-RDEPEND="${COMMON_DEPEND}
- !>kde-apps/kio-extras-15.12.50
- !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
- !kde-plasma/kactivitymanagerd:4
- !<kde-frameworks/kactivities-5.20.0
- !>kde-plasma/plasma-desktop-5.5.90
-"
-
-src_prepare() {
- kde5_src_prepare
- # Remove conflict with kde-frameworks/kactivities
- sed -e "/add_subdirectory.*imports/ s/^/#DONT/" \
- -i src/workspace/CMakeLists.txt || die
-
- # Fix bogus deps (bug #585044)
- sed -e "s/KF5KCMUtils/KF5Service/" \
- -e "/Declarative/d" \
- -e "/KF5::KCMUtils/d" \
- -i src/workspace/settings/CMakeLists.txt || die
-
-}
diff --git a/kde-plasma/kactivities-workspace/metadata.xml b/kde-plasma/kactivities-workspace/metadata.xml
deleted file mode 100644
index 2fdbf33..00000000
--- a/kde-plasma/kactivities-workspace/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-08-25 20:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-20 16:44 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kactivities-workspace/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2016-05-19 13:32 Mikle Kolyada
2016-06-01 22:52 Michael Palimaka
2016-07-13 19:05 Michael Palimaka
2016-08-25 20:38 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox