gentoo resync : 12.03.2021

4 files changed, 39 insertions, 55 deletions

diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
index 25c7d111baed..817317948228 100644
--- a/dev-util/icmake/Manifest
+++ b/dev-util/icmake/Manifest
@@ -1,7 +1,6 @@
 AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9202067696cfd9aab95c2b044ff8bb47b21e820646525944436b45e88b3592497d1e074d69f02675b60df223e SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325
 AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
-DIST icmake-9.02.09.tar.gz 372706 BLAKE2B dc114193fbee9cd7641e0d3c8930c09fb1a3ee705cd14a18c81099cbef90b82e08739ba20344e42ba90c0001b90b274c0e7468f02f84260588659fdea51156a1 SHA512 383ae2e74a5193524aab184e6480cf53d5d3a2296420b8d35c6f223749c74b85f5c88ea00d8ff1e754ddacf2fd7f89c9205df64447fbb292681b069f93eb6891
+AUX icmake-9.03.01-compressed-docs.patch 939 BLAKE2B ff832857fab6d78ef37a1193f9c98c5fd0b2a6de1dbd1421833aad6580e56158c8d3e190f358fa2b95fb2bbcccd3edb62521f5737dbaf3aede1dc3ca965ad4b0 SHA512 1dabb57f30b0d7d07c9a9b6cc1c2723d89e8e7538a35ff2a3c17bda167becc92ad4bceecbfafa5304728a6c687f5da10e7055dcb62df17bc134923a91bd996f1
 DIST icmake-9.03.01.tar.gz 393488 BLAKE2B 43bac6944aa816e077a55264064abcb55ff3525842ab923712997248ef198a934fa434352fef3484a8ed0f887a89d9151b8e56ef7c601435d26d1644438b2b55 SHA512 2e6228c3bffa7fa145fd3743b1220d96b5730350718b91be96600cb24317e17aa5138282fe2f603d00dadd57d7a832ecff21a570eab0c21426f94d3208a61184
-EBUILD icmake-9.02.09.ebuild 981 BLAKE2B 28118c59fde71bc8607fbe53519ddca7a88a62f3257fa4e66882821a051c6022fb44e659ac3f63c3e3d742dd527de82a3f8801ad7e3fe63085f425b337854df5 SHA512 373551e4cdfe94aac23b9bc27afc50a2eff4a8762cc2128e8a85b8322456b1c59e8dc586dca8f46c202c9b07413ad1f6aca79640a7cb65eb8594a560b6ac4ec6
-EBUILD icmake-9.03.01.ebuild 981 BLAKE2B c5a74e9e7dab180a4b36ce687be3ba7a8030a808c28a248dac7d67da7af766a36e9bc26dfcffa5b06df867c51a16730326188768ddb03f88270aa2a038ac91bf SHA512 5321a7ad64a30c60fba2d71169ba84e795d190502b5999aaab0951502f915f38900ce0d517236a2afea870a6c82735438cf2194fa8ab02128fb81c06b3255d9f
+EBUILD icmake-9.03.01.ebuild 1037 BLAKE2B b0ee8774d022d01adc6baa73af683113d7dc25f8499a9d7d8b6761e4a4985e39ec534dc504557518796e5d9209bffa5d84d473b29960679b2ef0cb93cbe6be0a SHA512 e8471fd45895dfec78623a48d41bed4a856ac84fc8597315b22d713015e8ab8d47d4e2636ac027d881c61cd17605a7273df909ff17bcad42293ac61d0ff40c57
 MISC metadata.xml 246 BLAKE2B 73f4de1e8aae25da0c39c9ed337dfcd7ddd49974f5fc9ac32722a14f541d78f9a946f42cb7d0bad28e77b84f23f07fc90d21039f802023439e6161329507d7f3 SHA512 f590d17146e0ea5b1cc9c4b318544e8af1cf4446769810bf37728008dda25d5e979c6b985e9e952e3b89ee6193aa0ab7b6549234c033f2f636d42f07babe13e4
diff --git a/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch b/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch
new file mode 100644
index 000000000000..a8bb04e3102e
--- /dev/null
+++ b/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch
@@ -0,0 +1,32 @@
+diff --git a/icm_bootstrap b/icm_bootstrap
+index 9a80252..78ece4f 100755
+--- a/icm_bootstrap
++++ b/icm_bootstrap
+@@ -45,11 +45,11 @@ cd doc
+ 
+ echo man-pages to tmp/${MANDIR}/man1 and .../man7
+ for x in *.1 ; do
+-    gzip -9cn $x > ../tmp/${MANDIR}/man1/$x.gz || exit 1
++    cp $x ../tmp/${MANDIR}/man1/$x || exit 1
+ done
+ 
+ for x in *.7 ; do
+-    gzip -9cn $x > ../tmp/${MANDIR}/man7/$x.gz  || exit 1
++    cp $x ../tmp/${MANDIR}/man7/$x || exit 1
+ done
+ 
+ echo documentation to tmp/${DOCDIR} and tmp/${DOCDOCDIR}
+@@ -58,11 +58,11 @@ echo documentation to tmp/${DOCDIR} and tmp/${DOCDOCDIR}
+ #    gzip -9cn $x > ../tmp/${DOCDOCDIR}/$x.gz  || exit 1
+ #done
+ 
+-gzip -9cn icmake.ps > ../tmp/${DOCDOCDIR}/icmake.ps.gz  || exit 1
++cp icmake.ps ../tmp/${DOCDOCDIR}/icmake.ps || exit 1
+ 
+ cd ..
+ 
+-gzip -9cn changelog > tmp/${DOCDIR}/changelog.gz || exit 1
++cp changelog tmp/${DOCDIR}/changelog || exit 1
+ 
+ try cp -r examples tmp/${DOCDOCDIR}
+ 
diff --git a/dev-util/icmake/icmake-9.02.09.ebuild b/dev-util/icmake/icmake-9.02.09.ebuild
deleted file mode 100644
index 4eea0292ebff..000000000000
--- a/dev-util/icmake/icmake-9.02.09.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.00.00-ar.patch
-	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	# fix build issues (bug #589896)
-	append-cflags -std=gnu99
-
-	tc-export AR CC
-}
-
-src_configure() {
-	./icm_prepare "${EROOT}" || die
-}
-
-src_compile() {
-	./icm_bootstrap "${EROOT}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/icmake/icmake-9.03.01.ebuild b/dev-util/icmake/icmake-9.03.01.ebuild
index e6bd5c26d8b4..864297a798f1 100644
--- a/dev-util/icmake/icmake-9.03.01.ebuild
+++ b/dev-util/icmake/icmake-9.03.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,16 +8,16 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Hybrid between a make utility and a shell scripting language"
 HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
 SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S=${WORKDIR}/${P}/${PN}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.00.00-ar.patch
 	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
+	"${FILESDIR}"/${PN}-9.03.01-compressed-docs.patch
 )
 
 src_prepare() {
@@ -35,11 +35,11 @@ src_prepare() {
 }
 
 src_configure() {
-	./icm_prepare "${EROOT}" || die
+	./icm_prepare "${EPREFIX}" || die
 }
 
 src_compile() {
-	./icm_bootstrap "${EROOT}" || die
+	./icm_bootstrap "${EPREFIX}" || die
 }
 
 src_install() {