4 files changed, 3 insertions, 133 deletions
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index f10545708d92..3dd9ae83185e 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,7 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
-DIST UnicodeData-6.1.0.txt.xz 129972 BLAKE2B 52836b9db627cbc8608a148eb179f98267997ba10ae188c948e873ae7486389e96557e2d9b9f3c12a775b118b3d97333262c0a5a6a2cf33c50445673dea1a2fc SHA512 9ada361d915f3883e673c6e55f351c7411dc970e180e7e0b05fef498c2f80a5a29bfd6c22513ff4b6b6c4c9fba5c77f0aca2dd54c7a76d3fa9b78623b1fdd93f
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r1.ebuild 1683 BLAKE2B 72bbc5e04b22a712ad54a9d8015ea679d805924684250ad253b7a5e457599afe9804b1e963ea50e70336eda9ef7c035afdc7c538f6b2f896656e579c37cdb24f SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95
-EBUILD miscfiles-1.5-r2.ebuild 1847 BLAKE2B f6671e00682d3d4f37d95e14805df13f0bdba76ae062c3aa8bc9c44c1095cd08c1b7605396820d778750b8a109e9fc26f2d843e988abac0a0615af546b649e2a SHA512 a5bd1e9d5df82ad02d567a2b73e8ba71bffc73c8ab1406222f19ecdc09bb81c9aadf906fae02af4b749a095dc62e1fa515d8754873c6fe03bd46f8057794324b
-EBUILD miscfiles-1.5-r3.ebuild 1858 BLAKE2B b2b0f77852bd43a3e431ec8814f1a339d339f0dd50945d2109adbdb01170679f8eac20d4641bce0767032a6a50a6a21aeb4ab05ee77ddd2e3feb526f0c55d880 SHA512 b43c31213159e7631e8f927b03a0a0f38a78f744eafca4a18acae7964500ef662b4b68f8d83082942122cae5fbc37946728dcd6f8eb7e4ce3c513e4d1b88cccc
+EBUILD miscfiles-1.5-r3.ebuild 1855 BLAKE2B 7cad46bb8019cc919355f189acd39bb9ea5547ea69252232dd40881fb29fa55cb769b708b9348ba96dacc955dee9bde5e581fbb234ba22fe7245c354a53246d8 SHA512 9420610675ef25e9f05e3a598d79a9cc5fa12d0048af0b6978d202e393530cdb08ea6083ec3596a1cf235c435c2bd75a1fcd5bcaa5553e5bc2c08ea2b5a8ee41
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r1.ebuild
deleted file mode 100644
index f4a54b376ea7..000000000000
--- a/sys-apps/miscfiles/miscfiles-1.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-UNI_PV=6.1.0
-DESCRIPTION="Miscellaneous files"
-HOMEPAGE="https://savannah.gnu.org/projects/miscfiles/"
-# http://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt
-SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
-	mirror://gentoo/UnicodeData-${UNI_PV}.txt.xz"
-
-LICENSE="GPL-2 unicode"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="minimal"
-
-# Collides with older versions/revisions
-RDEPEND="!<sys-freebsd/freebsd-share-7.2-r1"
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
-	mv "${WORKDIR}"/UnicodeData-${UNI_PV}.txt unicode || die
-}
-
-src_configure() {
-	econf --datadir="${EPREFIX}"/usr/share/misc
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc NEWS ORIGIN README dict-README
-
-	# not sure if this is still needed ...
-	dodir /usr/share/dict
-	cd "${ED}"/usr/share/misc
-	mv $(awk '$1=="dictfiles"{$1="";$2="";print}' "${S}"/Makefile) ../dict/ || die
-	cd ../dict
-	ln -s web2 words || die
-	ln -s web2a extra.words || die
-
-	if use minimal ; then
-		cd "${ED}"/usr/share/dict
-		rm -f words extra.words
-		gzip -9 *
-		ln -s web2.gz words
-		ln -s web2a.gz extra.words
-		ln -s connectives{.gz,}
-		ln -s propernames{.gz,}
-		cd ..
-		rm -r misc rfc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == "/" ]] && type -P create-cracklib-dict >/dev/null ; then
-		ebegin "Regenerating cracklib dictionary"
-		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
-		eend $?
-	fi
-}
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r2.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r2.ebuild
deleted file mode 100644
index a20e20fe1a77..000000000000
--- a/sys-apps/miscfiles/miscfiles-1.5-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-UNI_PV="10.0.0"
-DESCRIPTION="Miscellaneous files"
-HOMEPAGE="https://savannah.gnu.org/projects/miscfiles/"
-# https://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt
-SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
-	https://dev.gentoo.org/~whissi/dist/${PN}/UnicodeData-${UNI_PV}.txt.xz"
-
-LICENSE="GPL-2 unicode"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="minimal"
-
-# Collides with older versions/revisions
-RDEPEND="!<sys-freebsd/freebsd-share-7.2-r1"
-DEPEND=""
-
-src_prepare() {
-	default
-
-	mv "${WORKDIR}"/UnicodeData-${UNI_PV}.txt unicode || die
-}
-
-src_configure() {
-	econf --datadir="${EPREFIX%/}"/usr/share/misc
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc NEWS ORIGIN README dict-README
-
-	# not sure if this is still needed ...
-	dodir /usr/share/dict
-	cd "${ED%/}"/usr/share/misc || die
-	mv $(awk '$1=="dictfiles"{$1="";$2="";print}' "${S}"/Makefile) ../dict/ || die
-	cd ../dict || die
-	ln -s web2 words || die
-	ln -s web2a extra.words || die
-
-	if use minimal ; then
-		pushd "${ED}"/usr/share/dict || die
-		rm -f words extra.words || die
-		gzip -9 * || die
-		ln -s web2.gz words || die
-		ln -s web2a.gz extra.words || die
-		ln -s connectives{.gz,} || die
-		ln -s propernames{.gz,} || die
-		popd || die
-		rm -r misc rfc || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == "/" ]] && type -P create-cracklib-dict >/dev/null ; then
-		ebegin "Regenerating cracklib dictionary"
-		create-cracklib-dict "${EPREFIX%/}"/usr/share/dict/* > /dev/null
-		eend $?
-	fi
-
-	# pkg_postinst isn't supposed to fail
-	return 0
-}
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index bea4785a2fad..32a2b8071329 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions