gentoo resync : 03.11.2019

3 files changed, 25 insertions, 27 deletions

diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index d4b7f047616f..b82ed53fbb0c 100644
--- a/media-fonts/zh-kcfonts/Manifest
+++ b/media-fonts/zh-kcfonts/Manifest
@@ -1,6 +1,6 @@
 AUX kcfonts-1.05-code-fixups.patch 4629 BLAKE2B 26135dad3608b8161d39491576c42ef8140403533f05b2334825cf4f09f75d8a3a5be24fe4257014020eca7303a395f09877eaa851d966c4972bf3b6e5ac4e92 SHA512 d6c5f3bc5dc3f876bfdb2cf43d6d26cafc6f1c266674f96c40cd50aa5406669ce3059f7ec9a7edda123d072a165fffdf7e19e7043c149ce4e68274916cb52d39
-AUX kcfonts-1.05-parallel-make.patch 362 BLAKE2B 7566d4588ff2daf66895a7a78a271c1f02fe3fe1547321681fd46bf7d7bc0a4941b019f9d2d0e05c60bd4da3a5fed44eb0f6e369d6361884d61beb6594968862 SHA512 16adfcdc4a570dad0fc2abf9cb36fbf40309a0ceb1d9c3938169ba965603c9fdf89516b82c2645fef3ff39e2fd0acae19c59c36ba4ddbaa8aaa044f9f9f941e6
-DIST kcfonts-1.05-freebsd-aa_ad.patch.gz 4825 BLAKE2B 681e23308fe202d6f3276ffc0a61186d623bafb95a7af66949ee2df52ac76632dfd65247b98e0f6ee639f19e098fd86a205e2b96a705982697db7f68a3bedfd7 SHA512 31146c530e5f3845b184029e22c71b7ee8fa1fd73e0fdf3e6cf90500129e70a58738d75926c97c71467571899f8a1f2f71df5a15fb68a503a5f06a4354ea42f6
+AUX kcfonts-1.05-parallel-make.patch 289 BLAKE2B 8f23ea32c830425ecaa45b01713d2c85e073a66f4fd0edd9c3ee48d31119da012428031e5e978266c0f4a16d75a9b161bea282b6af8a2f4bb8347bfbe38e2710 SHA512 8e00add5e6ace48ec8de7e6960f50f634317c7e9f0b57c723b9b6ec8b8f0e8d92f81b5339302284d839a3b8af79880e0de0208473fcc3e4eab500cb47aa72964
 DIST kcfonts-1.05.tar.gz 903701 BLAKE2B 344017187fb5ff1a13cb9e05e84a56d38a7b7d14865ec471bf9c36c383f1681b1944346af2d3b1f67ba340b8101a968ef527f0a27ee7e5ac3837f1c67da33325 SHA512 a8b94e8f8095a8578ff340637bf4a197db56948d0d7ecda0d4f17da51bafc09080761f32894f88a54c88945f72b10a11dcb04e5841c19c4eb6852e263fb64209
-EBUILD zh-kcfonts-1.05-r3.ebuild 1014 BLAKE2B fcde38e08c9f24d312950251404d85af61a708a93cf646911fdea79692fd89d336acb5a538575490cab2f0f610014fbfdea47497fd3a04b3b97a79620fbf66d1 SHA512 b1b9702a16f2e1fde964b369fed3befe53389969d16589ba87c53525c8ff7b6277155a8d0a9d9e263577eb4b228996feec33fe456e44d0529415acd7e2751620
+DIST zh-kcfonts-1.05-freebsd-aa_ad.patch.gz 4749 BLAKE2B 3d488977e76ae71587ced990816a85173b5a3196df3803ba517d99b8ad4244d59355a0b9c34d683c7cdf8b5660a0f411c9d544379caf0ddca1f8bef35eb7028b SHA512 2881c31ffc5b8fbc2e27edd6f139436da89bd3db3a654bbcb4b8f037db0388bf592b83014b750057264694040c8f2c3d28718f46ad3cf1fe5e13256df7666fae
+EBUILD zh-kcfonts-1.05-r3.ebuild 949 BLAKE2B 2ff20122b137b1a78fbb5ee2bbc8b1cdd6a0e787eea8fee2790ddaa016874d482a403de0ebdbb931c345b069553c333286bd53f3f44569e7565ccf40397481b1 SHA512 c923fe22b1f017d9e46350808e97ad5adce6dd544b4919603c34d5a0c0bfe19ef481521881b87631e500b34834c72f2bd5c73edf205aa2e0037e6a2ad065cbfe
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch b/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch
index 93fc8ed9608e..46d552b3a63e 100644
--- a/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch
+++ b/media-fonts/zh-kcfonts/files/kcfonts-1.05-parallel-make.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-01-01 10:45:14.000000000 +0900
-+++ Makefile	2009-01-01 10:45:32.000000000 +0900
+--- a/Makefile
++++ b/Makefile
 @@ -31,7 +31,7 @@
  	$(CC) $(CFLAGS) tran.o kc24f.o -o $@
  kc15f:		tran.o kc15f.o
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index fcc568527812..c08fdae5871d 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-S="${WORKDIR}"
-inherit eutils font toolchain-funcs
+inherit font toolchain-funcs
+
+MY_P="${P#zh-}"
 
-MY_P="kcfonts-${PV}"
 DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
-SRC_URI="ftp://freebsd.sinica.edu.tw/pub/distfiles/${MY_P}.tar.gz
-		ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
-		mirror://gentoo/${MY_P}-freebsd-aa_ad.patch.gz"
-HOMEPAGE="http://freebsd.sinica.edu.tw/"
 # no real homepage exists, but this was written by Taiwanese FreeBSD devs
+HOMEPAGE="http://freebsd.sinica.edu.tw/"
+SRC_URI="
+	ftp://freebsd.sinica.edu.tw/pub/distfiles/${MY_P}.tar.gz
+	ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-freebsd-aa_ad.patch.gz"
 
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
-
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-DEPEND="x11-apps/bdftopcf"
-RDEPEND=""
+BDEPEND="x11-apps/bdftopcf"
 
-FONT_SUFFIX="pcf.gz"
-DOCS="00README Xdefaults.*"
+S="${WORKDIR}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${WORKDIR}"/${P}-freebsd-aa_ad.patch
+	"${FILESDIR}"/${MY_P}-code-fixups.patch
+	"${FILESDIR}"/${MY_P}-parallel-make.patch
+)
 
-	epatch "${WORKDIR}/${MY_P}-freebsd-aa_ad.patch"
-	epatch "${FILESDIR}/${MY_P}-code-fixups.patch"
-	epatch "${FILESDIR}/${MY_P}-parallel-make.patch"
-}
+FONT_SUFFIX="pcf.gz"
+DOCS="00README Xdefaults.*"
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }