gentoo resync : 27.03.2018

4 files changed, 9 insertions, 44 deletions

diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index cc78b088e7cf..0992dc4441c9 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,7 +1,5 @@
-DIST convmv-2.01.tar.gz 29375 BLAKE2B 3e8c4a5db981a4ef1b1fb1339c0f7d680bc917964984ec9355c51ffb7855ccdd13922a3077d4669a0a70d21862e084cda1dbb21be7538ca966a0dcca55d1a8c9 SHA512 e82957bcc1462b17c5f667e85caf0d2e8c407fb48afc6faa957f45626cbfa58c141de05f43cc810e8d4abbadc4cc01bf87ee64c157fece20fafed07ad04cc48c
-DIST convmv-2.03.tar.gz 29688 BLAKE2B 8fe7b0164bf05e49bd0035c6b708822539f9eecf355f005bf56ae352ee7cb56aef9fcd7047d0a9f3829715c24c6ac00ef7f7c42c822879bf382eabd00f9bf2c3 SHA512 21f71d8009ee0f8e6b67f439809d2330e3c1a4073be8e5ad565829b89327115d25235d7f6019d96ee9f93d83e33df0869b19ad7cdd4cf8777e0ebecec437147f
 DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
-EBUILD convmv-2.01.ebuild 686 BLAKE2B fae77d1e0315652b223fab181e29ec0af5064ab19003c249206a1d433a0aee36e5c1ba7a660e4223f59d9f85b21b5a63632d6ef7b05be28efd3dbb87a324a8cc SHA512 a18b53165e2a2017bf21b5dd65fb0c9b90e74ef3ea293b81a0ea139cdca2423d24615dea827e3c3b46d881f1cda6e00a1e529e1a7a23e5ce56a0d2cb4a8ca635
-EBUILD convmv-2.03.ebuild 694 BLAKE2B f471d1f32029a5b24a5f480bb1494068fd6742d6cb1a9428fed1536c9dad173b7e6130c6c0a8ea6024c32a84ac26b56c1332a0e41a92c09ff54c5e8785445738 SHA512 150e4a53edf05199f8afb637d9cdd44062688cf7f41a3796bc237fbb88c7a1ba4d4625987568b1a93c88cef24dbd53ec23e538011efd76490f7272d4dfbaed8d
-EBUILD convmv-2.04.ebuild 705 BLAKE2B e90e5bbc9d5304dec926d8747a10280c72cb6b6bc4ee0067770861d7a15dbbd63b6bdee47891fb644e4c04dfb4dbd0069c73036960f117a91ac87ff8efac8bf9 SHA512 3d65d60890e65dfd67721a929f71da0b82ecb9b2383c8aad7c4455d4ac1ead323ac9e3ffbc6ad562e2e040009a3d91452a89ff9beee098cbc0193b939665ba4d
+DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
+EBUILD convmv-2.04.ebuild 697 BLAKE2B 443ca020bb9892554971a94f01ac8a0a3ac46146f0ce988a05ca9761b333a1233d745881e8c161613925188b042069387bcebf83e1f49ad00f0a4d8a56006002 SHA512 4bb4a850b35166d82cba67b8e2c3da90e804c4d9fc6dd219566215bb0fe5af5649c67414eeef5e363fd6dab3ac3de1fa3fb68a3cf15b2b1f9e505a6262458f43
+EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.01.ebuild b/app-text/convmv/convmv-2.01.ebuild
deleted file mode 100644
index f33868fa45fb..000000000000
--- a/app-text/convmv/convmv-2.01.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild
index 16fb1ffa4d0a..b63b14e8de57 100644
--- a/app-text/convmv/convmv-2.04.ebuild
+++ b/app-text/convmv/convmv-2.04.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
@@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/convmv/convmv-2.03.ebuild b/app-text/convmv/convmv-2.05.ebuild
index 6fad4bcbd995..59f68eebfee8 100644
--- a/app-text/convmv/convmv-2.03.ebuild
+++ b/app-text/convmv/convmv-2.05.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,6 +28,6 @@ src_install() {
 src_test() {
 	unpack ./testsuite.tar
 
-	cd "${S}"/suite
+	cd "${S}"/suite || die
 	./dotests.sh || die "Tests failed"
 }