public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/
Date: Mon, 27 May 2024 17:24:49 +0000 (UTC)	[thread overview]
Message-ID: <1716830684.8d1ade87ad0ae9506c22aa4d311f1dd8331c9824.mgorny@gentoo> (raw)

commit:     8d1ade87ad0ae9506c22aa4d311f1dd8331c9824
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 17:23:13 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 27 17:24:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1ade87

sys-devel/distcc: Remove pump, enable py3.12 & py3.13

Closes: https://bugs.gentoo.org/929833
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-devel/distcc/distcc-3.4-r4.ebuild | 194 ++++++++++++++++++++++++++++++++++
 1 file changed, 194 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.4-r4.ebuild b/sys-devel/distcc/distcc-3.4-r4.ebuild
new file mode 100644
index 000000000000..1ba20fc33563
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4-r4.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit autotools flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="Distribute compilation of C code across several machines on a network"
+HOMEPAGE="https://github.com/distcc/distcc"
+SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/popt
+	gssapi? ( net-libs/libgssglue )
+	gtk? ( x11-libs/gtk+:3 )
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-libs/binutils-libs
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-build/autoconf-archive
+	virtual/pkgconfig
+"
+RDEPEND+="
+	acct-user/distcc
+	dev-util/shadowman
+	>=sys-devel/gcc-config-1.4.1
+	selinux? ( sec-policy/selinux-distcc )
+	xinetd? ( sys-apps/xinetd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0-xinetd.patch"
+	# SOCKSv5 support needed for Portage, bug #537616
+	"${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+	"${FILESDIR}/${P}-fix-dcc_gcc_rewrite_fqn-corruption.patch"
+	"${FILESDIR}/${P}-rewrite-chost.patch"
+)
+
+src_prepare() {
+	default
+
+	# Bugs #120001, #167844 and probably more. See patch for description.
+	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
+
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
+		-e "s:@libdir@:/usr/lib:" \
+		"${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
+
+	# TODO: gdb tests fail due to gdb failing to find .c file
+	sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die
+
+	hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
+	python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/distcc/distcc/issues/454
+	append-cppflags -DPY_SSIZE_T_CLEAN
+
+	local myconf=(
+		--disable-Werror
+		--libdir="${EPREFIX}"/usr/lib
+		$(use_enable ipv6 rfc2553)
+		$(use_with gtk)
+		--without-gnome
+		$(use_with gssapi auth)
+		$(use_with zeroconf avahi)
+
+		# NB: we can't pass --disable-pump-mode as it disables Python
+		# detection; we instead hack it out below
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# override PYTHON= to prevent setup.py from running
+	emake PYTHON=
+}
+
+src_test() {
+	# sandbox breaks some tests, and hangs some too
+	# retest once #590084 is fixed
+	local -x SANDBOX_ON=0
+	# run the main test suite directly to skip pump tests
+	emake -j1 distcc-maintainer-check
+}
+
+src_install() {
+	# override GZIP_BIN to stop it from compressing manpages
+	emake -j1 DESTDIR="${D}" GZIP_BIN=false PYTHON= install
+	python_optimize
+
+	newinitd "${FILESDIR}/distccd.initd" distccd
+	systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service
+	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
+
+	cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
+	if use zeroconf; then
+		cat >> "${T}/distccd" <<-EOF || die
+
+		# Enable zeroconf support in distccd
+		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+		EOF
+
+		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
+	fi
+	doconfd "${T}/distccd"
+
+	newenvd - 02distcc <<-EOF || die
+		# This file is managed by distcc-config; use it to change these settings.
+		# DISTCC_LOG and DISTCC_DIR should not be set.
+		DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
+		DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
+		DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
+		DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
+		DISTCC_SSH="${DISTCC_SSH}"
+		UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
+		DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
+		DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
+	EOF
+
+	keepdir /usr/lib/distcc
+
+	dobin "${T}/distcc-config"
+
+	if use gtk; then
+		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
+		einfo "This is to have a little sensability in naming schemes between distccmon programs"
+		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
+		dosym distccmon-gui /usr/bin/distccmon-gnome
+	fi
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "doc/example/xinetd" distcc
+	fi
+
+	insinto /usr/share/shadowman/tools
+	newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
+	newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
+
+	rm -r "${ED}/etc/default" || die
+	rm "${ED}/etc/distcc/clients.allow" || die
+	rm "${ED}/etc/distcc/commands.allow.sh" || die
+}
+
+pkg_postinst() {
+	# remove the old paths when switching from libXX to lib
+	if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
+			-d ${EROOT}/usr/$(get_libdir)/distcc ]]; then
+		rm -r -f "${EROOT}/usr/$(get_libdir)/distcc" || die
+	fi
+
+	if [[ -z ${ROOT} ]]; then
+		eselect compiler-shadow update distcc
+		eselect compiler-shadow update distccd
+	fi
+
+	elog
+	elog "Tips on using distcc with Gentoo can be found at"
+	elog "https://wiki.gentoo.org/wiki/Distcc"
+	elog
+	elog "distcc-pump is broken and no longer installed."
+	elog
+	elog "To use the distccmon programs with Gentoo you should use this command:"
+	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
+
+	if use gtk; then
+		elog "Or:"
+		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
+	fi
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then
+		eselect compiler-shadow remove distcc
+	fi
+}


             reply	other threads:[~2024-05-27 17:24 UTC|newest]

Thread overview: 130+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-27 17:24 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-03 16:19 [gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/ Mike Gilbert
2024-10-12 15:56 Mike Gilbert
2024-10-07 19:18 Mike Gilbert
2024-05-29 12:15 Sam James
2024-05-29 11:47 Sam James
2024-05-29  6:26 Jakov Smolić
2024-05-28 17:01 Sam James
2023-07-04 22:42 Sam James
2023-07-04 22:42 Sam James
2023-07-04 22:42 Sam James
2023-07-04 22:42 Sam James
2023-07-04 22:42 Sam James
2023-07-04 22:42 Sam James
2023-07-04 22:42 Sam James
2023-04-08 13:30 Michał Górny
2023-01-13  9:32 Sam James
2022-09-01 17:54 Matt Turner
2022-06-23  6:42 Agostino Sarubbo
2022-06-23  5:59 Agostino Sarubbo
2022-06-22 13:25 Agostino Sarubbo
2022-06-22 13:23 Agostino Sarubbo
2022-06-22 13:22 Agostino Sarubbo
2022-06-22  5:49 Agostino Sarubbo
2022-06-21 15:25 Agostino Sarubbo
2022-05-31  7:19 Michał Górny
2021-08-12 17:36 Michał Górny
2021-07-08  3:53 Sam James
2021-07-06  1:48 Sam James
2021-07-05  6:58 Agostino Sarubbo
2021-07-03  1:32 Sam James
2021-07-03  1:30 Sam James
2021-07-03  1:28 Sam James
2021-05-28 15:36 Marek Szuba
2021-05-11 19:23 Michał Górny
2021-02-25 13:55 Michał Górny
2021-02-25 13:47 Sam James
2021-02-21  7:29 Sam James
2021-02-19 17:21 Sam James
2021-02-19 16:11 Sam James
2021-02-19  3:43 Sam James
2021-02-19  2:54 Sam James
2021-02-19  2:45 Sam James
2021-02-19  1:51 Thomas Deutschmann
2021-01-04 11:49 Michał Górny
2020-06-05 13:57 Michał Górny
2020-05-31  9:44 Michał Górny
2020-05-31  9:44 Michał Górny
2020-05-31  9:44 Michał Górny
2020-05-31  9:44 Michał Górny
2020-03-18 19:43 Rick Farina
2019-12-29 20:51 Michał Górny
2019-09-21  7:23 Matt Turner
2019-09-20  6:39 Sergei Trofimovich
2019-09-13 18:27 Mikle Kolyada
2019-09-09  6:02 Agostino Sarubbo
2019-09-09  5:54 Agostino Sarubbo
2019-09-09  1:13 Aaron Bauman
2019-09-08 19:15 Thomas Deutschmann
2019-09-08 18:30 Sergei Trofimovich
2019-09-08 18:26 Sergei Trofimovich
2019-09-08 18:21 Sergei Trofimovich
2019-09-08 10:22 Agostino Sarubbo
2019-08-14 23:04 Michał Górny
2019-06-01  8:14 Sergei Trofimovich
2019-04-13  0:37 Aaron Bauman
2019-04-10 15:07 Michał Górny
2019-04-08  6:54 Mikle Kolyada
2019-03-16 22:55 Sergei Trofimovich
2019-03-16 21:57 Sergei Trofimovich
2019-03-16 14:06 Mikle Kolyada
2019-03-15 23:14 Mikle Kolyada
2019-03-12 17:06 Mikle Kolyada
2019-03-11 22:42 Sergei Trofimovich
2019-03-10 22:17 Sergei Trofimovich
2019-02-16 13:31 Mikle Kolyada
2019-02-16 13:31 Mikle Kolyada
2019-02-16 13:31 Mikle Kolyada
2019-02-12 12:42 Mikle Kolyada
2019-02-12 12:42 Mikle Kolyada
2019-02-12 12:42 Mikle Kolyada
2018-12-16 10:00 Michał Górny
2018-12-09  8:35 Georgy Yakovlev
2018-12-09  8:35 Georgy Yakovlev
2018-12-09  8:04 Georgy Yakovlev
2018-12-08 17:53 Michał Górny
2018-12-02 16:32 Michał Górny
2018-12-02  8:38 Michał Górny
2018-12-02  8:38 Michał Górny
2018-12-02  8:38 Michał Górny
2018-12-02  8:38 Michał Górny
2018-12-02  8:38 Michał Górny
2018-12-02  8:38 Michał Górny
2018-12-02  8:38 Michał Górny
2018-04-13  4:25 Benda XU
2018-03-28  4:22 Matt Turner
2018-03-28  4:22 Matt Turner
2018-03-20 15:23 Jeroen Roovers
2018-03-20 14:47 Benda XU
2018-03-20 13:55 Benda XU
2018-03-20 13:24 Benda XU
2018-03-17 21:42 Matt Turner
2018-03-17 21:42 Matt Turner
2018-03-17 19:45 Matt Turner
2018-03-11 22:20 Sergei Trofimovich
2018-03-11  6:08 Matt Turner
2018-01-06 20:13 Markus Meier
2018-01-06 18:34 Sergei Trofimovich
2017-10-02  5:51 Benda XU
2017-08-26 16:10 Michał Górny
2017-08-26 13:37 Michał Górny
2017-08-26 13:37 Michał Górny
2017-08-26 13:37 Michał Górny
2017-08-17  7:44 Michał Górny
2017-03-13  4:51 Mike Frysinger
2017-02-24 21:45 Michael Weber
2016-10-02 12:37 Pacho Ramos
2016-06-12  9:12 Benda XU
2015-11-18  9:37 Sergey Popov
2015-11-16 14:19 Agostino Sarubbo
2015-11-05 20:58 Markus Meier
2015-11-05 11:20 Agostino Sarubbo
2015-11-03 16:18 Agostino Sarubbo
2015-11-01 14:56 Tobias Klausmann
2015-10-30 10:15 Agostino Sarubbo
2015-10-28 13:36 Justin Lecher
2015-10-27 12:18 Agostino Sarubbo
2015-10-24  6:39 Jeroen Roovers
2015-10-22 15:39 Sergey Popov
2015-10-22 14:53 Sergey Popov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1716830684.8d1ade87ad0ae9506c22aa4d311f1dd8331c9824.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox