gentoo resync : 21.10.2017

4 files changed, 2 insertions, 128 deletions

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
-}