commit: e0ac3a7e82dfce0f653e2331d059851bccaec8fc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 10:18:16 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 14 10:18:16 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e0ac3a7e
Move oxygen-fonts from media-fonts to kde-base as it is part of Plasma 5 proper.
---
.../package.accept_keywords/.kde-plasma-live/kde-plasma-live | 1 +
Documentation/package.accept_keywords/kde-plasma-5.0.keywords | 1 +
Documentation/package.accept_keywords/kde-plasma-live.keywords | 1 +
Documentation/package.mask/kde-plasma-5.0 | 1 +
Documentation/package.mask/kde-plasma-live | 1 +
Documentation/package.unmask/kde-plasma-5.0 | 1 +
Documentation/package.unmask/kde-plasma-live | 1 +
kde-base/oxygen-fonts/metadata.xml | 5 +++++
{media-fonts => kde-base}/oxygen-fonts/oxygen-fonts-5.0.95.ebuild | 3 ++-
{media-fonts => kde-base}/oxygen-fonts/oxygen-fonts-5.1.0.ebuild | 3 ++-
{media-fonts => kde-base}/oxygen-fonts/oxygen-fonts-9999.ebuild | 3 ++-
.../frameworkintegration/frameworkintegration-5.3.0.ebuild | 2 +-
kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild | 2 +-
sets/kde-plasma | 1 +
sets/kde-plasma-5.0 | 1 +
sets/kde-plasma-5.1 | 1 +
sets/kde-plasma-live | 1 +
17 files changed, 24 insertions(+), 5 deletions(-)
diff --git
a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
index ab709aa..41b949f 100644
--- a/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
+++ b/Documentation/package.accept_keywords/.kde-plasma-live/kde-plasma-live
@@ -21,3 +21,4 @@
~kde-base/plasma-workspace-wallpapers-9999 **
~kde-base/powerdevil-9999 **
~kde-base/systemsettings-9999 **
+~media-fonts/oxygen-fonts-9999 **
diff --git a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
index 74b44ee..4b71415 100644
--- a/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-5.0.keywords
@@ -23,3 +23,4 @@
<kde-base/plasma-workspace-wallpapers-5.0.50:5
<kde-base/powerdevil-5.0.50:5
<kde-base/systemsettings-5.0.50:5
+<media-fonts/oxygen-fonts-5.0.50:5
diff --git a/Documentation/package.accept_keywords/kde-plasma-live.keywords
b/Documentation/package.accept_keywords/kde-plasma-live.keywords
index fd8d5ce..97164e7 100644
--- a/Documentation/package.accept_keywords/kde-plasma-live.keywords
+++ b/Documentation/package.accept_keywords/kde-plasma-live.keywords
@@ -24,3 +24,4 @@
~kde-base/plasma-workspace-wallpapers-9999 **
~kde-base/powerdevil-9999 **
~kde-base/systemsettings-9999 **
+~media-fonts/oxygen-fonts-9999 **
diff --git a/Documentation/package.mask/kde-plasma-5.0
b/Documentation/package.mask/kde-plasma-5.0
index 8286ca5..63a4569 100644
--- a/Documentation/package.mask/kde-plasma-5.0
+++ b/Documentation/package.mask/kde-plasma-5.0
@@ -23,3 +23,4 @@
>=kde-base/plasma-workspace-wallpapers-5.0:5
>=kde-base/powerdevil-5.0:5
>=kde-base/systemsettings-5.0:5
+<media-fonts/oxygen-fonts-5.0.50:5
diff --git a/Documentation/package.mask/kde-plasma-live
b/Documentation/package.mask/kde-plasma-live
index c77b979..bfa5b31 100644
--- a/Documentation/package.mask/kde-plasma-live
+++ b/Documentation/package.mask/kde-plasma-live
@@ -24,3 +24,4 @@
~kde-base/plasma-workspace-wallpapers-9999
~kde-base/powerdevil-9999
~kde-base/systemsettings-9999
+~media-fonts/oxygen-fonts-9999
diff --git a/Documentation/package.unmask/kde-plasma-5.0
b/Documentation/package.unmask/kde-plasma-5.0
index d8fe2a1..36b0ab4 100644
--- a/Documentation/package.unmask/kde-plasma-5.0
+++ b/Documentation/package.unmask/kde-plasma-5.0
@@ -23,3 +23,4 @@
<kde-base/plasma-workspace-wallpapers-5.0.50:5
<kde-base/powerdevil-5.0.50:5
<kde-base/systemsettings-5.0.50:5
+<media-fonts/oxygen-fonts-5.0.50:5
diff --git a/Documentation/package.unmask/kde-plasma-live
b/Documentation/package.unmask/kde-plasma-live
index c77b979..bfa5b31 100644
--- a/Documentation/package.unmask/kde-plasma-live
+++ b/Documentation/package.unmask/kde-plasma-live
@@ -24,3 +24,4 @@
~kde-base/plasma-workspace-wallpapers-9999
~kde-base/powerdevil-9999
~kde-base/systemsettings-9999
+~media-fonts/oxygen-fonts-9999
diff --git a/kde-base/oxygen-fonts/metadata.xml
b/kde-base/oxygen-fonts/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-base/oxygen-fonts/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/media-fonts/oxygen-fonts/oxygen-fonts-5.0.95.ebuild
b/kde-base/oxygen-fonts/oxygen-fonts-5.0.95.ebuild
similarity index 93%
rename from media-fonts/oxygen-fonts/oxygen-fonts-5.0.95.ebuild
rename to kde-base/oxygen-fonts/oxygen-fonts-5.0.95.ebuild
index f9488e3..d3abaaf 100644
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.0.95.ebuild
+++ b/kde-base/oxygen-fonts/oxygen-fonts-5.0.95.ebuild
@@ -11,7 +11,7 @@
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts";
SRC_URI="mirror://kde/unstable/plasma/${PV}/${P}.tar.xz"
LICENSE="OFL-1.1"
-SLOT="0"
+SLOT="5"
KEYWORDS="~amd64"
IUSE=""
@@ -19,6 +19,7 @@ DEPEND="
dev-libs/extra-cmake-modules
media-gfx/fontforge
"
+RDEPEND="!media-fonts/oxygen-fonts"
src_configure() {
local mycmakeargs=(
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.1.0.ebuild
b/kde-base/oxygen-fonts/oxygen-fonts-5.1.0.ebuild
similarity index 93%
rename from media-fonts/oxygen-fonts/oxygen-fonts-5.1.0.ebuild
rename to kde-base/oxygen-fonts/oxygen-fonts-5.1.0.ebuild
index afe8e28..6dd58ed 100644
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.1.0.ebuild
+++ b/kde-base/oxygen-fonts/oxygen-fonts-5.1.0.ebuild
@@ -11,7 +11,7 @@
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts";
SRC_URI="mirror://kde/stable/plasma/${PV}/${P}.tar.xz"
LICENSE="OFL-1.1"
-SLOT="0"
+SLOT="5"
KEYWORDS="~amd64"
IUSE=""
@@ -19,6 +19,7 @@ DEPEND="
dev-libs/extra-cmake-modules
media-gfx/fontforge
"
+RDEPEND="!media-fonts/oxygen-fonts"
src_configure() {
local mycmakeargs=(
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-9999.ebuild
b/kde-base/oxygen-fonts/oxygen-fonts-9999.ebuild
similarity index 93%
rename from media-fonts/oxygen-fonts/oxygen-fonts-9999.ebuild
rename to kde-base/oxygen-fonts/oxygen-fonts-9999.ebuild
index 4ddad71..a126649 100644
--- a/media-fonts/oxygen-fonts/oxygen-fonts-9999.ebuild
+++ b/kde-base/oxygen-fonts/oxygen-fonts-9999.ebuild
@@ -11,7 +11,7 @@
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts";
EGIT_REPO_URI="git://anongit.kde.org/oxygen-fonts"
LICENSE="OFL-1.1"
-SLOT="0"
+SLOT="5"
KEYWORDS=""
IUSE=""
@@ -19,6 +19,7 @@ DEPEND="
dev-libs/extra-cmake-modules
media-gfx/fontforge
"
+RDEPEND="!media-fonts/oxygen-fonts"
src_configure() {
local mycmakeargs=(
diff --git
a/kde-frameworks/frameworkintegration/frameworkintegration-5.3.0.ebuild
b/kde-frameworks/frameworkintegration/frameworkintegration-5.3.0.ebuild
index e243967..d72d665 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.3.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.3.0.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=" ~amd64"
IUSE="X"
RDEPEND="
+ $(add_kdebase_dep oxygen-fonts)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -27,7 +28,6 @@ RDEPEND="
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- media-fonts/oxygen-fonts
X? (
dev-qt/qtx11extras:5
x11-libs/libxcb
diff --git
a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index 7e3b117..53dea94 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=""
IUSE="X"
RDEPEND="
+ $(add_kdebase_dep oxygen-fonts)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -27,7 +28,6 @@ RDEPEND="
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- media-fonts/oxygen-fonts
X? (
dev-qt/qtx11extras:5
x11-libs/libxcb
diff --git a/sets/kde-plasma b/sets/kde-plasma
index 27139a8..28f8fd3 100644
--- a/sets/kde-plasma
+++ b/sets/kde-plasma
@@ -21,3 +21,4 @@ kde-base/plasma-workspace:5
kde-base/plasma-workspace-wallpapers:5
kde-base/powerdevil:5
kde-base/systemsettings:5
+media-fonts/oxygen-fonts-5.0.50:5
diff --git a/sets/kde-plasma-5.0 b/sets/kde-plasma-5.0
index c434fcf..c945901 100644
--- a/sets/kde-plasma-5.0
+++ b/sets/kde-plasma-5.0
@@ -20,3 +20,4 @@
<kde-base/plasma-workspace-wallpapers-5.0.50:5
<kde-base/powerdevil-5.0.50:5
<kde-base/systemsettings-5.0.50:5
+<media-fonts/oxygen-fonts-5.0.50:5
diff --git a/sets/kde-plasma-5.1 b/sets/kde-plasma-5.1
index daf6b85..679e6ba 100644
--- a/sets/kde-plasma-5.1
+++ b/sets/kde-plasma-5.1
@@ -22,3 +22,4 @@
<kde-base/plasma-workspace-wallpapers-5.1.50:5
<kde-base/powerdevil-5.1.50:5
<kde-base/systemsettings-5.1.50:5
+<media-fonts/oxygen-fonts-5.1.50:5
diff --git a/sets/kde-plasma-live b/sets/kde-plasma-live
index cf5226b..181674a 100644
--- a/sets/kde-plasma-live
+++ b/sets/kde-plasma-live
@@ -21,3 +21,4 @@
~kde-base/plasma-workspace-wallpapers-9999
~kde-base/powerdevil-9999
~kde-base/systemsettings-9999
+~media-fonts/oxygen-fonts-9999
