gentoo Easter resync : 12.04.2020

4 files changed, 11 insertions, 114 deletions

diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index b4ada51d081b..023198f495d2 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,9 +1,5 @@
 AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c70941c776f53c780597f17a241c1469b6b6b3ce409153f045470ce4d9d896a44cbcf3b0557950f9138e08bd95ee451 SHA512 d5efb49f9ba8411b682047fc5de3a9605c89c5d8f9a0fa67b7de52719630187f36abf7ffc7cc1e53481c7474c0b7e5d8b3074a81fca02061c4685053c9cb221f
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
-DIST icoutils-0.32.0.tar.bz2 593699 BLAKE2B 5a2dbe67468c1bc0380b94f4ecf707c5e1019539e959c0692d195599ff402c4e5496f46883cdd898abb319d8545b76afe32b172d3f74f674c008c69de5a93463 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878
-DIST icoutils-0.32.2.tar.bz2 593980 BLAKE2B 1e9fa8ee3fd8e90b4029990508ce6ef405dd01a4e357a73f72980033dd54df1c6d714351cf1b79ce32840941da06bb0d1154e310191798ae31687dad6e828d6a SHA512 9d1ec7f8de2de35ca502ece953d288dad44143af185706855e8911c5e579153ce515208891783981c04406afc66db1e2a3f246515e888a2b1ccc6aea4b1056b8
 DIST icoutils-0.32.3.tar.bz2 609286 BLAKE2B 0d65fbadb08e4f2e7a60b5ffd4bc14dc82e90abf0a56ddb89f9717a479ab45a50b9747c986c954c3a01e4d8a51d8396ec9d8796dc4a1d7430cb3169c13e06e13 SHA512 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726
-EBUILD icoutils-0.32.0.ebuild 1023 BLAKE2B bd59b621178f0a056a360ef55359ffe0e1cb7c85164382333b5527661ea33646536a9a53bc572aa3f5bf7ab58fb197e090286631a08ef2d8fb50be54212b31a6 SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2
-EBUILD icoutils-0.32.2.ebuild 1023 BLAKE2B 872a2aabb86148bf4a36f79f3737bc4c9f4aeb870d4b2e5022d956f1dc05a531322c9a5ed08b305f57c33fadac14549df17b2953756f9b51a80095bf65c1dc50 SHA512 df7917c724a4f6af8f5276310bc34154643b3e804928aab671f9a4186290f523ecdaf4b7f1535c7209e0032347f398bd241a45a553d70c3d1bbb6b6830748dda
-EBUILD icoutils-0.32.3.ebuild 1026 BLAKE2B eeb1768bef791528d2475c422c46fca4f1d6829119e76a2086cf2484335afd49d610c9d87681296526228b4fed905775c746fa435fa3afc95bf5fc6c4f19ba4e SHA512 ce94b5b7ab034f9f21d47bf3a4221f1f376158b88361d21c6ca4787f65a34f1c35125de40f34a8f989397ee26cd113766ec7146421998189005f1fab97612566
+EBUILD icoutils-0.32.3.ebuild 1034 BLAKE2B c45446c3c90ee21719979d1b6b70ffa2c4350f891186e44de902a06d470ee685948e096a389dd4435a4a11e4dff8542950d43ad035d66782e0182952c3c99888 SHA512 292b50796ebb4f83908e4aba0c1613e23fd60ba7b6c93cba6fa38a58c2014935edee5fb70eab8c3908b37ed61ac798920fef84411e5d9c457356ebd88a9942b0
 MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775
diff --git a/media-gfx/icoutils/icoutils-0.32.0.ebuild b/media-gfx/icoutils/icoutils-0.32.0.ebuild
deleted file mode 100644
index ec033fea47a4..000000000000
--- a/media-gfx/icoutils/icoutils-0.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools flag-o-matic
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
-
-src_prepare() {
-	default
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	einstalldocs
-}
diff --git a/media-gfx/icoutils/icoutils-0.32.2.ebuild b/media-gfx/icoutils/icoutils-0.32.2.ebuild
deleted file mode 100644
index 433690cbda32..000000000000
--- a/media-gfx/icoutils/icoutils-0.32.2.ebuild
+++ /dev/null
@@ -1,49 +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
-
-DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
-HOMEPAGE="http://www.nongnu.org/icoutils/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-lang/perl-5.6
-	>=dev-perl/libwww-perl-5.64
-	media-libs/libpng:0
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
-
-src_prepare() {
-	default
-	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
-	einstalldocs
-}
diff --git a/media-gfx/icoutils/icoutils-0.32.3.ebuild b/media-gfx/icoutils/icoutils-0.32.3.ebuild
index eb74cde3dc66..94291a78237b 100644
--- a/media-gfx/icoutils/icoutils-0.32.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
 inherit autotools flag-o-matic
 
 DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
@@ -10,9 +11,12 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
 RDEPEND="
 	>=dev-lang/perl-5.6
 	>=dev-perl/libwww-perl-5.64
@@ -20,21 +24,16 @@ RDEPEND="
 	sys-libs/zlib
 	nls? ( virtual/libintl )
 "
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch )
 
 src_prepare() {
 	default
 	rm m4/po.m4* || die
-	cp /usr/share/aclocal/po.m4 m4/
+	cp /usr/share/aclocal/po.m4 m4/ || die
 	AT_M4DIR=m4 eautoreconf
 }