gentoo resync : 21.12.2017

4 files changed, 13 insertions, 11 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 6676c15fcd4b..69101802cf0f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index 797ad3c78f3a..28c930bc513d 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-ja-20130215.tar.gz 4384182 BLAKE2B eb6a4be0a53763776b629369028eeae96f472a8dcb0752559d124cbffc7b18a5d939fe6e37d05c1162aeec79701c63fe1602754f260edbb281cd543144d98c77 SHA512 655e9481dfdfc619013f8cae2928d7ccd70bba31631f7b10b894b1d96ab64bae4846be68d8a633791f1c169faed6d42466bd60ee4d7f92031f596d8f23cb6138
-DIST man-pages-ja-20131015.tar.gz 4546129 BLAKE2B d11592e752c8f48b054552fcd5beb4430ae83bd06e699d34fa9b7039a89e57347d13ae2343f190541f881bd08e2f443a669c299f7ce6e5dd9d7e1e78f3d862b0 SHA512 afd2aa2fb227814a8de4b75baec4359e401ef055e23795719b964cba10e5018a368ba924719b017709c2bb34a5ebca58d6eb85512871515d6e7867fc4b0e4982
+DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
 DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
-EBUILD man-pages-ja-20130215.ebuild 1967 BLAKE2B c2d3bd3a8925338a927e7c489bb0f550ccb9641f1c162b206d4a80ce7a2c1b16da30724b8aeb4105042d892a9d1ea5c056d1d824730495168cae7b139d59b6e6 SHA512 0e02d9bcf229ff70cc7a251974ab1acbae4f0a45f5d099f829bcc3c94bb305bac9cef6cfbf768b67340c5332abc4f755275c1971c3c53d86e883aa1ca4e6be94
-EBUILD man-pages-ja-20131015.ebuild 2061 BLAKE2B 51d1e853c2c8ae3419530759a1afc46f7a736cbd0db20e048290be437f7b8d8a0adb9cb7501a42ef0f1a3bbce5ac5d5b1ee044fecc8810b9ef8b1ef47641f7a9 SHA512 a657113b191e7c6f46ed77d7400d94a68f351f3ca603ae985c2fd16b2f00cc5ae80801a8cfb11fdb5d772aad96cde93f2b05e5619b8f2604b4d429b8dad1f276
+EBUILD man-pages-ja-20130215.ebuild 1967 BLAKE2B fec0a8181dcab4faf724961902c7cf6f980fdf3175da33958de92f528e81f032eb319d39a29a11f45e4552a64ab934faafb20f50c8bdd908fc5929968fe1f7bb SHA512 c1bdafca8b2048360ef75d1bfd83aaea3284239eb1cc801f862d60cb1cba13736457f077f9914504e98ebe8995e7dfe33fb727613ad5109bfbb27b0db8694ed8
+EBUILD man-pages-ja-20171215.ebuild 2036 BLAKE2B f5b8bb35eb006273da0b5836bc94e8903413da931a35131bfbbb08615391c7771f3fc3a24e5eb17b8cd5a93908101a83337ad6d7f6644bffbd807e9e801f716f SHA512 fe7e4547a9e524e60e1a911b13dd1953f5c636c2583b152ea9330daedf635bea51e6e19b64369ae23717695e1ccc2aea14281242f8fe04afc6c196631c948e97
 MISC metadata.xml 674 BLAKE2B 52381f36a78ec6aaf9855e9828d0f6e25f46c78d9049f90c604ef6ddd339e56831731c5e2a6c25731725767763cc37e9ece2a6d862500ed3de63c9501d305fa7 SHA512 4930172347182e65fa0fa30e2fcef5bfc391e6fb1dfefaa872ebe609c9583b58a5d8a62bfbddaf8b8ecf2a80ec30752c71fb658dfd4569a4493bc9eeff6de2b3
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
index 1a9fc078196a..18dd7e540c6c 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20131015.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
index 8b933def20b0..7d0b4b2cc1fc 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20131015.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI="6"
 GENTOO_MAN_P="portage-${PN}-20060415"
 
 DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
+HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja"
+SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
 	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
@@ -25,12 +25,14 @@ src_prepare() {
 	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
 	rm -f manual/*/man8/{vigr,vipw}.8 || die
 	# - app-arch/rpm +nls
-	rm -f manual/rpm/man8/rpm*.8 || die
+	rm -rf manual/rpm || die
 
 	for f in manual/*/man8/ld{,-linux}.so.8 ; do
 		mv ${f} ${f/.so.8/.so.ja.8} || die
 	done
 	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
+
+	eapply_user
 }
 
 src_compile() {
@@ -61,7 +63,7 @@ src_install() {
 		pkg=
 	done
 
-	dodoc README || die
+	dodoc README
 
 	cd "${WORKDIR}"/${GENTOO_MAN_P}
 
@@ -75,7 +77,7 @@ src_install() {
 		fi
 	done
 
-	newdoc ChangeLog ChangeLog.GentooJP || die
+	newdoc ChangeLog ChangeLog.GentooJP
 
 }