Move oxygen-fonts from media-fonts to kde-base as it is part of Plasma 5 proper.

19 files changed, 26 insertions, 7 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 ab709aae365..41b949f845e 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 74b44eed0a3..4b714150001 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 fd8d5ced080..97164e7a15f 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 8286ca520a5..63a456984f2 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 c77b97983f8..bfa5b315d8a 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 d8fe2a1f752..36b0ab48a65 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 c77b97983f8..bfa5b315d8a 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/Manifest b/kde-base/oxygen-fonts/Manifest
new file mode 100644
index 00000000000..629c7b6628c
--- /dev/null
+++ b/kde-base/oxygen-fonts/Manifest
@@ -0,0 +1,2 @@
+DIST oxygen-fonts-5.0.95.tar.xz 160992 SHA256 5492244c45646fdc5192bbb430acebbdd4646e0a492128004198b6de88eb8862 SHA512 b5aa275c278fb4ec777825bdb3ac0356fa3c93ad234b1d155496e26822cbf8d5796734e01c66538c07820483193a1cb91f0259633831d548048739c69644298c WHIRLPOOL d0324d7ec9958451899070840a05984fd3aab5ef2fa97f9e0a783eee37194fd7e26a19884ace3f6b4dec7cc1569259cef5e4ac127f2bc03ba5bf5ee01e5f101f
+DIST oxygen-fonts-5.1.0.tar.xz 161092 SHA256 16741e6c1e931b0af9cb130a823e1d3afefbe395e983ba479d2e379b0702c92a SHA512 d7d3c47d3abc0f46c3cf6fb311e45419875c0eaedc790f4370ae754a212a1c109302e01a37b36dba7de4b8fcfa50066e58b592728a0261ca770531a9f6bbd363 WHIRLPOOL 64a1d74e25d1ea2c0f4bf491c1d3b8eb3b394f437a2296e12aea72c01ceda61967e2c486c542f763bbae5ce290d00c12bb53e1083e09d117193a64df85c817e5
diff --git a/kde-base/oxygen-fonts/metadata.xml b/kde-base/oxygen-fonts/metadata.xml
new file mode 100644
index 00000000000..a23f444b67d
--- /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
index f9488e36e8f..d3abaaf6241 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
index afe8e28742e..6dd58ed5dd9 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
index 4ddad71de56..a126649fce1 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 e2439672248..d72d665c8b8 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 7e3b1170ee2..53dea94a87d 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/media-fonts/oxygen-fonts/Manifest b/media-fonts/oxygen-fonts/Manifest
index ebfcf56fda8..26ebc4e0450 100644
--- a/media-fonts/oxygen-fonts/Manifest
+++ b/media-fonts/oxygen-fonts/Manifest
@@ -1,3 +1 @@
 DIST oxygen-fonts-0.4.2.tar.xz 543640 SHA256 6f0d76d81da1694241bca56c219dadfed538813077b5fa82389c08654a42ddde SHA512 81abf25d19f589aecb788e34d19ec524c44721e30435d328122c477404b5e877b8f66076dc9156ddc1b745b478502ca7b495eae367e14b0c2d5090ef93590c06 WHIRLPOOL 883dd8ad93608c789c4c87811b99f473c1a4f3c743fd0fd43efacd83635ff76888d2772230acf7d193e22f1c6496a53a0e077b892e8081d1d4e0c17f8b1f12fc
-DIST oxygen-fonts-5.0.95.tar.xz 160992 SHA256 5492244c45646fdc5192bbb430acebbdd4646e0a492128004198b6de88eb8862 SHA512 b5aa275c278fb4ec777825bdb3ac0356fa3c93ad234b1d155496e26822cbf8d5796734e01c66538c07820483193a1cb91f0259633831d548048739c69644298c WHIRLPOOL d0324d7ec9958451899070840a05984fd3aab5ef2fa97f9e0a783eee37194fd7e26a19884ace3f6b4dec7cc1569259cef5e4ac127f2bc03ba5bf5ee01e5f101f
-DIST oxygen-fonts-5.1.0.tar.xz 161092 SHA256 16741e6c1e931b0af9cb130a823e1d3afefbe395e983ba479d2e379b0702c92a SHA512 d7d3c47d3abc0f46c3cf6fb311e45419875c0eaedc790f4370ae754a212a1c109302e01a37b36dba7de4b8fcfa50066e58b592728a0261ca770531a9f6bbd363 WHIRLPOOL 64a1d74e25d1ea2c0f4bf491c1d3b8eb3b394f437a2296e12aea72c01ceda61967e2c486c542f763bbae5ce290d00c12bb53e1083e09d117193a64df85c817e5
diff --git a/sets/kde-plasma b/sets/kde-plasma
index 27139a867d4..28f8fd35d9c 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 c434fcf1597..c9459014ecb 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 daf6b85120b..679e6ba16f7 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 cf5226bf95d..181674a8eb5 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