diff options
23 files changed, 63 insertions, 39 deletions
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords index fa46cc4e420..74b44eed0a3 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 bee9128f085..8286ca520a5 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 b0025f74406..d8fe2a1f752 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/Manifest b/kde-base/libkscreen/Manifest index b055eb0d6e4..b055eb0d6e4 100644 --- a/x11-libs/libkscreen/Manifest +++ b/kde-base/libkscreen/Manifest diff --git a/x11-libs/libkscreen/libkscreen-5.0.93.ebuild b/kde-base/libkscreen/libkscreen-5.0.93.ebuild index 674f1806471..75ccc21629e 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 index 7b7fe0bfc28..8b08464f77b 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 index a69fb26e084..3abd4bdc012 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/kde-base/libkscreen/libkscreen-5.1.9999.ebuild b/kde-base/libkscreen/libkscreen-5.1.9999.ebuild new file mode 100644 index 00000000000..83386aca242 --- /dev/null +++ b/kde-base/libkscreen/libkscreen-5.1.9999.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="KDE screen management library" +LICENSE="GPL-2" +KEYWORDS="" +IUSE="" + +# TODO: add X use flag, does not build at the moment + +DEPEND=" + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXrandr +" +RDEPEND="${DEPEND} + !x11-libs/libkscreen:5 +" diff --git a/x11-libs/libkscreen/libkscreen-9999.ebuild b/kde-base/libkscreen/libkscreen-9999.ebuild index a69fb26e084..83386aca242 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 00000000000..a23f444b67d --- /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 86d012b052d..3d818c37006 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 24d50629c6d..31739a318a8 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 5c09625cd0b..7a7baf3bf20 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 274c85d3472..2881b1ac3a9 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 e8c81d0a51b..a1794e5fdb3 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 e8c81d0a51b..a1794e5fdb3 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 49a2e0d1af2..89f786d28bd 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 4b4e415fd67..08c121a0dd8 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 b3f1de98a0d..c82d54064c3 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 00861bb31cf..a50029b8596 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 8ed95187a77..27139a867d4 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 bbe9a0bbd8d..c434fcf1597 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 df49ad7905e..daf6b85120b 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 |