gentoo resync : 21.10.2017

6 files changed, 4 insertions, 130 deletions

diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 33bc70762310..6302db2a1508 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -4,7 +4,7 @@ DIST joe-4.3.tar.gz 1270523 SHA256 985d6a8f943a06e64165996c24d7fecaeae8c59efb529
 DIST joe-4.4.tar.gz 1350062 SHA256 a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979 SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d WHIRLPOOL a1d1cb7b519b62b4380f5b281ea49f06556fb670f4e77b63af2e8f0265794ca907502d76fcf756620111f115c260c3a72bb54d1dc52eb3b9a04f3392aad5ba7b
 EBUILD joe-4.2.ebuild 1170 SHA256 4814b782714a2ee0e906a702a37b3f3ce1ab31dc2661d9a512a3297ea1a8c5da SHA512 e0b51d75d14eb5bc34fd8628ce36f77cb4154965fe8189fccbb2d5d4a4dc746f6ccee09b13a50347a532619b06f13ec254c0c1fd37caaefa9886ca1e6e8504c9 WHIRLPOOL a34b668acbfc527bc154ad0fe98faaa20f10330734ed736047182f4bd044a8b8cc9728bc3febc118e74efc57a473575599d69155b7f6e1b16151a47fc2f532f2
 EBUILD joe-4.3-r1.ebuild 1303 SHA256 59e58d759bbbd005df71611c32719564422d5546e2c404a8fce0baa768cfe90f SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a WHIRLPOOL 39432042be62563bdf2d74165d0b75d34f7d6878654a39b62c23988a630d2c4bb13d8a783096af72a4a3c73958cf96b73c0ceb848bde23ea72c9e11031848346
-EBUILD joe-4.4.ebuild 1310 SHA256 d487a80cc43470c5027a364b634752cc3ca24ea4f2428ecb9bbc5be482f0c085 SHA512 a7c1af5371c00715107834b52d2d8ba368fccdfe9f01b8d0b7c0a1423fb5c17e7808a10c5e7999f1fb6b2f0f86c3f4ede6b9803416cd5a592d0cc30a476ac140 WHIRLPOOL ddc5f26b78ee0d1647268061553c0eb6d5ffaa01d8b3e5c1478be7e3fdca0d845185de2c62f775833f7bd2dfcf6c017bc7e9843a38ffe3bcc749fefe8bb6b36d
+EBUILD joe-4.4.ebuild 1308 SHA256 d3ae94687f2c8758ad1b37d0ea5e44e559cfbaa26fd2e089e1d6b7bcb1b75c48 SHA512 4ecedb096ab5e52d5acbdeb32441af60b5ec203c0cc591aa2d954daf5c60ee085cbb0f0dea337bbba08b651d64b5e8c7f8a13bd4f6a33dd9fcb49fcb8e3a29c9 WHIRLPOOL 1974ea8dc76b707af228712f9cf86e391efdc2ed10e9b6caea084d1ad533d316f66ccb3911637a91a6b9f07f0d66b9fa673f7c2f783965bbaabde5bf10c75f62
 MISC ChangeLog 5460 SHA256 8b154124514ec58cecec4f83261d59a6d69bed7d32c112049a1eb27c74e75c8c SHA512 c62d6feaf242d630f4c38d5fb2d0bc1438bcf9aa7cd23b09fac29756ee623c6dc5861171fbaf9b23a28896425ebb5ab178eedbededbb3ca32da378fbd989a2fd WHIRLPOOL 584b6764b7275b1f393c72816e760eef1771bcafb45c70ebb94de5c70849f53199f377b19e00c99597236b8e28996f7162843a88d935eea8939fe734386a1e97
 MISC ChangeLog-2015 10842 SHA256 be0f3879bc83f8e2fb6ca9c7e0827d74827929b18d8c21a4c4fd1b40559b806f SHA512 17e8efc2b71a219810237e08f687ffaf810698685180fd38a3e7a4667ca90d97cd5000a346a1ef350a4e4d1034438437af3e644133eca45c4edc90ba39d28a28 WHIRLPOOL 3de0ed2a94ba65462fa2ead3acd6e5735ef18b01c60cf118b38cd36a0e6b552d6d18a97d67fb77df085f3fcc625c5048aa703c812e0b71a319ea8e38f1159705
 MISC metadata.xml 914 SHA256 270873d328134a450720a9f8001f441e02cbda456ca88b3d5917e865fe7ef96c SHA512 12324115a08719acf2377848a9cb930b4ad69764624a1cf093e4ef3e124fef85e059476a0f1b353314a03d97089fe0c518adf47f2da102f7492a1e612c420b15 WHIRLPOOL 0db68c8ca2f849e6020b8ed82c70f6d6e1f8bde0570dbd78f5faea25820e28d3c995f23dd04bce2ccc48e93e6393987b2d180ed3269af7e36c1edc6046c7eed5
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
index 9efa39321ee1..478c633912c8 100644
--- a/app-editors/joe/joe-4.4.ebuild
+++ b/app-editors/joe/joe-4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest
index 1cae0ffc1a56..63be18a3dc0a 100644
--- a/app-editors/ng/Manifest
+++ b/app-editors/ng/Manifest
@@ -1,9 +1,7 @@
 AUX ng-1.5beta1-configure.patch 658 SHA256 58b266ea3d702dd916e5d488b1313dd6885ea545ea4a8690f4abac71e2e9ea73 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b WHIRLPOOL e3c7426991ae978788b37d3ff6ddde5a5b2fafcfb5fb08d7cc9d9c696bd44effae73d54b8496a8ea9655f5c7a2e46a983100c1d731001cab525dac92f7c9631c
 AUX ng-1.5beta1-ncurses.patch 551 SHA256 ba1b905ab0068fb80d3ba0806b02fe0a87f4cb6546b6b9450156060ff8d5d870 SHA512 14d457f782e8441866763a0fc82dd727a9fd7e7ab9dbc92da313b0eb739fd3f415d89633d7f553f9937b7d6a97164d8eda6caa45602edea22a8036cc50d2b91d WHIRLPOOL ca635ff2ab7eb78e860b15ab0b6cdd5f56680e87ad1ccc26dce4720c21cfcc3f0161e34dd46731ea0d3480041cb2a379858c1811c688b8f23fd2ed1ccd073866
 DIST ng-1.5beta1.tar.gz 662557 SHA256 990b2ed34f2943da71af6771c0ac9a62c36857d6e6e6ad6e7dc8782860388d3c SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd WHIRLPOOL 0764ac5fb4ab0f1663c5d3dc13754d1537ac5607463bcbc97d690f9743da41fc56e0deb9ab05103115667ce5e9d62d2278a43740b538b9b8e4c0edf08260d2e7
-EBUILD ng-1.5_beta1-r1.ebuild 1172 SHA256 d1cfcbb4da372174201e5759abb6907bc520de62a3f591478c7bd532c1c3df50 SHA512 97fd67bc2efb0b8bfbfdd60aefcfe599b020559602ec1437f5098403cb56f6ba01684e59d7b8d9ab017146e13775f2b4bba410b2375e47ad85a3cce30f172d0a WHIRLPOOL d8da67fea1c5fc85cec3093f5a5b02ee95b5241a77b04de06421f01994710a63d09f998d04a8a3afbd81efa9663918b1641d8d765853204db3fd8969cbadda76
-EBUILD ng-1.5_beta1-r2.ebuild 1200 SHA256 7d6b42325765e0c0c54faaf82decb093ab093f694b4d6ad3ac482b705ef1569a SHA512 cb8f72475492d596a2f177c5ae0915fc66e3813c4803e8cfb14ef75de183d9cb791f2ac744af91362a68136bc6dec2ab0d3e3276d6102233d825ac0f09bcf4d0 WHIRLPOOL 7be0a052a2e2aa98a5478a7adfa7ce49538ba3acecb580c90f95def0651a1ebcfabd2314c68e1668a2996a373410451f1c9c24a0e4bb5e5e1e5b3ebd1972a5d0
-EBUILD ng-1.5_beta1.ebuild 1141 SHA256 50657481786a23c30e7309b725db14234bb9d93de44af6f90eb26404dd118d4b SHA512 dac7e245d01ab804fc5a410a556684e93489e01d058cda871cc6750ec3762cd46e2ca0b65819d96a9ffa8ad01f3d110524095fce1b396efaab628e7d002c76dc WHIRLPOOL 7d4dfe49f827aec032f1e25b1e651d8dcf3630622dad40ee7fbe43e80ac32ea0d58ae277c5c19f37b20aff2eb1c040f6135db4e8fb4d94a7ddbe5e0ca7f89aea
+EBUILD ng-1.5_beta1-r2.ebuild 1197 SHA256 36babb70fb11fbce35382dd91af2888830a7bb2e5f2eeb6af0c903206d39f959 SHA512 f68dd90eb19c24cb8f5e55a0fb7e7cee9e7d2669a2b6172ff6eb51aa003bc40a84c1e9b87ceebf58ec4c019338d9d273f3ea8c6193da3e34bc2963fac0e7778b WHIRLPOOL 92809dde2d9b553b27119ed16f74b39a511c0a9c5b557a44d301ec229ac9e246658c430d08b4760c4bad249af537449be91826cc39597f44f755c88645f08d68
 MISC ChangeLog 2551 SHA256 790ef9c100fb98322ab4cbe297b52f4f55be4228bc13964a680d990120e99742 SHA512 192bb990651a8d2ee3bc5d3e5dbc6b1c5ac6c450aeb80c75614d330fcd9274ceaa8d43b8d48c0500a62a66b08e446d9ed8e0dc4c27e6d4687d77e90a2295211d WHIRLPOOL 8cfa535349faf433de9a689960a15b8f8ddeeae756fd2987cb6cc2e019ab8d39e52ef9497b0ad88aa40b21105781fd173ccf23374703fd415d25b1c6dbd313ff
 MISC ChangeLog-2015 1718 SHA256 7af40674a7154672b628bbc0267c146fe8bae81d92cbb945966c1f6a115dbce8 SHA512 6aa26c3a2ea58f10420d8bd0b128088831dffd3c608b4e00c58ff3b913bd9a195e4fd60c81d3de77eb3890080478cd75312d0f5c678515dc9b4094a5307191e1 WHIRLPOOL 12fbf6541b9fe89cbc009cd37126d9c6b07a418063308a095a0ec62ed487cee570b4323abd539292cf1fd50e8f592d0c98355aa4408b720c83bca18bff2fd4bd
 MISC metadata.xml 230 SHA256 5fc421627b578ee2d1317320525119c0b406026597bb1d054f96254a241bf96a SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1 WHIRLPOOL b3c1363540645200abd5bf0b5b7fb3cae0b738bfd359f7b13b56d97650f9381fccede1e3f867dbc736461ee7c7906725a3c53eabd9ac99929d5c7c520a831082
diff --git a/app-editors/ng/ng-1.5_beta1-r1.ebuild b/app-editors/ng/ng-1.5_beta1-r1.ebuild
deleted file mode 100644
index 146cf88eda6b..000000000000
--- a/app-editors/ng/ng-1.5_beta1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-MY_P="${P/_beta/beta}"
-
-DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
-HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-
-LICENSE="Emacs"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="canna"
-
-RDEPEND=">=sys-libs/ncurses-5.0
-	!dev-java/nailgun
-	canna? ( app-i18n/canna )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${MY_P}-ncurses.patch"
-	epatch "${FILESDIR}/${MY_P}-configure.patch"
-	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
-
-	pushd sys/unix || die
-	eautoconf
-	popd
-	cp sys/unix/configure . || die
-}
-
-src_configure() {
-	econf $(use_enable canna)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ng
-	dodoc docs/* MANIFEST dot.ng
-
-	insinto /usr/share/ng
-	doins bin/*
-
-	insinto /etc/skel
-	newins dot.ng .ng
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to use user Config"
-	elog "cp /etc/skel/.ng ~/.ng"
-	elog "and edit your .ng configuration file."
-	elog
-}
diff --git a/app-editors/ng/ng-1.5_beta1-r2.ebuild b/app-editors/ng/ng-1.5_beta1-r2.ebuild
index 637538b3379b..fbb432af3cc5 100644
--- a/app-editors/ng/ng-1.5_beta1-r2.ebuild
+++ b/app-editors/ng/ng-1.5_beta1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
 
 LICENSE="Emacs"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="canna"
 
 RDEPEND="
diff --git a/app-editors/ng/ng-1.5_beta1.ebuild b/app-editors/ng/ng-1.5_beta1.ebuild
deleted file mode 100644
index d2b723965757..000000000000
--- a/app-editors/ng/ng-1.5_beta1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/_beta/beta}
-
-DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
-HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-
-LICENSE="Emacs"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="canna"
-
-RDEPEND=">=sys-libs/ncurses-5.0
-	!dev-java/nailgun
-	canna? ( app-i18n/canna )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${MY_P}-ncurses.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use canna; then
-		myconf="--enable-canna"
-	fi
-	econf ${myconf} || die
-	sed -i -e "s/^#undef NO_BACKUP/#define NO_BACKUP/" config.h \
-		|| die "sed failed"
-
-	emake CC=$(tc-getCC) || die
-}
-
-src_install() {
-	dobin ng || die
-	dodoc docs/* MANIFEST dot.ng
-
-	insinto /usr/share/ng
-	doins bin/*
-
-	insinto /etc/skel
-	newins dot.ng .ng
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to use user Config"
-	elog "cp /etc/skel/.ng ~/.ng"
-	elog "and edit your .ng configuration file."
-	elog
-}