gentoo resync : 03.02.2018

4 files changed, 2 insertions, 189 deletions

diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 16d9e633c0af..a05bed2be43b 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,9 +3,6 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
-DIST aspell-0.60.6.1.tar.gz 1878163 BLAKE2B c5427be61945fce106df1e76f745f5dd9d754ac71b8ecb4c8dff89ef2de44f2a0042ffde31e1db9ea6a255f3c6bd4148702181c2e718bd8ebdffdc09d2ef8333 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-EBUILD aspell-0.60.6.1-r3.ebuild 2614 BLAKE2B cebe635bbd83d6a998a28fb0bd26c133fef2cd540bfc44df951341844a72412d793ef9fc0a3ac69faf174e296ef07e54dc6b26f9de84f5958a1012a34389b687 SHA512 347fbb12f74106fc19a69ed8f78fc22699c2fd8e7f261546d94eb2b5cb3e1d0e182753fb11f67ac13a184768a45d3fc8d7def60d7cc0dbb7b481b8feab63830f
-EBUILD aspell-0.60.6.1-r4.ebuild 2377 BLAKE2B a22e75ba79633d962821c7092d3acbf78883695ee5da97bace730cd520dfe55e2b41a1da6f61317a9cc8d24a25e32e1da1fb51fc23bcb1fde0fe82662710fb58 SHA512 caf35196222d9a3a3b64610df20149d97a003f8e45f47dc3c086047decbca8571101d4d8ba684b6cbd0a8f0b54c5f1ec45706b9b8880d5b89ae8fcd73b7fb213
-EBUILD aspell-0.60.7_rc1.ebuild 2693 BLAKE2B e0278f12465f4289445c7ec9ebc81411e671b4013ac38e4229953aec022f2da2c9925d888a2c30b25cc976b80904445738f2a873d61adf88aa4ee0645038fec0 SHA512 f2b69f1e63ecfcf4db1032101f2371e3d50e11fbfb42b53e6778e77c1093f83f73e87975ca018ba25da89e1265a622048b545351022afd4576593e70306081d6
+EBUILD aspell-0.60.7_rc1.ebuild 2692 BLAKE2B 9bf143e8e6824200b653a1a3351b26d85e7b332846c4e4ecfd0a120dd420e5090751b4a136a33cf96d5b199d1521bdb8862016b4393e413464f8a60d4baa4d54 SHA512 baa296242937fa63d4710277797ba53dac9a89011b2b7896beb5d6a1e0468b36888fd9f054cd9e97e2daa388ae21d60d340f0722e9253beb0aca32d9ad4b93b7
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-text/aspell/aspell-0.60.6.1-r3.ebuild b/app-text/aspell/aspell-0.60.6.1-r3.ebuild
deleted file mode 100644
index bd7082628c1b..000000000000
--- a/app-text/aspell/aspell-0.60.6.1-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de-alt"  ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-COMMON_DEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	nls? ( virtual/libintl )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="${COMMON_DEPEND}
-	!=app-dicts/aspell-en-0.5*
-"
-
-src_prepare() {
-	# fix for bug #467602
-	if has_version ">=sys-devel/automake-1.13" ; then
-		sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-			"${S}"/configure.ac || die
-	fi
-
-	epatch \
-		"${FILESDIR}/${PN}-0.60.5-nls.patch" \
-		"${FILESDIR}/${PN}-0.60.5-solaris.patch" \
-		"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" \
-		"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-
-	rm m4/lt* m4/libtool.m4
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-}
-
-src_configure() {
-	if has_version "sys-libs/ncurses[unicode]" ; then
-		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
-	else
-		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
-	fi
-
-	CURSES_LIB="${CURSES_LIB}" econf \
-		$(use_enable nls) \
-		--disable-static \
-		--sysconfdir="${EPREFIX}"/etc/aspell \
-		--enable-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc README* TODO
-	dohtml -r manual/aspell{,-dev}.html
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# install ispell/aspell compatibility scripts
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	prune_libtool_files --modules
-}
diff --git a/app-text/aspell/aspell-0.60.6.1-r4.ebuild b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
deleted file mode 100644
index 47423f0e0b00..000000000000
--- a/app-text/aspell/aspell-0.60.6.1-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de-alt"  ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	# includes fix for bug #467602
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		--disable-static \
-		--sysconfdir="${EPREFIX}"/etc/aspell
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# install ispell/aspell compatibility scripts
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# we explicitly pass '--disable-static' to econf,
-	# hence we can delete .la files unconditionally
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index 40d732226236..ac57216d0f10 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"