gentoo resync : 03.11.2019

3 files changed, 4 insertions, 44 deletions

diff --git a/media-fonts/oxygen-fonts/Manifest b/media-fonts/oxygen-fonts/Manifest
index 12dc344fdcec..3f1d59cf5412 100644
--- a/media-fonts/oxygen-fonts/Manifest
+++ b/media-fonts/oxygen-fonts/Manifest
@@ -1,5 +1,4 @@
 AUX oxygen-fonts-5.4.3-fix-d-and-t-accents.patch 1720 BLAKE2B a6c6d8383db8470412cf2a9d3e60cffd1c808d5edc188b6bf991abc64e42bb963c4204fcbc8ee37f87ead26315d5e9073677bd657116bcfd7060f14d6ede13af SHA512 ef19f8e7d4a62a811402ac6604a338c030f6e7e7e74cf967040f22d2d6e49aa37cf0e2404bdd612e83ba29ecd73df4f91431fbc608fec0a125d19f80dbda807c
 DIST oxygen-fonts-5.4.3.tar.xz 161700 BLAKE2B f0232b46e35a2a66905907da772de3ab8dc60c823c400825d7198d860870f447f83bf8328d086d1a676b6f223bc99b4335249fca49d3d13a4b2f575831d060bd SHA512 6dab7b2ef3f7540cd28e91435662f6c43ef9e972fe4ccd1e58ba8904d1b4e8f1ca562384d02df1fc7c5dd5366e9be1ed0a1590a9b9a182621e4bab26ffc3497f
-EBUILD oxygen-fonts-5.4.3-r1.ebuild 763 BLAKE2B 9d530ba2d2c7fff9db6d3b54efddc7256144c4acdfa7ac2afc6f618b05207fb7478312d5496d44e9a835653fcc4596a106d178ece5de7cebdc3b782a453d97cc SHA512 13af093ca8babb47b0f3dab2d6fd2e890a9ebf943de3279bbbc58a1a75ac4c9f19f59049a1e47dfdf1956f5072ffe05bf20e8a9a64816b6d83ee63c74acc56f1
-EBUILD oxygen-fonts-5.4.3.ebuild 778 BLAKE2B a58f3f6b56a458cc228bc56fbc9ff25c56d4ce261d232649b395171658a7b330c35ada0efe2f3e57598a975ff1d4ba83882c030ae1858f50334c9cf8858d20b0 SHA512 d786954b3458b8adefe5013c821bce9f7a324c24f9623a44f3d15e360ffa6c7f67dfde9bf9fdec40e20ee2742d50221b4872027de36fa5a1e8e6c6d0c872ccc4
+EBUILD oxygen-fonts-5.4.3-r1.ebuild 762 BLAKE2B 8e8ad5a0ae3329467cd4e8ebb16f2c4538a586fc756363e8f2dd934d763a2ae8b9ca088ea975f3edbcdce896662dc50399bf15c65391cfe3d8842cbb6d3d28b0 SHA512 7b5ce5ce970d2a784aa1067abcae28a0e8d0943b518ff543437428bfea319b3765d7a5b7eae6a60aa5073a10ed2b9b20e1144150ad86142fd05fb78dd1940314
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
index 41c1df5c8716..4e9dd767cbfd 100644
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
+++ b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
@@ -12,10 +12,10 @@ HOMEPAGE="https://cgit.kde.org/oxygen-fonts.git"
 SRC_URI="mirror://kde/unstable/plasma/$(ver_cut 1-3)/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 	media-gfx/fontforge
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3.ebuild b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3.ebuild
deleted file mode 100644
index 627c010b9df2..000000000000
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 font xdg-utils
-
-DESCRIPTION="Desktop/GUI font family for integrated use with the KDE Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
-SRC_URI="mirror://kde/unstable/plasma/$(ver_cut 1-3)/${P}.tar.xz"
-
-LICENSE="OFL-1.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	media-gfx/fontforge
-"
-
-DOCS=( README.md )
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	font_src_install
-}