* [gentoo-commits] proj/kde:master commit in: sets/, Documentation/package.unmask/, Documentation/package.mask/, ...
@ 2014-10-14 10:08 Michael Palimaka
0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2014-10-14 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 500fc8f89fc3951ca0581c347ef5130a3a171ced
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 10:04:12 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 14 10:04:12 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=500fc8f8
Move KF5 libkscreen from x11-libs to kde-base as it is part of Plasma 5 proper.
---
.../package.accept_keywords/kde-plasma-5.0.keywords | 1 +
Documentation/package.mask/kde-plasma-5.0 | 1 +
Documentation/package.unmask/kde-plasma-5.0 | 1 +
.../libkscreen/libkscreen-5.0.93.ebuild | 4 +++-
.../libkscreen/libkscreen-5.0.95.ebuild | 4 +++-
{x11-libs => kde-base}/libkscreen/libkscreen-5.1.0.ebuild | 15 ++++-----------
.../libkscreen/libkscreen-5.1.9999.ebuild | 15 ++++-----------
{x11-libs => kde-base}/libkscreen/libkscreen-9999.ebuild | 15 ++++-----------
kde-base/libkscreen/metadata.xml | 5 +++++
kde-base/okular/okular-9999.ebuild | 2 +-
kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild | 4 ++--
kde-base/plasma-workspace/plasma-workspace-5.0.95.ebuild | 4 ++--
kde-base/plasma-workspace/plasma-workspace-5.1.0.ebuild | 4 ++--
.../plasma-workspace/plasma-workspace-5.1.9999.ebuild | 4 ++--
kde-base/plasma-workspace/plasma-workspace-9999.ebuild | 4 ++--
kde-misc/kscreen/kscreen-9999.ebuild | 2 +-
sets/kde-applications | 1 -
sets/kde-applications-5.0 | 1 -
sets/kde-applications-live | 1 -
sets/kde-plasma | 1 +
sets/kde-plasma-5.0 | 1 +
sets/kde-plasma-5.1 | 1 +
22 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
index fa46cc4..74b44ee 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
@@ -13,6 +13,7 @@
<kde-base/ksysguard-5.0.50:5
<kde-base/kwin-5.0.50:5
<kde-base/kwrited-5.0.50:5
+<kde-base/libkscreen-5.0.50:5
<kde-base/libksysguard-5.0.50:5
<kde-base/milou-5.0.50:5
<kde-base/oxygen-5.0.50:5
diff --git a/Documentation/package.mask/kde-plasma-5.0 b/Documentation/package.mask/kde-plasma-5.0
index bee9128..8286ca5 100644
--- a/Documentation/package.mask/kde-plasma-5.0
+++ b/Documentation/package.mask/kde-plasma-5.0
@@ -13,6 +13,7 @@
>=kde-base/ksysguard-5.0:5
>=kde-base/kwin-5.0:5
>=kde-base/kwrited-5.0:5
+>=kde-base/libkscreen-5.0:5
>=kde-base/libksysguard-5.0:5
>=kde-base/milou-5.0:5
>=kde-base/oxygen-5.0:5
diff --git a/Documentation/package.unmask/kde-plasma-5.0 b/Documentation/package.unmask/kde-plasma-5.0
index b0025f7..d8fe2a1 100644
--- a/Documentation/package.unmask/kde-plasma-5.0
+++ b/Documentation/package.unmask/kde-plasma-5.0
@@ -13,6 +13,7 @@
<kde-base/ksysguard-5.0.50:5
<kde-base/kwin-5.0.50:5
<kde-base/kwrited-5.0.50:5
+<kde-base/libkscreen-5.0.50:5
<kde-base/libksysguard-5.0.50:5
<kde-base/milou-5.0.50:5
<kde-base/oxygen-5.0.50:5
diff --git a/x11-libs/libkscreen/libkscreen-5.0.93.ebuild b/kde-base/libkscreen/libkscreen-5.0.93.ebuild
similarity index 93%
rename from x11-libs/libkscreen/libkscreen-5.0.93.ebuild
rename to kde-base/libkscreen/libkscreen-5.0.93.ebuild
index 674f180..75ccc21 100644
--- a/x11-libs/libkscreen/libkscreen-5.0.93.ebuild
+++ b/kde-base/libkscreen/libkscreen-5.0.93.ebuild
@@ -30,4 +30,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ x11-libs/libkscreen:5
+"
diff --git a/x11-libs/libkscreen/libkscreen-5.0.95.ebuild b/kde-base/libkscreen/libkscreen-5.0.95.ebuild
similarity index 93%
rename from x11-libs/libkscreen/libkscreen-5.0.95.ebuild
rename to kde-base/libkscreen/libkscreen-5.0.95.ebuild
index 7b7fe0b..8b08464 100644
--- a/x11-libs/libkscreen/libkscreen-5.0.95.ebuild
+++ b/kde-base/libkscreen/libkscreen-5.0.95.ebuild
@@ -30,4 +30,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !x11-libs/libkscreen:5
+"
diff --git a/x11-libs/libkscreen/libkscreen-5.1.0.ebuild b/kde-base/libkscreen/libkscreen-5.1.0.ebuild
similarity index 61%
rename from x11-libs/libkscreen/libkscreen-5.1.0.ebuild
rename to kde-base/libkscreen/libkscreen-5.1.0.ebuild
index a69fb26..3abd4bd 100644
--- a/x11-libs/libkscreen/libkscreen-5.1.0.ebuild
+++ b/kde-base/libkscreen/libkscreen-5.1.0.ebuild
@@ -5,20 +5,11 @@
EAPI=5
VIRTUALX_REQUIRED="test"
-if [[ $PV = *9999* ]]; then
- EGIT_BRANCH="frameworks"
- KEYWORDS=""
-else
- SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
inherit kde5
DESCRIPTION="KDE screen management library"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkscreen"
-
LICENSE="GPL-2"
+KEYWORDS=" ~amd64"
IUSE=""
# TODO: add X use flag, does not build at the moment
@@ -30,4 +21,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !x11-libs/libkscreen:5
+"
diff --git a/x11-libs/libkscreen/libkscreen-9999.ebuild b/kde-base/libkscreen/libkscreen-5.1.9999.ebuild
similarity index 61%
copy from x11-libs/libkscreen/libkscreen-9999.ebuild
copy to kde-base/libkscreen/libkscreen-5.1.9999.ebuild
index a69fb26..83386ac 100644
--- a/x11-libs/libkscreen/libkscreen-9999.ebuild
+++ b/kde-base/libkscreen/libkscreen-5.1.9999.ebuild
@@ -5,20 +5,11 @@
EAPI=5
VIRTUALX_REQUIRED="test"
-if [[ $PV = *9999* ]]; then
- EGIT_BRANCH="frameworks"
- KEYWORDS=""
-else
- SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
inherit kde5
DESCRIPTION="KDE screen management library"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkscreen"
-
LICENSE="GPL-2"
+KEYWORDS=""
IUSE=""
# TODO: add X use flag, does not build at the moment
@@ -30,4 +21,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !x11-libs/libkscreen:5
+"
diff --git a/x11-libs/libkscreen/libkscreen-9999.ebuild b/kde-base/libkscreen/libkscreen-9999.ebuild
similarity index 61%
rename from x11-libs/libkscreen/libkscreen-9999.ebuild
rename to kde-base/libkscreen/libkscreen-9999.ebuild
index a69fb26..83386ac 100644
--- a/x11-libs/libkscreen/libkscreen-9999.ebuild
+++ b/kde-base/libkscreen/libkscreen-9999.ebuild
@@ -5,20 +5,11 @@
EAPI=5
VIRTUALX_REQUIRED="test"
-if [[ $PV = *9999* ]]; then
- EGIT_BRANCH="frameworks"
- KEYWORDS=""
-else
- SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
inherit kde5
DESCRIPTION="KDE screen management library"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkscreen"
-
LICENSE="GPL-2"
+KEYWORDS=""
IUSE=""
# TODO: add X use flag, does not build at the moment
@@ -30,4 +21,6 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXrandr
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !x11-libs/libkscreen:5
+"
diff --git a/kde-base/libkscreen/metadata.xml b/kde-base/libkscreen/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-base/libkscreen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-base/okular/okular-9999.ebuild b/kde-base/okular/okular-9999.ebuild
index 86d012b..3d818c3 100644
--- a/kde-base/okular/okular-9999.ebuild
+++ b/kde-base/okular/okular-9999.ebuild
@@ -46,7 +46,7 @@ DEPEND="
chm? ( dev-libs/chmlib )
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
- dpi? ( x11-libs/libkscreen )
+ dpi? ( $(add_kdebase_dep libkscreen) )
ebook? ( app-text/ebook-tools )
jpeg? ( virtual/jpeg:0 )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
diff --git a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
index 24d5062..31739a3 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
@@ -12,9 +12,10 @@ KEYWORDS=" ~amd64"
IUSE="dbus gps prison qalculate X"
COMMON_DEPEND="
- $(add_kdebase_dep libksysguard)
$(add_kdebase_dep baloo)
$(add_kdebase_dep kwin)
+ $(add_kdebase_dep libkscreen)
+ $(add_kdebase_dep libksysguard)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
@@ -62,7 +63,6 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
- x11-libs/libkscreen:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
diff --git a/kde-base/plasma-workspace/plasma-workspace-5.0.95.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.0.95.ebuild
index 5c09625..7a7baf3 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.0.95.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.0.95.ebuild
@@ -12,9 +12,10 @@ KEYWORDS=" ~amd64"
IUSE="dbus gps prison qalculate X"
COMMON_DEPEND="
- $(add_kdebase_dep libksysguard)
$(add_kdebase_dep baloo)
$(add_kdebase_dep kwin)
+ $(add_kdebase_dep libkscreen)
+ $(add_kdebase_dep libksysguard)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
@@ -62,7 +63,6 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
- x11-libs/libkscreen:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
diff --git a/kde-base/plasma-workspace/plasma-workspace-5.1.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.1.0.ebuild
index 274c85d..2881b1a 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.1.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.1.0.ebuild
@@ -12,9 +12,10 @@ KEYWORDS=" ~amd64"
IUSE="dbus gps prison qalculate X"
COMMON_DEPEND="
- $(add_kdebase_dep libksysguard)
$(add_kdebase_dep baloo)
$(add_kdebase_dep kwin)
+ $(add_kdebase_dep libkscreen)
+ $(add_kdebase_dep libksysguard)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -64,7 +65,6 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
- x11-libs/libkscreen:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
diff --git a/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild
index e8c81d0..a1794e5 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.1.9999.ebuild
@@ -12,9 +12,10 @@ KEYWORDS=""
IUSE="dbus gps prison qalculate X"
COMMON_DEPEND="
- $(add_kdebase_dep libksysguard)
$(add_kdebase_dep baloo)
$(add_kdebase_dep kwin)
+ $(add_kdebase_dep libkscreen)
+ $(add_kdebase_dep libksysguard)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -64,7 +65,6 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
- x11-libs/libkscreen:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index e8c81d0..a1794e5 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,9 +12,10 @@ KEYWORDS=""
IUSE="dbus gps prison qalculate X"
COMMON_DEPEND="
- $(add_kdebase_dep libksysguard)
$(add_kdebase_dep baloo)
$(add_kdebase_dep kwin)
+ $(add_kdebase_dep libkscreen)
+ $(add_kdebase_dep libksysguard)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -64,7 +65,6 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
sys-libs/pam
sys-libs/zlib
- x11-libs/libkscreen:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
diff --git a/kde-misc/kscreen/kscreen-9999.ebuild b/kde-misc/kscreen/kscreen-9999.ebuild
index 49a2e0d..89f786d 100644
--- a/kde-misc/kscreen/kscreen-9999.ebuild
+++ b/kde-misc/kscreen/kscreen-9999.ebuild
@@ -14,6 +14,7 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ $(add_kdebase_dep libkscreen)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
@@ -25,7 +26,6 @@ DEPEND="
dev-qt/qtdeclarative:5[widgets]
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- >=x11-libs/libkscreen-${PV}:5
"
RDEPEND="
${DEPEND}
diff --git a/sets/kde-applications b/sets/kde-applications
index 4b4e415..08c121a 100644
--- a/sets/kde-applications
+++ b/sets/kde-applications
@@ -1,3 +1,2 @@
# Autogenerated by regenerate-files, DO NOT EDIT.
# sort them later to the appropriate sets
-x11-libs/libkscreen:5
diff --git a/sets/kde-applications-5.0 b/sets/kde-applications-5.0
index b3f1de9..c82d540 100644
--- a/sets/kde-applications-5.0
+++ b/sets/kde-applications-5.0
@@ -1,2 +1 @@
# sort them later to the appropriate sets
-x11-libs/libkscreen:5
diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index 00861bb..a50029b 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -15,4 +15,3 @@
~kde-base/okteta-9999
~kde-base/okular-9999
~kde-misc/yakuake-9999
-~x11-libs/libkscreen-9999
diff --git a/sets/kde-plasma b/sets/kde-plasma
index 8ed9518..27139a8 100644
--- a/sets/kde-plasma
+++ b/sets/kde-plasma
@@ -11,6 +11,7 @@ kde-base/kmenuedit:5
kde-base/ksysguard:5
kde-base/kwin:5
kde-base/kwrited:5
+kde-base/libkscreen:5
kde-base/libksysguard:5
kde-base/milou:5
kde-base/oxygen:5
diff --git a/sets/kde-plasma-5.0 b/sets/kde-plasma-5.0
index bbe9a0b..c434fcf 100644
--- a/sets/kde-plasma-5.0
+++ b/sets/kde-plasma-5.0
@@ -10,6 +10,7 @@
<kde-base/ksysguard-5.0.50:5
<kde-base/kwin-5.0.50:5
<kde-base/kwrited-5.0.50:5
+<kde-base/libkscreen-5.0.50:5
<kde-base/libksysguard-5.0.50:5
<kde-base/milou-5.0.50:5
<kde-base/oxygen-5.0.50:5
diff --git a/sets/kde-plasma-5.1 b/sets/kde-plasma-5.1
index df49ad7..daf6b85 100644
--- a/sets/kde-plasma-5.1
+++ b/sets/kde-plasma-5.1
@@ -12,6 +12,7 @@
<kde-base/kwayland-5.1.50:5
<kde-base/kwin-5.1.50:5
<kde-base/kwrited-5.1.50:5
+<kde-base/libkscreen-5.1.50:5
<kde-base/libksysguard-5.1.50:5
<kde-base/milou-5.1.50:5
<kde-base/oxygen-5.1.50:5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-14 10:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-14 10:08 [gentoo-commits] proj/kde:master commit in: sets/, Documentation/package.unmask/, Documentation/package.mask/, Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox