commit:     6fe1578d38848b2b45b8b5cf83117ed1e463a140
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 21:36:37 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 23:04:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe1578d

sys-devel/distcc: Bump to 3.3.3

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-devel/distcc/Manifest            |   1 +
 sys-devel/distcc/distcc-3.3.3.ebuild | 196 +++++++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 2098365b9c6..5e6d668cdda 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1 +1,2 @@
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B 
e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138
 SHA512 
fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
+DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B 
b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa
 SHA512 
d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
new file mode 100644
index 00000000000..7d4e47111f2
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit autotools flag-o-matic python-single-r1 systemd \
+       toolchain-funcs user xdg-utils prefix
+
+DESCRIPTION="Distribute compilation of C code across several machines on a 
network"
+HOMEPAGE="http://distcc.org/";
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
+IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
+
+RESTRICT="test"
+
+CDEPEND="${PYTHON_DEPS}
+       dev-libs/popt
+       gnome? (
+               >=gnome-base/libgnome-2
+               >=gnome-base/libgnomeui-2
+               x11-libs/gtk+:2
+               x11-libs/pango
+       )
+       gssapi? ( net-libs/libgssglue )
+       gtk? ( x11-libs/gtk+:2 )
+       zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${CDEPEND}
+       sys-devel/autoconf-archive
+       sys-libs/binutils-libs
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       !net-misc/pump
+       dev-util/shadowman
+       >=sys-devel/gcc-config-1.4.1
+       selinux? ( sec-policy/selinux-distcc )
+       xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+       enewuser distcc 240 -1 -1 daemon
+       python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
+       # bug #255188
+       eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
+       # SOCKSv5 support needed for Portage, bug #537616
+       eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+       eapply_user
+
+       # Bugs #120001, #167844 and probably more. See patch for description.
+       use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
+
+       sed -i \
+               -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
+               -e "s:@PYTHON@:${EPYTHON}:" \
+               pump.in || die "sed failed"
+
+       sed \
+               -e "s:@EPREFIX@:${EPREFIX:-/}:" \
+               -e "s:@libdir@:/usr/lib:" \
+               "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
+
+       hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
+       python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
+       eautoreconf
+}
+
+src_configure() {
+       local myconf=(
+               --disable-Werror
+               --libdir=/usr/lib
+               $(use_enable ipv6 rfc2553)
+               $(use_with gtk)
+               $(use_with gnome)
+               $(use_with gssapi auth)
+               $(use_with zeroconf avahi)
+       )
+
+       econf "${myconf[@]}"
+}
+
+src_install() {
+       # override GZIP_BIN to stop it from compressing manpages
+       emake DESTDIR="${D}" GZIP_BIN=false 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 gnome || 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 [[ ${ROOT} == / ]]; then
+               eselect compiler-shadow update distcc
+               eselect compiler-shadow update distccd
+       fi
+
+       use gnome && xdg_desktop_database_update
+
+       elog
+       elog "Tips on using distcc with Gentoo can be found at"
+       elog "https://wiki.gentoo.org/wiki/Distcc";
+       elog
+       elog "distcc-pump is known to cause breakage with multiple packages."
+       elog "Do NOT enable it globally."
+       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 gnome || use gtk; then
+               elog "Or:"
+               elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" 
distccmon-gnome"
+       fi
+
+       elog
+       elog "***SECURITY NOTICE***"
+       elog "Since distcc-3.3, whitelist is used for what distccd could 
execute. The whilelist"
+       elog "has been generated by compiler-shadow distccd.  To revert to the 
old behavior, "
+       elog "you need to pass --make-me-a-botnet to distccd in 
/etc/conf.d/distccd."
+       elog "Cf. https://github.com/distcc/distcc/pull/243.";
+}
+
+pkg_prerm() {
+       if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
+               eselect compiler-shadow remove distcc
+       fi
+}
+
+pkg_postrm() {
+       use gnome && xdg_desktop_database_update
+}

Reply via email to