gentoo resync : 20.03.2022

3 files changed, 82 insertions, 64 deletions

diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 7651bc5e933c..6c819787496e 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -4,8 +4,8 @@ AUX icecream-1.0.0-libcap-ng.patch 195 BLAKE2B b6ff2376e02cfd0a1b486c53d5be10122
 AUX icecream-r2 1733 BLAKE2B dbd919701df670e7cd1b47cb39fa55eb18c6e539ffa637e2a505ee60b15bb9febd54237b57f42214769e273f5a5fd29cfcc9e29a0a941807388fd9cc7d133226 SHA512 033ce0d49445db3afcbdd6724863651d4951b8f36f6253a13854abe9ee976419687579089aa1c5c808eed08aad357e34bb9f1e70570857cc39f2515ac2f211b0
 AUX icecream-tmpfiles.conf 103 BLAKE2B 4a263834594e0f1fe8cc8e356520f937cfc5f1abd9f019a2b88075643ff651d002d49de113d3ab4bcbc10e22b43e03ee85ea8f948765800ba74c43e5dd3ca0e2 SHA512 152d687a9fe18c71f08c002ee87d36fe18572a6e5b7ab976bbde784c6ff80c5ecda59f9cce4561868fa53ad76a040674af4b0579a97c78c9bf141bc0533f7631
 AUX icecream.openrc 1669 BLAKE2B 18726b8d8752f3db9a2864612423dedd00b347a6802012de5c0ca30d2516b1995c9bf4ae32d1d320a5e401d9a3466f8fc7165fa805e0b9991c16b0f4a96d59d6 SHA512 8c3c66ffd508284f0dc7c9e2695d02ff283048f82f80ac9b41982b6484967b39856a4e7651015d4bb10f74e3f0a7435bd59c0a0ec5eb62bc5aee49cae0354fde
-DIST icecc-1.0.0.tar.bz2 485534 BLAKE2B 31a978a4a461f20716a95277426e79d4c298c212d36361dbbd68c5affcbbbe2f0c71f743cc7b731d86fbb5f09ab556182482f56e1382be8572d019f80a004fc8 SHA512 4292ecef6232112c3f4531cb2290a55f70c5c24095fef0865af2526d49fc10a043ffb06d22552e161f671c18ff1ab62795c3a63e2c8cb26f869cf65d0938af2a
 DIST icecream-1.3.1.tar.gz 224068 BLAKE2B d7d66dadf27b0b88ab706bf217ce2b0d33b5db2ed95e48c4e9dcbd000931688ad6809ecbd4e14f0f3889bcebddc8543bd364c9dda09ba71e5dc04d0a5a2122d5 SHA512 d850394b4093defcf2c50bb3f9306348a45bf17d21f4730baeee7125998c2a548b7b3a7597785855d7e388e84830769bf0ec1c4136330a4c8e359cbdd111f5da
-EBUILD icecream-1.0.0-r3.ebuild 1274 BLAKE2B 2967a7bec5f09e6477a099f6c49323e3a94a721ac84555deee6719737da356d3f214835d8d6c9a00f7e4a5f81d8cda9ac624aa18ac8ac289097a161518cce408 SHA512 7fac57e7f533db016f503f47256076d5ba5b13a83d68237a192c2b22d2914984342874bb47b6cafabe5b915297b2c5912a3fe66e2d16e4cc6fc20a94160626e9
+DIST icecream-1.4.tar.gz 232707 BLAKE2B 5fdebea4d0eba4a99e8c7c01acab46ec323a887d3fe9944da23ae7089403a9ebf7bf9870ca61af49578af6adf49679341f7070f9e3da3e8c7c2f50d9d4e7c3fe SHA512 b77dd630c51b7b6b4d7fa06cd14a580891b974fe2d50074f7a3b129adc558fc7ce19b3a3716a6798c2fd0f7d0d3a1bc295bbedee3ed6dafa015f309c7c2590f5
 EBUILD icecream-1.3.1.ebuild 1686 BLAKE2B 179d8da593e7a3d45930ca0fddc5202bcad2f8b5229e9dc2624ba0cc170075fd7c0f7eb635a95a9141dc0839bb92a5420c4e97d7b0008ad382cdf0eee44af4e1 SHA512 361b643bc8d83e1102f266858a9c12c70cc37267033b0dc22633ff6a9cae903fb62702ad7c8f52306e5a01030c6a6c3eab8e19063775d2146019f90e5c6dfb2f
+EBUILD icecream-1.4.ebuild 1707 BLAKE2B 05f32aed90adefb4355143dee7263bb5e183172f252c6fafe3b2c9e05d0b291dc3be277017b2104bd98d6165827575e287bd16a2c79f1ee1aee34ebf44587088 SHA512 ceafb4b0903c4eebb3a8998c1a7c1933c42c02ab75f7a66adef4c5699f6df496d023041956ee70d6dad196dd57b1194ca5a95bcfea18bcc82410e4f6a5c02605
 MISC metadata.xml 337 BLAKE2B 0a42596492049a954cd58c992c68ef68bec2a53a4eaaa83978b2d56c577f6c54fc8bc18b7621b0561fd8a348996d138e8a676ea129c94d08633663d3e254ac1a SHA512 7c96d0c35a47e595cf50c1c6efe5ccb186ec974ed0b31fea908240380f796fb9e77e2eba0ce9995a8473cd836056421d6475022f68685d88f8c360292d7284ec
diff --git a/sys-devel/icecream/icecream-1.0.0-r3.ebuild b/sys-devel/icecream/icecream-1.0.0-r3.ebuild
deleted file mode 100644
index 53e06f4ae2be..000000000000
--- a/sys-devel/icecream/icecream-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/icecream/icecc}"
-
-DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
-HOMEPAGE="https://github.com/icecc/icecream"
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-
-DEPEND="sys-libs/libcap-ng"
-RDEPEND="
-	${DEPEND}
-	acct-group/icecream
-	acct-user/icecream
-	dev-util/shadowman
-"
-
-PATCHES=( "${FILESDIR}/${P}-libcap-ng.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared --disable-static
-		--enable-clang-wrappers
-		--enable-clang-rewrite-includes
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newconfd suse/sysconfig.icecream icecream
-	newinitd "${FILESDIR}"/icecream-r2 icecream
-
-	insinto /etc/logrotate.d
-	newins suse/logrotate icecream
-
-	insinto /usr/share/shadowman/tools
-	newins - icecc <<<'/usr/libexec/icecc/bin'
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
-		eselect compiler-shadow remove icecc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update icecc
-	fi
-}
diff --git a/sys-devel/icecream/icecream-1.4.ebuild b/sys-devel/icecream/icecream-1.4.ebuild
new file mode 100644
index 000000000000..8b29c30afdb4
--- /dev/null
+++ b/sys-devel/icecream/icecream-1.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+AT_NOELIBTOOLIZE="yes"
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="Distributed compiler with a central scheduler to share build load"
+HOMEPAGE="https://github.com/icecc/icecream"
+SRC_URI="https://github.com/icecc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="app-arch/libarchive:=
+	app-arch/zstd:=
+	acct-user/icecream
+	acct-group/icecream
+	dev-libs/lzo:2
+	sys-libs/libcap-ng"
+RDEPEND="${DEPEND}
+	dev-util/shadowman"
+BDEPEND="app-text/docbook2X
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-clang-rewrite-includes \
+		--enable-clang-wrappers
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}"/iceccd.service
+	systemd_dounit "${FILESDIR}"/icecc-scheduler.service
+
+	newconfd suse/sysconfig.icecream icecream
+	newinitd "${FILESDIR}"/icecream.openrc icecream
+
+	keepdir /var/log/icecream
+	fowners icecream:icecream /var/log/icecream
+	fperms 0750 /var/log/icecream
+
+	newtmpfiles "${FILESDIR}"/icecream-tmpfiles.conf icecream.conf
+
+	insinto /etc/logrotate.d
+	newins suse/logrotate icecream
+
+	insinto /etc/firewalld/services
+	doins suse/iceccd.xml
+	doins suse/icecc-scheduler.xml
+
+	insinto /usr/share/shadowman/tools
+	newins - icecc <<<"${EPREFIX}"/usr/libexec/icecc/bin
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove icecc
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process icecream.conf
+
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update icecc
+	fi
+}