gentoo resync : 18.08.2019

3 files changed, 41 insertions, 17 deletions

diff --git a/app-i18n/kcc/Manifest b/app-i18n/kcc/Manifest
index e1a351a221f4..b85505cbafe2 100644
--- a/app-i18n/kcc/Manifest
+++ b/app-i18n/kcc/Manifest
@@ -1,5 +1,6 @@
+AUX kcc-1.0-fix-build-system.patch 501 BLAKE2B 716e34d3fec17ed1d5acd62502b65f4345318c112220cc22684e5c2589e479ec1060b5b75f9835047487d3a6419a66135ed06b267388844fac7ac74da997eff5 SHA512 21f5ebbaaf478cf7f5e881ffb708266de4f41ea50898cffb596869b74e55c5bea98acbcbc318257da80f383ebd7626ab7640ccbd42db86fe67e1fec129aab9cb
 AUX kcc-exit.diff 161 BLAKE2B 48570ac2b258a9567e9dad4075a248f5a4d685225e4f676322a3430ef43764b95d5d36fac5f68ba6de1537b59d6750be8111ea79407019debf9f3928f069427e SHA512 8ee69339db13935d54562189e86941384dc5c01caa30e4efba11e783690b863a1210a5e841ab8a5ac907af9002ac6debd3516a6928f15777a8b31c2089907214
 AUX kcc-gcc3-gentoo.diff 1026 BLAKE2B e7db744d0ce7b34e5686f5e5d256eb16def94cdf83aaeac1d21a77831c7b21df3852b50313af79a570a2fe21ca24dbcdc545d9f9afa498cbb78a9a867261f5c6 SHA512 59c57ee4c34e27b8a0558896e5a94b21f976351e0cd372bc9bd85ac83757276eecdcabd81e4fb02b6f2513e06542d63bcf656140d5407a0e2804f04d5ab55303
-DIST kcc.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145
-EBUILD kcc-1.0.ebuild 719 BLAKE2B 12e16f98ff4a63dba5f5f1258f42d7f489fb7ed20b1d67bb8113d8796ba624655369ced9152ed31cb35a14219e2c29fa8bd658e8088e4a8e1a3aa3b5f5acb87d SHA512 be0ae39180e876b6b7a64f5e45e82d88ab8e5276f6662954b807c5082169982344b096c79f08fc820f25717438a6e0bbfba4f32f690fd2df27b62dde904e9450
+DIST kcc-1.0.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145
+EBUILD kcc-1.0.ebuild 609 BLAKE2B fc0121ea4e198fb75d3056a7e56133f8bfedcdf9ffcb078461e6db28b9ccec34fa742524bb9f9897e203e617e7ba159b838478d05ef834c8f0f5f0d1c9b8f259 SHA512 516f3b811dc6204ec9dab414926a9d00aed49fd5341ea8be5219316775ce9e32148c122ea7b23cca6d8fc01e61c76176843a97542fafb8db772ebe2e72c43ef5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch b/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch
new file mode 100644
index 000000000000..7818215d62fc
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -10,11 +10,9 @@
+           BINPATH = /usr/local/bin
+           MANPATH = /usr/local/man
+           JMANDIR = japanese
+-           CFLAGS = -O
+ 
+             SHELL = /bin/sh
+                CP = cp
+-             MAKE = make
+           INSTALL = install
+ 
+              CMDS = kcc
+@@ -23,9 +21,6 @@
+ 
+ all:	kcc
+ 
+-kcc:	kcc.o
+-	$(CC) $(CFLAGS) -o kcc kcc.o
+-
+ install: $(BINPATH)/kcc
+ 	@echo "\`make install' done."
+ 	@echo "Run \`make install.man' to install a manual."
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index bcb220713949..20ee1ee57350 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A Kanji code converter"
 HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
-SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gcc3-gentoo.diff"
-	epatch "${FILESDIR}/${PN}-exit.diff"
-	sed -i "s:\(-o kcc\):\$(LDFLAGS) \1:" Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gcc3-gentoo.diff
+	"${FILESDIR}"/${PN}-exit.diff
+	"${FILESDIR}"/${PN}-1.0-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin kcc
-	dodoc README
+	einstalldocs
+
 	cp -f kcc.jman kcc.1 || die
 	doman -i18n=ja kcc.1
 }