[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-11-03 Thread Mike Gilbert
commit: 7df37a3502252a1041f94293b2f4c366ff482d4a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov  3 16:18:22 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov  3 16:18:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df37a35

sys-devel/distcc: depend on >=dev-util/shadowman-4

Closes: https://bugs.gentoo.org/942758
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-devel/distcc/{distcc-3.4-r5.ebuild => distcc-3.4-r6.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r5.ebuild 
b/sys-devel/distcc/distcc-3.4-r6.ebuild
similarity index 99%
rename from sys-devel/distcc/distcc-3.4-r5.ebuild
rename to sys-devel/distcc/distcc-3.4-r6.ebuild
index c9317d52aec3..0fd22a9a78e8 100644
--- a/sys-devel/distcc/distcc-3.4-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r6.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND+="
acct-user/distcc
-   dev-util/shadowman
+   >=dev-util/shadowman-4
>=sys-devel/gcc-config-1.4.1
selinux? ( sec-policy/selinux-distcc )
xinetd? ( sys-apps/xinetd )



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/

2024-10-15 Thread Conrad Kostecki
commit: 1845ed6ca71665a98a2e0b542c8e746d7259a498
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Oct 14 15:36:10 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Oct 15 21:45:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1845ed6c

sys-devel/distcc: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 sys-devel/distcc/files/distcc-3.4-pump-tests.patch | 153 -
 1 file changed, 153 deletions(-)

diff --git a/sys-devel/distcc/files/distcc-3.4-pump-tests.patch 
b/sys-devel/distcc/files/distcc-3.4-pump-tests.patch
deleted file mode 100644
index db392b7f3632..
--- a/sys-devel/distcc/files/distcc-3.4-pump-tests.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-https://github.com/distcc/distcc/pull/460
-
-From 45d9c4a1ef66451ed45a6afdec7098ed02082390 Mon Sep 17 00:00:00 2001
-From: Rosen Matev 
-Date: Fri, 29 Apr 2022 15:42:28 +0200
-Subject: [PATCH] Fix tests in pump mode
-
-`make check` is also running tests for the pump mode
-(`pump-maintainer-check` target) but they were all falling back to
-the usual preprocessor mode as the include server was not started.
-
-This is solved by prepending `pump` to the distcc invocations and
-also some trivially failing tests are fixed or disabled when they
-make no sense in pump mode.

- Makefile.in|  2 +-
- pump.in| 13 +++--
- test/testdistcc.py | 28 
- 3 files changed, 36 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f240ca6f..79e28380 100644
 a/Makefile.in
-+++ b/Makefile.in
-@@ -583,7 +583,7 @@ distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
- # the distcc version, the source location, the CPP flags (for location of the
- # includes), and the build location.
- include-server:
--  if test -z "$(PYTHON)"; then\
-+  @if test -z "$(PYTHON)"; then   \
- echo "Not building $@: No suitable python found"; \
-   else\
- mkdir -p "$(include_server_builddir)" &&  \
-diff --git a/pump.in b/pump.in
-index 8e46f458..08a32c0e 100755
 a/pump.in
-+++ b/pump.in
-@@ -218,7 +218,9 @@ PrintIncludeServerStatusMessage() {
- }
- 
- Announce() {
--  echo "__Using distcc-pump from $DISTCC_LOCATION"
-+  if [ "$verbose" = 1 ]; then
-+echo "__Using distcc-pump from $DISTCC_LOCATION"
-+  fi
- }
- 
- # Starts up the include server.  Sets $socket, $socket_dir, and
-@@ -359,7 +361,9 @@ ShutDown() {
-   # Always -- at exit -- shut down include_server and remove $socket_dir
-   if [ -n "$include_server_pid" ] && \
- ps -p "$include_server_pid" > /dev/null; then
--echo '__Shutting down distcc-pump include server'
-+if [ "$verbose" = 1 ]; then
-+  echo '__Shutting down distcc-pump include server'
-+fi
- kill $include_server_pid
- # Wait until it's really dead.  We need to do this because the
- # include server may produce output after receiving SIGTERM.
-@@ -508,6 +512,11 @@ Main() {
- 
-   Initialize
- 
-+  # Do not write on stdout if we're testing pump mode
-+  if [ "0$DISTCC_TESTING_INCLUDE_SERVER" -ne "0" ]; then
-+verbose=0
-+  fi
-+
-   case "$*" in
- --startup)
-   # Don't put ordinary progress messages on stdout,
-diff --git a/test/testdistcc.py b/test/testdistcc.py
-index dfdf2f13..6377d0b6 100755
 a/test/testdistcc.py
-+++ b/test/testdistcc.py
-@@ -258,7 +258,11 @@ def valgrind(self):
- return _valgrind_command;
- 
- def distcc(self):
--return self.valgrind() + "distcc "
-+if "cpp" not in _server_options:
-+return self.valgrind() + "distcc "
-+else:
-+return "DISTCC_TESTING_INCLUDE_SERVER=1 " + self.valgrind() + 
"pump distcc "
-+
- 
- def distccd(self):
- return self.valgrind() + "distccd "
-@@ -422,6 +426,11 @@ class BogusOption_Case(SimpleDistCC_Case):
- Now that we support implicit compilers, this is passed to gcc,
- which returns a non-zero status."""
- def runtest(self):
-+# Disable the test in pump mode since the pump wrapper fails
-+# before we can run distcc.
-+if "cpp" in _server_options:
-+raise comfychair.NotRunError('pump wrapper expects DISTCC_HOSTS')
-+
- error_rc, _, _ = self.runcmd_unchecked(self._cc + " --bogus-option")
- assert error_rc != 0
- self.runcmd(self.distcc() + self._cc + " --bogus-option", error_rc)
-@@ -432,7 +441,7 @@ def runtest(self):
- class CompilerOptionsPassed_Case(SimpleDistCC_Case):
- """Test that options following the compiler name are passed to the 
compiler."""
- def runtest(self):
--out, err = self.runcmd("DISTCC_HOSTS=localhost "
-+out, err = self.runcmd("DISTCC_HOSTS=localhost%s " % _server_options
-+ self.distcc()
-  

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-10-12 Thread Mike Gilbert
commit: c6a6cef88c49843307b879fcec206c2a1fb112b9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct 12 15:56:32 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 12 15:56:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a6cef8

sys-devel/distcc: drop 3.4-r1, 3.4-r2, 3.4-r3

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 181 -
 sys-devel/distcc/distcc-3.4-r2.ebuild | 182 -
 sys-devel/distcc/distcc-3.4-r3.ebuild | 186 --
 3 files changed, 549 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
deleted file mode 100644
index f5a660195bc6..
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~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="
-   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 )"
-
-src_prepare() {
-   eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
-   # SOCKSv5 support needed for Portage, bug #537616
-   eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-   eapply "${FILESDIR}/${PN}-3.4-pump-tests.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
-
-   # 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)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_test() {
-   # sandbox breaks some tests, and hangs some too
-   # retest once #590084 is fixed
-   local -x SANDBOX_ON=0
-   emake -j1 check
-}
-
-src_install() {
-   # override GZIP_BIN to stop it from compressing manpages
-   emake -j1 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="

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2024-10-12 Thread Mike Gilbert
commit: d7e09eb9df61ad2b80b172b9baa7ed18fa5f5b47
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Oct 10 17:14:51 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 12 15:53:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e09eb9

sys-devel/distcc: revbump

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-devel/distcc/distcc-3.4-r5.ebuild   | 195 
 sys-devel/distcc/files/distcc-config-r1 | 180 +
 2 files changed, 375 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.4-r5.ebuild 
b/sys-devel/distcc/distcc-3.4-r5.ebuild
new file mode 100644
index ..720b8cf870d1
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4-r5.ebuild
@@ -0,0 +1,195 @@
+# 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 ~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="${D

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/

2024-10-12 Thread Mike Gilbert
commit: 80781de2c71054bccb012c1ef2acf5dc7f079f6a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Oct 10 17:18:56 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 12 15:53:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80781de2

sys-devel/distcc: move masquerade links to /usr/lib/distcc

This matches the path used internally by distcc.
We provide a symlink at /usr/lib/distcc/bin for backward compat.

Bug: https://bugs.gentoo.org/650986
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-devel/distcc/distcc-3.4-r5.ebuild   | 16 ++--
 sys-devel/distcc/files/distcc-config-r1 |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.4-r5.ebuild 
b/sys-devel/distcc/distcc-3.4-r5.ebuild
index 720b8cf870d1..c9317d52aec3 100644
--- a/sys-devel/distcc/distcc-3.4-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r5.ebuild
@@ -57,8 +57,7 @@ src_prepare() {
 
sed \
-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-   -e "s:@libdir@:/usr/lib:" \
-   "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
+   "${FILESDIR}/distcc-config-r1" > "${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
@@ -152,15 +151,21 @@ src_install() {
fi
 
insinto /usr/share/shadowman/tools
-   newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
-   # Dummy symlinks to distccd to satisfy command whitelist, bug 650986
-   newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
+   newins - distcc <<<"${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_preinst() {
+   # Compatibility symlink for Portage
+   dosym . /usr/lib/distcc/bin
+   if [[ -e ${EROOT}/usr/lib/distcc/bin && ! -L 
${EROOT}/usr/lib/distcc/bin ]]; then
+   rm -rf "${EROOT}"/usr/lib/distcc/bin || die
+   fi
+}
+
 pkg_postinst() {
# remove the old paths when switching from libXX to lib
if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
@@ -170,7 +175,6 @@ pkg_postinst() {
 
if [[ -z ${ROOT} ]]; then
eselect compiler-shadow update distcc
-   eselect compiler-shadow update distccd
fi
 
elog

diff --git a/sys-devel/distcc/files/distcc-config-r1 
b/sys-devel/distcc/files/distcc-config-r1
index 974620d107fb..e58a173f9d2e 100644
--- a/sys-devel/distcc/files/distcc-config-r1
+++ b/sys-devel/distcc/files/distcc-config-r1
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2003-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import os, re, signal, subprocess, sys
@@ -24,7 +24,7 @@ cmdline=[]
 eprefix = '@EPREFIX@'
 bindir = os.path.join(eprefix, 'usr', 'bin')
 sbindir = os.path.join(eprefix, 'usr', 'sbin')
-libdir = os.path.join(eprefix, '@libdir@')
+libdir = os.path.join(eprefix, 'usr', 'lib')
 sysconfdir = os.path.join(eprefix, 'etc')
 
 gcc_config = os.path.join(bindir, 'gcc-config')
@@ -33,7 +33,7 @@ envfile = os.path.join(sysconfdir, 'env.d', '02distcc')
 default_distcc_dir = os.path.join(sysconfdir, 'distcc')
 hostfile = os.path.join(default_distcc_dir, 'hosts')
 distcc_path = os.path.join(bindir, 'distcc')
-dccc_dir = os.path.join(libdir, 'distcc', 'bin')
+dccc_dir = os.path.join(libdir, 'distcc')
 
 def exithandler(foo,bar):
os.kill(0,signal.SIGKILL)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-10-07 Thread Mike Gilbert
commit: ac6f475057992d0fd098f9fbf66f559aa572e9dd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Oct  7 19:16:59 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Oct  7 19:16:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6f4750

sys-devel/distcc: add comment documenting /usr/lib/distcc/* symlinks

Bug: https://bugs.gentoo.org/650986
Signed-off-by: Mike Gilbert  gentoo.org>

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

diff --git a/sys-devel/distcc/distcc-3.4-r4.ebuild 
b/sys-devel/distcc/distcc-3.4-r4.ebuild
index fa9412b016c3..cdc4f075619c 100644
--- a/sys-devel/distcc/distcc-3.4-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r4.ebuild
@@ -153,6 +153,7 @@ src_install() {
 
insinto /usr/share/shadowman/tools
newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
+   # Dummy symlinks to distccd to satisfy command whitelist, bug 650986
newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
 
rm -r "${ED}/etc/default" || die



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-05-29 Thread Sam James
commit: cee679f2b6470b5e892330c97a5a5ab6ae57f46a
Author: Sam James  gentoo  org>
AuthorDate: Wed May 29 12:14:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 29 12:14:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee679f2

sys-devel/distcc: Stabilize 3.4-r4 arm64, #933053

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r4.ebuild 
b/sys-devel/distcc/distcc-3.4-r4.ebuild
index 38d610201ac8..773523f426cd 100644
--- a/sys-devel/distcc/distcc-3.4-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r4.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-05-29 Thread Sam James
commit: 6c16bf11b91f8d83edd00cd0e899aa96a764a2fa
Author: Sam James  gentoo  org>
AuthorDate: Wed May 29 11:45:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 29 11:45:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c16bf11

sys-devel/distcc: Stabilize 3.4-r4 amd64, #933053

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r4.ebuild 
b/sys-devel/distcc/distcc-3.4-r4.ebuild
index e45bbbc05a13..38d610201ac8 100644
--- a/sys-devel/distcc/distcc-3.4-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r4.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-05-28 Thread Jakov Smolić
commit: 271637d1430622242d028cf0e55dde8a2c7c3859
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed May 29 06:26:14 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed May 29 06:26:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271637d1

sys-devel/distcc: Stabilize 3.4-r4 x86, #933053

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-devel/distcc/distcc-3.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r4.ebuild 
b/sys-devel/distcc/distcc-3.4-r4.ebuild
index 820555189831..e45bbbc05a13 100644
--- a/sys-devel/distcc/distcc-3.4-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r4.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-05-28 Thread Sam James
commit: df2edfc776d7e2302c628962dbdd4b7fec636536
Author: Sam James  gentoo  org>
AuthorDate: Tue May 28 16:58:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 28 16:58:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df2edfc7

sys-devel/distcc: Stabilize 3.4-r4 ppc, #933053

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r4.ebuild 
b/sys-devel/distcc/distcc-3.4-r4.ebuild
index fad0202bf65b..820555189831 100644
--- a/sys-devel/distcc/distcc-3.4-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r4.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2024-05-27 Thread Michał Górny
commit: 8d1ade87ad0ae9506c22aa4d311f1dd8331c9824
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 27 17:23:13 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 27 17:24:44 2024 +
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  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 ..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

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/

2023-09-26 Thread Sam James
commit: a43ee9d85165ae7913807d321bf3e73c32fd3247
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 04:26:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 04:26:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43ee9d8

sys-devel/distcc: backport CHOST rewriting fix (deux)

Closes: https://bugs.gentoo.org/773652
Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r3.ebuild  | 186 +
 .../distcc/files/distcc-3.4-rewrite-chost.patch|  79 +
 2 files changed, 265 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.4-r3.ebuild 
b/sys-devel/distcc/distcc-3.4-r3.ebuild
new file mode 100644
index ..df8124e492d9
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4-r3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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="
+   sys-devel/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}/${PN}-3.4-pump-tests.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 -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
+
+   # 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)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_test() {
+   # sandbox breaks some tests, and hangs some too
+   # retest once #590084 is fixed
+   local -x SANDBOX_ON=0
+   emake -j1 check
+}
+
+src_install() {
+   # override GZIP_BIN to stop it from compressing manpages
+   emake -j1 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

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: 769ed3e7eb379d4047c5940669992fc7cfc22c11
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769ed3e7

sys-devel/distcc: Stabilize 3.4-r2 sparc, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index caf2e1d02158..ea55462bbb84 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: 3448901a2a3defda694060965fa972d641246661
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3448901a

sys-devel/distcc: Stabilize 3.4-r2 arm, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index ea55462bbb84..1d6861e822b4 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: 4eff62a45e5d2a1c09c570bd37b194d703b52c33
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eff62a4

sys-devel/distcc: Stabilize 3.4-r2 arm64, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index 1d6861e822b4..95f9fc4c0540 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: 62c17b9db5c403278df11dd48881a49a0abcaadb
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c17b9d

sys-devel/distcc: Stabilize 3.4-r2 amd64, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index 1f64a9e6be93..afa58a03b293 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: 8cee25d2bf8859d46f12e55db973f79490653057
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cee25d2

sys-devel/distcc: Stabilize 3.4-r2 ppc, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index 971a975621fe..b0c381c6a062 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: 70c4e4f25e09aca18ef24f7e9e628596eae74144
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c4e4f2

sys-devel/distcc: Stabilize 3.4-r2 x86, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index afa58a03b293..971a975621fe 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-07-04 Thread Sam James
commit: bad827bf1eb545af34f4a01002d30943705e451f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:41:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:41:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad827bf

sys-devel/distcc: Stabilize 3.4-r2 ppc64, #909659

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
index b0c381c6a062..caf2e1d02158 100644
--- a/sys-devel/distcc/distcc-3.4-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2023-04-20 Thread Sam James
commit: 82469e1b6888efad9c7e08dec227694c9f1684c8
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 20 19:21:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 20 19:36:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82469e1b

sys-devel/distcc: backport corruption fix

Closes: https://bugs.gentoo.org/904720
Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r2.ebuild  | 182 +
 ...cc-3.4-fix-dcc_gcc_rewrite_fqn-corruption.patch |  65 
 2 files changed, 247 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.4-r2.ebuild 
b/sys-devel/distcc/distcc-3.4-r2.ebuild
new file mode 100644
index ..1f64a9e6be93
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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="
+   sys-devel/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 )"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
+   # SOCKSv5 support needed for Portage, bug #537616
+   eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+   eapply "${FILESDIR}/${PN}-3.4-pump-tests.patch"
+   eapply "${FILESDIR}/${P}-fix-dcc_gcc_rewrite_fqn-corruption.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
+
+   # 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)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_test() {
+   # sandbox breaks some tests, and hangs some too
+   # retest once #590084 is fixed
+   local -x SANDBOX_ON=0
+   emake -j1 check
+}
+
+src_install() {
+   # override GZIP_BIN to stop it from compressing manpages
+   emake -j1 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_

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-04-08 Thread Michał Górny
commit: 6688f2d4645c4f9cead363f1566be7b05e133a54
Author: Peter Levine  gmail  com>
AuthorDate: Fri Apr  7 04:09:06 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr  8 13:29:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6688f2d4

sys-devel/distcc: enable py3.11

Closes: https://bugs.gentoo.org/897294
Closes: https://github.com/gentoo/gentoo/pull/30509
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index 595748d35f48..c1a96f3528db 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools flag-o-matic prefix python-single-r1 systemd
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2023-01-13 Thread Sam James
commit: 5259e11f37ee35a8ba5426a101d4ede6979e5de8
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 09:31:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 09:31:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5259e11f

sys-devel/distcc: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index b39e2f4ab899..8e23cf8fbb58 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -8,4 +8,7 @@

Enable support for 
net-libs/libgssglue

+   
+   distcc/distcc
+   
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2023-01-13 Thread Sam James
commit: 4a4dea6c8c14d265858ab687c96781f5dfb66766
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 09:31:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 09:31:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4dea6c

sys-devel/distcc: drop 3.3.3-r3, 3.4

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/Manifest  |   1 -
 sys-devel/distcc/distcc-3.3.3-r3.ebuild| 186 -
 sys-devel/distcc/distcc-3.4.ebuild | 178 
 .../distcc/files/distcc-3.3.2-freedesktop.patch| 112 -
 .../distcc/files/distcc-3.3.3-gcc-10-fix.patch |  28 
 .../files/distcc-3.3.3-no-rewrite-chost.patch  |  28 
 sys-devel/distcc/files/distcc-3.3.3-py38.patch |  53 --
 7 files changed, 586 deletions(-)

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index f78dee9dc148..19f4116d75c4 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,2 +1 @@
-DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B 
b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592fd521cf73c92a72bf30b8a69caa
 SHA512 
d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
 DIST distcc-3.4.tar.gz 1239519 BLAKE2B 
8dc9baa6b1f65f2bb3621e4e643d7d15d55e2338de4d6a7f20a572d9ec280925b4421a294f40c9fcfba8d4193a6bd1871eb8caf13dd2c2a8a81834671f6bc8bc
 SHA512 
de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef

diff --git a/sys-devel/distcc/distcc-3.3.3-r3.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r3.ebuild
deleted file mode 100644
index c535bb1a9fe3..
--- a/sys-devel/distcc/distcc-3.3.3-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools flag-o-matic prefix python-single-r1 systemd \
-   toolchain-funcs xdg-utils
-
-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 ~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+:2 )
-   zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${RDEPEND}
-   sys-libs/binutils-libs"
-BDEPEND="
-   sys-devel/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 )"
-
-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"
-   # backport py3.8 fixes
-   eapply "${FILESDIR}/${P}-py38.patch"
-   # gcc-10 fix, #707502
-   eapply "${FILESDIR}/${P}-gcc-10-fix.patch"
-   # unbreak CHOST prefix, https://bugs.gentoo.org/773652
-   eapply "${FILESDIR}/${P}-no-rewrite-chost.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
-
-   # 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() {
-   local myconf=(
-   --disable-Werror
-   --libdir=/usr/lib
-   $(use_enable ipv6 rfc2553)
-   $(use_with gtk)
-   --without-gnome
-   $(use_with gssapi auth)
-   $(use_with zeroconf avahi)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_test() {
-   # sandbox breaks some tests, and hangs some too
-   # retest once #590084 is fixed
-   local -x SANDBOX_ON=0
-   emake -j1 check
-}
-
-src_install() {
-   #

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-09-01 Thread Matt Turner
commit: 9076d5105b70e11bc2ee32ddf5a26f8de6a30651
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Sep  1 17:54:38 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Sep  1 17:54:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9076d510

sys-devel/distcc: Stabilize 3.4 ppc, #799935

Signed-off-by: Matt Turner  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index cb49de0fd3c1..dc60b2b2ff1e 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-22 Thread Agostino Sarubbo
commit: a4bdb7ae2a857e1ead63dc31aa35c970d0ae9fcd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 23 06:42:48 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 23 06:42:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bdb7ae

sys-devel/distcc: ppc64 stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index 1d8e604a0620..1bee4f2f6420 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-22 Thread Agostino Sarubbo
commit: 6c6b95e7912a922077731f95889d838d344d7434
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 23 05:58:56 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 23 05:58:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6b95e7

sys-devel/distcc: ppc stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index 078740154ef8..1d8e604a0620 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-22 Thread Agostino Sarubbo
commit: ad3313e798c6749f422ac7cc53c8844b17c6bc36
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 22 13:24:34 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 22 13:24:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3313e7

sys-devel/distcc: x86 stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index 4e46c84df2f0..078740154ef8 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-22 Thread Agostino Sarubbo
commit: 5d653ac35049e9b8267830475c9603238f5939d2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 22 13:23:23 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 22 13:23:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d653ac3

sys-devel/distcc: arm64 stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index b7a175326e32..4e46c84df2f0 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-22 Thread Agostino Sarubbo
commit: 794f8d108affcfd95e785a559782b6193aa4bfcd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 22 13:22:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 22 13:22:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794f8d10

sys-devel/distcc: amd64 stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index b28408c2cf27..b7a175326e32 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-21 Thread Agostino Sarubbo
commit: 3b773245e14f6cf9194f4b5ace9c9f2d36dd5864
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 22 05:49:07 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 22 05:49:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b773245

sys-devel/distcc: sparc stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index f78f339a5bfd..b28408c2cf27 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-06-21 Thread Agostino Sarubbo
commit: 7ca08689561de3c6b28f718c75bb6c1e8ccb34ac
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun 21 15:24:53 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun 21 15:24:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca08689

sys-devel/distcc: arm stable wrt bug #853277

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
index 7495c3fff4fe..f78f339a5bfd 100644
--- a/sys-devel/distcc/distcc-3.4-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -13,7 +13,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2022-06-06 Thread Sam James
commit: 960e52330ab1979cc35077fbcea1e3ea7c63415f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 04:53:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 04:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960e5233

sys-devel/distcc: update EAPI 7 -> 8, Python 3.10

Seems to mostly work with Python 3.10, although I get a test failure,
it's better than it was pre-patch.

Closes: https://bugs.gentoo.org/846320
Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4-r1.ebuild  | 181 +
 sys-devel/distcc/files/distcc-3.4-pump-tests.patch | 153 +
 2 files changed, 334 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.4-r1.ebuild 
b/sys-devel/distcc/distcc-3.4-r1.ebuild
new file mode 100644
index ..7495c3fff4fe
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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="
+   sys-devel/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 )"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
+   # SOCKSv5 support needed for Portage, bug #537616
+   eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+   eapply "${FILESDIR}/${PN}-3.4-pump-tests.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
+
+   # 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)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_test() {
+   # sandbox breaks some tests, and hangs some too
+   # retest once #590084 is fixed
+   local -x SANDBOX_ON=0
+   emake -j1 check
+}
+
+src_install() {
+   # override GZIP_BIN to stop it from compressing manpages
+   emake -j1 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_ER

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2022-05-31 Thread Michał Górny
commit: 3dcadaf0488b2f24aa7327607e7e201d5b9d4f5f
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 31 07:01:01 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 31 07:18:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcadaf0

sys-devel/distcc: Remove myself as maintainer

This package is unmaintained, broken beyond repair and I don't use it
anymore for 2 years already.

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

 sys-devel/distcc/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 949da1a6e8db..b39e2f4ab899 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   mgo...@gentoo.org
-   Michał Górny
-   

clus...@gentoo.org
Gentoo Cluster Project



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-08-12 Thread Michał Górny
commit: 2e30d073c559517de1115e5f021f3238f5cbdad2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 12 17:35:33 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 12 17:35:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e30d073

sys-devel/distcc: Add missing EPREFIX to libdir

Closes: https://bugs.gentoo.org/807823
Signed-off-by: Michał Górny  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index 00e2ef66449..cb49de0fd3c 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 src_configure() {
local myconf=(
--disable-Werror
-   --libdir=/usr/lib
+   --libdir="${EPREFIX}"/usr/lib
$(use_enable ipv6 rfc2553)
$(use_with gtk)
--without-gnome



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-07-07 Thread Sam James
commit: 855df021780ba816167a9c01646122de6bed3439
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul  8 03:53:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul  8 03:53:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855df021

sys-devel/distcc: Stabilize 3.4 arm64, #799935

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index 23516be1cd7..00e2ef66449 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-07-05 Thread Sam James
commit: d78c7c2e6cf5e8eed226392287db04f0e3c136dc
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  6 01:47:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  6 01:47:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78c7c2e

sys-devel/distcc: Stabilize 3.4 arm, #799935

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index 6906d6c786f..23516be1cd7 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-07-04 Thread Agostino Sarubbo
commit: 145ba0fa8e153bd89f2ab78000d5cf99ed7058fc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul  5 06:58:26 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul  5 06:58:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145ba0fa

sys-devel/distcc: ppc64 stable wrt bug #799935

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index 7f74770ee18..6906d6c786f 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-07-02 Thread Sam James
commit: a5ccb1f4d96da414ee603017176a933e9924d369
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  3 01:32:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  3 01:32:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ccb1f4

sys-devel/distcc: Stabilize 3.4 sparc, #799935

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index d7d5a021498..7f74770ee18 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-07-02 Thread Sam James
commit: 29cb910af080617cfc34d85b326c3fe65b2ee0c4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  3 01:30:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  3 01:30:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cb910a

sys-devel/distcc: Stabilize 3.4 amd64, #799935

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index dc9578614a3..d7d5a021498 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-07-02 Thread Sam James
commit: 5c2bf05079155998aff0059fb0f44edd8bebb0db
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  3 01:28:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  3 01:28:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2bf050

sys-devel/distcc: Stabilize 3.4 x86, #799935

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index d16540b5515..dc9578614a3 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-05-28 Thread Marek Szuba
commit: 331e25554dfd9bb68a72e2d3909fb99f3cfef1d1
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 28 15:05:18 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 28 15:36:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331e2555

sys-devel/distcc-3.4: keyword for riscv

Builds, tests (ObjectiveC_Case, ObjectiveCPlusPlus_Case - skipped
because I didn't have the right compilers installed; PreprocessAsm_Case
- skipped due to being system-specific; all others - OK) and installs
fine.

Tested on BeagleV Starlight (rv64_lp64d).

Signed-off-by: Marek Szuba  gentoo.org>

 sys-devel/distcc/distcc-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
index 314dfd4b44b..d16540b5515 100644
--- a/sys-devel/distcc/distcc-3.4.ebuild
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -14,7 +14,7 @@ 
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 ~s390 
~sparc ~x86"
+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}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-05-11 Thread Michał Górny
commit: 7c2bb72718d2d7f8c876e2ea63d043f3f11ea607
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 11 19:10:33 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 11 19:23:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2bb727

sys-devel/distcc: Bump to 3.4

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

 sys-devel/distcc/Manifest  |   1 +
 sys-devel/distcc/distcc-3.4.ebuild | 178 +
 2 files changed, 179 insertions(+)

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 1efba30ad96..f78dee9dc14 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1 +1,2 @@
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B 
b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592fd521cf73c92a72bf30b8a69caa
 SHA512 
d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
+DIST distcc-3.4.tar.gz 1239519 BLAKE2B 
8dc9baa6b1f65f2bb3621e4e643d7d15d55e2338de4d6a7f20a572d9ec280925b4421a294f40c9fcfba8d4193a6bd1871eb8caf13dd2c2a8a81834671f6bc8bc
 SHA512 
de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef

diff --git a/sys-devel/distcc/distcc-3.4.ebuild 
b/sys-devel/distcc/distcc-3.4.ebuild
new file mode 100644
index 000..314dfd4b44b
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools flag-o-matic prefix python-single-r1 systemd \
+   toolchain-funcs xdg-utils
+
+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 ~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="
+   sys-devel/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 )"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-3.0-xinetd.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
+
+   # 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() {
+   local myconf=(
+   --disable-Werror
+   --libdir=/usr/lib
+   $(use_enable ipv6 rfc2553)
+   $(use_with gtk)
+   --without-gnome
+   $(use_with gssapi auth)
+   $(use_with zeroconf avahi)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_test() {
+   # sandbox breaks some tests, and hangs some too
+   # retest once #590084 is fixed
+   local -x SANDBOX_ON=0
+   emake -j1 check
+}
+
+src_install() {
+   # override GZIP_BIN to stop it from compressing manpages
+   emake -j1 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
+   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2021-03-02 Thread Michał Górny
commit: 76151f32fbd41247e5d01f88207db2a084f6e661
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Mar  2 17:23:51 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar  2 18:16:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76151f32

sys-devel/distcc: Disable CHOST rewrites that break i686 cross

Closes: https://bugs.gentoo.org/773652
Signed-off-by: Michał Górny  gentoo.org>

 ...stcc-3.3.3-r2.ebuild => distcc-3.3.3-r3.ebuild} |  2 ++
 .../files/distcc-3.3.3-no-rewrite-chost.patch  | 28 ++
 2 files changed, 30 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r3.ebuild
similarity index 98%
rename from sys-devel/distcc/distcc-3.3.3-r2.ebuild
rename to sys-devel/distcc/distcc-3.3.3-r3.ebuild
index b5d02e4bf2c..729f2211d69 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r3.ebuild
@@ -46,6 +46,8 @@ src_prepare() {
eapply "${FILESDIR}/${P}-py38.patch"
# gcc-10 fix, #707502
eapply "${FILESDIR}/${P}-gcc-10-fix.patch"
+   # unbreak CHOST prefix, https://bugs.gentoo.org/773652
+   eapply "${FILESDIR}/${P}-no-rewrite-chost.patch"
eapply_user
 
# Bugs #120001, #167844 and probably more. See patch for description.

diff --git a/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch 
b/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch
new file mode 100644
index 000..dafaa90759b
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch
@@ -0,0 +1,28 @@
+From c2471d4cf3e2ef2556c150d52860b4e8f04e4994 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= 
+Date: Mon, 1 Mar 2021 22:13:36 +0200
+Subject: [PATCH] distcc: fix i686 cross compile
+
+[mgorny: disable toolchain prefix rewriting code that workarounds some
+ Debian invention and breaks everything else]
+
+---
+ src/compile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/compile.c b/src/compile.c
+index 25df355..e5d655b 100644
+--- a/src/compile.c
 b/src/compile.c
+@@ -572,7 +572,7 @@ static int dcc_gcc_rewrite_fqn(char **argv)
+ if (!newcmd)
+ return -ENOMEM;
+ 
+-if ((t = strstr(target_with_vendor, "-pc-"))) {
++if (0 && (t = strstr(target_with_vendor, "-pc-"))) {
+ memcpy(newcmd, target_with_vendor, t - target_with_vendor);
+ strcat(newcmd, t + strlen("-pc"));
+ } else
+-- 
+2.26.2
+



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-25 Thread Michał Górny
commit: 6ccdcf4950b3949ee37c2cf888b4d73039e6d478
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Feb 25 13:54:32 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Feb 25 13:55:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ccdcf49

sys-devel/distcc: Remove old

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

 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 195 
 1 file changed, 195 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
deleted file mode 100644
index 5bbe0b807af..000
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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="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 s390 sparc 
x86"
-IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-CDEPEND="${PYTHON_DEPS}
-   dev-libs/popt
-   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}
-   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"
-   # backport py3.8 fixes
-   eapply "${FILESDIR}/${P}-py38.patch"
-   # gcc-10 fix, #707502
-   eapply "${FILESDIR}/${P}-gcc-10-fix.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
-
-   # 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() {
-   local myconf=(
-   --disable-Werror
-   --libdir=/usr/lib
-   $(use_enable ipv6 rfc2553)
-   $(use_with gtk)
-   --without-gnome
-   $(use_with gssapi auth)
-   $(use_with zeroconf avahi)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_test() {
-   # sandbox breaks some tests, and hangs some too
-   # retest once #590084 is fixed
-   local -x SANDBOX_ON=0
-   emake -j1 check
-}
-
-src_install() {
-   # override GZIP_BIN to stop it from compressing manpages
-   emake -j1 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_

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-25 Thread Sam James
commit: 02457ca8e1b9817f4b13770f0ade74e1e2259d90
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 25 13:47:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 13:47:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02457ca8

sys-devel/distcc: Stabilize 3.3.3-r2 ppc, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index 63eb0994ddf..b5d02e4bf2c 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-20 Thread Sam James
commit: f977e76a727a30df477637e333a176416c553a88
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 21 07:29:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 21 07:29:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f977e76a

sys-devel/distcc: Stabilize 3.3.3-r2 arm64, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index 41c54503475..63eb0994ddf 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc 
x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-19 Thread Sam James
commit: 8dd1543e974d189543bcde3eb6d50758f5f2f4ef
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 17:20:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 17:20:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd1543e

sys-devel/distcc: Stabilize 3.3.3-r2 ppc64, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index f608aff76ee..41c54503475 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 
sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-19 Thread Sam James
commit: d79631a86d54527d8ff3f5a6e9f49df4358d449c
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 16:09:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 16:09:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79631a8

sys-devel/distcc: Stabilize 3.3.3-r2 amd64, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index 73461688bb7..f608aff76ee 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 
sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-18 Thread Sam James
commit: ece85a1d7c4d0cb57e6c2d6bcdb6f0f86de0c097
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 03:41:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 03:41:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece85a1d

sys-devel/distcc: Stabilize 3.3.3-r2 sparc, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index 4a9abd15430..73461688bb7 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 s390 
~sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 
sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-18 Thread Sam James
commit: c35ad52a89b4b4b49ac1c468aa7a210cee1039e3
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 02:53:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 02:53:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35ad52a

sys-devel/distcc: Stabilize 3.3.3-r2 arm, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index 3846fc8c5cd..4a9abd15430 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 s390 
~sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 
~sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-18 Thread Sam James
commit: f4f14b93013ed92c5d03b2886210ba393106c2c9
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 02:44:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 02:44:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f14b93

sys-devel/distcc: Stabilize 3.3.3-r2 s390, #771525

Signed-off-by: Sam James  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index bcfb9c22ae5..3846fc8c5cd 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 ~s390 
~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 
~sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-02-18 Thread Thomas Deutschmann
commit: 62a5073d735c02304f3db39eac272c57a023d4f1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Feb 19 01:40:11 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Feb 19 01:40:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a5073d

sys-devel/distcc: x86 stable (bug #771525)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
index b35b55c2ca0..bcfb9c22ae5 100644
--- a/sys-devel/distcc/distcc-3.3.3-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -14,7 +14,7 @@ 
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 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86"
 IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2021-01-04 Thread Michał Górny
commit: 8916546de90f022411173354c6bf3b711bc85283
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jan  4 11:42:51 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jan  4 11:49:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8916546d

sys-devel/distcc: EAPI 7, acct-user

Closes: https://bugs.gentoo.org/763078
Signed-off-by: Michał Górny  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r2.ebuild | 184 
 1 file changed, 184 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.3-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
new file mode 100644
index 000..b35b55c2ca0
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.3-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools flag-o-matic prefix python-single-r1 systemd \
+   toolchain-funcs xdg-utils
+
+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 ~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+:2 )
+   zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${RDEPEND}
+   sys-libs/binutils-libs"
+BDEPEND="
+   sys-devel/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 )"
+
+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"
+   # backport py3.8 fixes
+   eapply "${FILESDIR}/${P}-py38.patch"
+   # gcc-10 fix, #707502
+   eapply "${FILESDIR}/${P}-gcc-10-fix.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
+
+   # 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() {
+   local myconf=(
+   --disable-Werror
+   --libdir=/usr/lib
+   $(use_enable ipv6 rfc2553)
+   $(use_with gtk)
+   --without-gnome
+   $(use_with gssapi auth)
+   $(use_with zeroconf avahi)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_test() {
+   # sandbox breaks some tests, and hangs some too
+   # retest once #590084 is fixed
+   local -x SANDBOX_ON=0
+   emake -j1 check
+}
+
+src_install() {
+   # override GZIP_BIN to stop it from compressing manpages
+   emake -j1 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_DI

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2020-06-05 Thread Michał Górny
commit: a733913255769e9d8fc19210f5d910177ce373b5
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun  5 13:51:59 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun  5 13:57:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7339132

sys-devel/distcc: Force -j1 for install

Closes: https://bugs.gentoo.org/727152
Signed-off-by: Michał Górny  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 700f331aa62..f4d8d84f5ec 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -96,7 +96,7 @@ src_test() {
 
 src_install() {
# override GZIP_BIN to stop it from compressing manpages
-   emake DESTDIR="${D}" GZIP_BIN=false install
+   emake -j1 DESTDIR="${D}" GZIP_BIN=false install
python_optimize
 
newinitd "${FILESDIR}/distccd.initd" distccd



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/

2020-05-31 Thread Joonas Niilola
commit: 1b76343af3ea4da0cf9dba731990a57c38a8cb85
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 31 11:04:37 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 31 12:46:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b76343a

sys-devel/distcc: gcc-10 fix from upstream

Closes: https://bugs.gentoo.org/707502
Signed-off-by: Joonas Niilola  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16029

 sys-devel/distcc/distcc-3.3.3-r1.ebuild|  2 ++
 .../distcc/files/distcc-3.3.3-gcc-10-fix.patch | 28 ++
 2 files changed, 30 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index e3911a71f50..700f331aa62 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -48,6 +48,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
# backport py3.8 fixes
eapply "${FILESDIR}/${P}-py38.patch"
+   # gcc-10 fix, #707502
+   eapply "${FILESDIR}/${P}-gcc-10-fix.patch"
eapply_user
 
# Bugs #120001, #167844 and probably more. See patch for description.

diff --git a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch 
b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch
new file mode 100644
index 000..2c0bce6c82b
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch
@@ -0,0 +1,28 @@
+From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001
+From: Romain Geissler 
+Date: Mon, 27 Jan 2020 09:28:43 +
+Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf
+ https://gcc.gnu.org/gcc-10/porting_to.html)
+
+This fixes the following link error I see when I use the latest gcc 10
+git branch:
+/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld:
 src/serve.o:(.bss+0x0): multiple definition of `stats_text'; 
src/prefork.o:(.bss+0x0): first defined here
+/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld:
 src/stats.o:(.data+0x20): multiple definition of `stats_text'; 
src/prefork.o:(.bss+0x0): first defined here
+collect2: error: ld returned 1 exit status
+---
+ src/stats.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/stats.h b/src/stats.h
+index 9bde285..74d4690 100644
+--- a/src/stats.h
 b/src/stats.h
+@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, 
STATS_REJ_OVERLOAD,
+ STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
+ STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
+ 
+-const char *stats_text[20];
++extern const char *stats_text[20];
+ 
+ int  dcc_stats_init(void);
+ void dcc_stats_init_kid(void);



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2020-05-31 Thread Michał Górny
commit: e03caca6042abe04a3053ba9f5319ccbadfe5365
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 31 09:31:30 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 31 09:44:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03caca6

sys-devel/distcc: Fix tests

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

 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index fd9f3fafc19..d7992e1b301 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -17,8 +17,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
-RESTRICT="test"
-
 CDEPEND="${PYTHON_DEPS}
dev-libs/popt
gnome? (
@@ -70,6 +68,9 @@ src_prepare() {
-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
@@ -89,6 +90,13 @@ src_configure() {
econf "${myconf[@]}"
 }
 
+src_test() {
+   # sandbox breaks some tests, and hangs some too
+   # retest once #590084 is fixed
+   local -x SANDBOX_ON=0
+   emake -j1 check
+}
+
 src_install() {
# override GZIP_BIN to stop it from compressing manpages
emake DESTDIR="${D}" GZIP_BIN=false install



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/

2020-05-31 Thread Michał Górny
commit: d8b0e7c0e5c4d7c2a26f70492c959d2b910eb3b7
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 31 09:33:12 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 31 09:44:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b0e7c0

sys-devel/distcc: Port to py38&39

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

 sys-devel/distcc/distcc-3.3.3-r1.ebuild|  4 +-
 sys-devel/distcc/files/distcc-3.3.3-py38.patch | 53 ++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index d7992e1b301..3ab5ecab6d3 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit autotools flag-o-matic python-single-r1 systemd \
toolchain-funcs user xdg-utils prefix
@@ -53,6 +53,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
# SOCKSv5 support needed for Portage, bug #537616
eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+   # backport py3.8 fixes
+   eapply "${FILESDIR}/${P}-py38.patch"
eapply_user
 
# Bugs #120001, #167844 and probably more. See patch for description.

diff --git a/sys-devel/distcc/files/distcc-3.3.3-py38.patch 
b/sys-devel/distcc/files/distcc-3.3.3-py38.patch
new file mode 100644
index 000..1ba5fee7d87
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.3.3-py38.patch
@@ -0,0 +1,53 @@
+From c52a023b8a17e4346c66a8fddee69b40b327eae7 Mon Sep 17 00:00:00 2001
+From: MartB 
+Date: Thu, 28 Nov 2019 21:00:59 +0100
+Subject: [PATCH] Replace time.clock() with time.perf_counter()
+
+.clock() got removed in python 3.8 and was marked as deprecated since 3.3
+(https://github.com/python/cpython/pull/13270)
+---
+ include_server/parse_file.py | 4 ++--
+ include_server/statistics.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include_server/parse_file.py b/include_server/parse_file.py
+index d1dcc74..f5d78b7 100755
+--- a/include_server/parse_file.py
 b/include_server/parse_file.py
+@@ -272,7 +272,7 @@ def Parse(self, filepath, symbol_table):
+ 
+ assert isinstance(filepath, str)
+ self.filepath = filepath
+-parse_file_start_time = time.clock()
++parse_file_start_time = time.perf_counter()
+ statistics.parse_file_counter += 1
+ 
+ includepath_map_index = self.includepath_map.Index
+@@ -338,6 +338,6 @@ def Parse(self, filepath, symbol_table):
+   expr_includes, next_includes)
+ 
+ 
+-statistics.parse_file_total_time += time.clock() - parse_file_start_time
++statistics.parse_file_total_time += time.perf_counter() - 
parse_file_start_time
+ 
+ return (quote_includes, angle_includes, expr_includes, next_includes)
+diff --git a/include_server/statistics.py b/include_server/statistics.py
+index 9677af3..7bc9cb8 100755
+--- a/include_server/statistics.py
 b/include_server/statistics.py
+@@ -62,13 +62,13 @@ def StartTiming():
+   global start_time, translation_unit_counter
+   """Mark the start of a request to find an include closure."""
+   translation_unit_counter += 1
+-  start_time = time.clock()
++  start_time = time.perf_counter()
+ 
+ 
+ def EndTiming():
+   """Mark the end of an include closure calculation."""
+   global translation_unit_time, min_time, max_time, total_time
+-  translation_unit_time = time.clock() - start_time
++  translation_unit_time = time.perf_counter() - start_time
+   min_time = min(translation_unit_time, min_time)
+   max_time = max(translation_unit_time, max_time)
+   total_time += translation_unit_time



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2020-05-31 Thread Michał Górny
commit: 6ab98c966613ad11358f8f97384ec44b9d084ef7
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 31 09:42:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 31 09:44:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab98c96

sys-devel/distcc: Remove USE=gnome w/ deprecated deps

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

 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 20 
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 3ab5ecab6d3..62198b2b38a 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -15,16 +15,10 @@ 
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 s390 sparc 
x86"
-IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
+IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 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] )
@@ -84,7 +78,7 @@ src_configure() {
--libdir=/usr/lib
$(use_enable ipv6 rfc2553)
$(use_with gtk)
-   $(use_with gnome)
+   --without-gnome
$(use_with gssapi auth)
$(use_with zeroconf avahi)
)
@@ -137,7 +131,7 @@ src_install() {
 
dobin "${T}/distcc-config"
 
-   if use gnome || use gtk; then
+   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
@@ -170,8 +164,6 @@ pkg_postinst() {
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";
@@ -182,7 +174,7 @@ pkg_postinst() {
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
+   if use gtk; then
elog "Or:"
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" 
distccmon-gnome"
fi
@@ -200,7 +192,3 @@ pkg_prerm() {
eselect compiler-shadow remove distcc
fi
 }
-
-pkg_postrm() {
-   use gnome && xdg_desktop_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2020-05-31 Thread Michał Górny
commit: f479473a9f0f51a4e572adfa4403405c8462b199
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 31 09:40:53 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 31 09:44:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f479473a

sys-devel/distcc: Remove longdesc

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

 sys-devel/distcc/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 0b9bbc941d2..8c6bdf64be9 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -9,10 +9,6 @@
clus...@gentoo.org
Gentoo Cluster Project

-   
-   Distcc is a program to distribute compilation of C code across 
several
-   machines on a network.
-   

Enable support for 
net-libs/libgssglue




[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2020-05-31 Thread Michał Górny
commit: afc111f83c6d1b621c94f7d289dfd7ad154dcfaf
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 31 09:43:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 31 09:44:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc111f8

sys-devel/distcc: Remove obsolete pump blocker

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

 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 62198b2b38a..e3911a71f50 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -28,7 +28,6 @@ DEPEND="${CDEPEND}
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 )



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2020-03-18 Thread Rick Farina
commit: ec8c2601c4a39300baedced2d2ef912b93eab523
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Mar 18 19:43:09 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Mar 18 19:43:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8c2601

sys-devel/distcc: python3_7

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Rick Farina  gentoo.org>

 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 826019c7342..64a80a215ec 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools flag-o-matic python-single-r1 systemd \
toolchain-funcs user xdg-utils prefix



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/

2020-02-10 Thread Lars Wendler
commit: 866ab4db4fbdb6a2768152e82137edc6e4a9c9bc
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb 10 16:05:26 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb 10 16:06:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866ab4db

sys-devel/distcc: Revbump adding TMPDIR handling to init script

With kind permission from mgorny
Committed straight to stable as we don't change upstream default
without action from the user

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/distcc/{distcc-3.3.3.ebuild => distcc-3.3.3-r1.ebuild} | 0
 sys-devel/distcc/files/distccd.confd | 5 +
 sys-devel/distcc/files/distccd.initd | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
similarity index 100%
rename from sys-devel/distcc/distcc-3.3.3.ebuild
rename to sys-devel/distcc/distcc-3.3.3-r1.ebuild

diff --git a/sys-devel/distcc/files/distccd.confd 
b/sys-devel/distcc/files/distccd.confd
index bc08d40777d..736527a4a89 100644
--- a/sys-devel/distcc/files/distccd.confd
+++ b/sys-devel/distcc/files/distccd.confd
@@ -35,3 +35,8 @@ DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
 # set this for niceness
 # Default is 15
 DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
+
+# By default distccd stores temporary files in /tmp
+# Make sure to give distcc user write permission to
+# the given TMPDIR
+#TMPDIR="/tmp"

diff --git a/sys-devel/distcc/files/distccd.initd 
b/sys-devel/distcc/files/distccd.initd
index 7673ff2cf42..963f7b74c12 100644
--- a/sys-devel/distcc/files/distccd.initd
+++ b/sys-devel/distcc/files/distccd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -11,3 +11,5 @@ command="${DISTCCD_EXEC:-usr/bin/distccd}"
 command_args="--user distcc --daemon --no-detach ${DISTCCD_OPTS}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+
+export TMPDIR="${TMPDIR:-/tmp}"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2019-12-29 Thread Michał Górny
commit: 37f05be34993ee4da8a8f8e13d1ce1b5574f8632
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 29 20:49:59 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 29 20:51:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f05be3

sys-devel/distcc: Remove old

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

 sys-devel/distcc/Manifest  |   1 -
 sys-devel/distcc/distcc-3.3.2-r5.ebuild| 200 -
 .../distcc/files/distcc-3.3.2-noexist-crash.patch  |  22 ---
 3 files changed, 223 deletions(-)

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

diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
deleted file mode 100644
index ebf2f5ab847..000
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# 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}"
-
-S="${WORKDIR}/distcc"
-
-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"
-   # crash on missing directory
-   eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.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}/d

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-12-29 Thread Michał Górny
commit: f666a7338e7825b9b2c9fc846f7897bcb19939e8
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 29 20:51:02 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 29 20:51:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f666a733

sys-devel/distcc: Update HOMEPAGE

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

 sys-devel/distcc/distcc-3.3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index a9e33805152..f0094b71e4a 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -9,8 +9,8 @@ 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";
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-21 Thread Matt Turner
commit: e14e802091a9410ddd6c74d9e87def46154ef764
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Sep 21 07:15:33 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Sep 21 07:15:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14e8020

sys-devel/distcc-3.3.3: alpha stable, bug 693744

Signed-off-by: Matt Turner  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index 847871d71b0..a9e33805152 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-19 Thread Sergei Trofimovich
commit: 6ea464d985a8087e63f0b9755763ecc49b9704b0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 20 06:39:16 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 20 06:39:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea464d9

sys-devel/distcc: stable 3.3.3 for hppa, bug #693744

Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index 6e738c01eaa..847871d71b0 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-13 Thread Mikle Kolyada
commit: 168a91eb8a695ac84c56b0f72d85a761619b7bed
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 13 18:27:32 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 13 18:27:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168a91eb

sys-devel/distcc: arm stable wrt bug #693744

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index e2f081d29b0..6e738c01eaa 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Agostino Sarubbo
commit: 8b5d82436d99131201b35e5d5ac482b2f3e76543
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep  9 06:01:49 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep  9 06:01:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5d8243

sys-devel/distcc: sparc stable wrt bug #693744

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index af9dfac32c5..e2f081d29b0 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Agostino Sarubbo
commit: 05f74b0349bc96dcc357459244b7dde2366b4c87
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep  9 05:53:09 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep  9 05:53:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f74b03

sys-devel/distcc: amd64 stable wrt bug #693744

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index b52371a8bf1..af9dfac32c5 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Aaron Bauman
commit: c978fbf7734e34d50c2b1ca73e52aa7af78b2a49
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Sep  9 01:12:45 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Sep  9 01:12:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c978fbf7

sys-devel/distcc: arm64 stable (bug #693744)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index e6442ee0bb7..b52371a8bf1 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Thomas Deutschmann
commit: 3f1fda0209e835227d48ea5508a1dac64b5ebea2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep  8 18:48:37 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep  8 18:48:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1fda02

sys-devel/distcc: x86 stable (bug #693744)

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index cf4164a1abb..e6442ee0bb7 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Sergei Trofimovich
commit: 4f28e2971acc1191b3e3cdbf541eabac9397bc4e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  8 18:29:16 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  8 18:29:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f28e297

sys-devel/distcc: stable 3.3.3 for ppc64, bug #693744

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index b68c87cf78b..cf4164a1abb 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Sergei Trofimovich
commit: 0ad5b05af4922765cd4b82cb2c836d5df5d25af6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  8 18:24:53 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  8 18:24:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad5b05a

sys-devel/distcc: stable 3.3.3 for ppc, bug #693744

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index 19a044e65af..b68c87cf78b 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Sergei Trofimovich
commit: 01c3a8debb53167b4905714dacdb53a336e11136
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  8 18:20:33 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  8 18:21:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c3a8de

sys-devel/distcc: stable 3.3.3 for ia64, bug #693744

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index 39843363285..19a044e65af 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-09-08 Thread Agostino Sarubbo
commit: ffd70885790ffb10c2e8d7577fc71c1452d92724
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep  8 10:21:57 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep  8 10:21:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd70885

sys-devel/distcc: s390 stable wrt bug #693744

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/distcc/distcc-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.3.ebuild
index 7d4e47111f2..39843363285 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-08-14 Thread Michał Górny
commit: 6fe1578d38848b2b45b8b5cf83117ed1e463a140
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug 14 21:36:37 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug 14 23:04:45 2019 +
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  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 
b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592fd521cf73c92a72bf30b8a69caa
 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 000..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|$|

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-06-01 Thread Sergei Trofimovich
commit: 0da5e021f09c92979b9614c37dc71eb169b4b81b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jun  1 08:08:07 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun  1 08:14:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da5e021

sys-devel/distcc: stable 3.3.2-r5 for sparc, bug #679912

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
index ae95ed386c4..ebf2f5ab847 100644
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/3.2/, sys-devel/distcc/files/

2019-05-24 Thread Michał Górny
commit: ac153220ad8cf0ae7dc7554621e6ee0fbfbc7754
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May 24 21:47:13 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 24 21:52:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac153220

sys-devel/distcc: Drop old

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

 sys-devel/distcc/Manifest  |   1 -
 sys-devel/distcc/distcc-3.2_rc1-r4.ebuild  | 199 -
 sys-devel/distcc/files/3.2/conf|  40 
 sys-devel/distcc/files/3.2/distcc-config   | 180 ---
 sys-devel/distcc/files/3.2/init|  31 ---
 .../distcc/files/distcc-3.0-fix-fortify.patch  |  11 -
 .../distcc/files/distcc-3.2_rc1-freedesktop.patch  |  79 ---
 sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch |  36 ---
 sys-devel/distcc/files/distcc-3.2_rc1-python.patch | 246 -
 sys-devel/distcc/files/distccd.service |  10 -
 sys-devel/distcc/metadata.xml  |   1 -
 11 files changed, 834 deletions(-)

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 8473395bb70..2098365b9c6 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,2 +1 @@
-DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B 
e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476
 SHA512 
98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B 
e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138
 SHA512 
fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10

diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild 
b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
deleted file mode 100644
index 0267f059b07..000
--- a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 
systemd toolchain-funcs user
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a 
network"
-HOMEPAGE="http://distcc.org/";
-SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc 
x86 ~x86-fbsd"
-IUSE="crossdev 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}
-   virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-   !net-misc/pump
-   >=sys-devel/gcc-config-1.4.1
-   selinux? ( sec-policy/selinux-distcc )
-   xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
-
-pkg_setup() {
-   enewuser distcc 240 -1 -1 daemon
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/${PN}-3.0-xinetd.patch"
-   # bug #253786
-   epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
-   # bug #255188
-   epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
-   # bug #258364
-   epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch"
-   # for net-libs/libgssglue
-   epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
-   # SOCKSv5 support needed for Portage, bug #537616
-   epatch "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-   epatch_user
-
-   # Bugs #120001, #167844 and probably more. See patch for description.
-   use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-
-   sed -i \
-   -e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
-   -e "s:@PYTHON@:${EPYTHON}:" \
-   pump.in || die "sed failed"
-
-   sed \
-   -e "s:@EPREFIX@:${EPREFIX:-/}:" \
-   -e "s:@libdir@:/usr/$(get_libdir):" \
-   "${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
-
-   eaclocal -Im4 --output=aclocal.m4
-   eautoconf
-}
-
-src_configure() {
-   local myconf="--disable-Werror --with-docdir=\$(datadir)/doc/${PF}"
-   # More legacy stuff?
-   [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
-   # --disable-rfc2553 b0rked, bug #254176
-   use ipv6

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-04-12 Thread Aaron Bauman
commit: f6784a0c6ceb0d6a4ad1f564463d573185d68efc
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Apr 13 00:36:55 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Apr 13 00:36:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6784a0c

sys-devel/distcc: arm64 stable (bug #679912)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-devel/distcc/distcc-3.3.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
index bc5264bc18f..ae95ed386c4 100644
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-04-10 Thread Michał Górny
commit: 007070b11faa5be4480c4ea433e1bc3879811ec5
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Apr 10 14:36:01 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Apr 10 15:07:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007070b1

sys-devel/distcc: Drop old

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

 sys-devel/distcc/Manifest |   1 -
 sys-devel/distcc/distcc-3.2_rc1-r5.ebuild | 196 -
 sys-devel/distcc/distcc-3.3.2-r4.ebuild   | 200 --
 sys-devel/distcc/distcc-3.3.ebuild| 196 -
 4 files changed, 593 deletions(-)

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 5a734a064a0..8473395bb70 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,3 +1,2 @@
 DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B 
e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476
 SHA512 
98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B 
e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138
 SHA512 
fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
-DIST distcc-3.3.tar.gz 1171281 BLAKE2B 
f637cacbfdaaca6efb56e912de55fcfa49e3fffcb8f34649e339f16376250e18a20d30281a46f207992c0b300c726427a3ad5a77bd8976d2993f8f49b9b6b970
 SHA512 
459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc

diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild 
b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
deleted file mode 100644
index b4598fc9c5b..000
--- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 systemd toolchain-funcs user 
xdg-utils
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a 
network"
-HOMEPAGE="http://distcc.org/";
-SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2";
-
-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}
-   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}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   enewuser distcc 240 -1 -1 daemon
-   python-single-r1_pkg_setup
-
-   DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-   DISTCC_VERBOSE="0"
-}
-
-src_prepare() {
-   eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
-   # bug #253786
-   eapply "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
-   # bug #255188
-   eapply "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
-   # bug #258364
-   eapply "${FILESDIR}/${PN}-3.2_rc1-python.patch"
-   # for net-libs/libgssglue
-   eapply "${FILESDIR}/${PN}-3.2_rc1-gssapi.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}${DCCC_PATH}:" \
-   -e "s:@PYTHON@:${EPYTHON}:" \
-   pump.in || die "sed failed"
-
-   sed \
-   -e "s:@EPREFIX@:${EPREFIX:-/}:" \
-   -e "s:@libdir@:/usr/$(get_libdir):" \
-   "${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
-
-   eaclocal -Im4 --output=aclocal.m4
-   eautoconf
-}
-
-src_configure() {
-   local myconf="--disable-Werror --with-docdir=\$(datadir)/doc/${PF}"
-
-   # --disable-rfc2553 b0rked, bug #254176
-   use ipv6 && myconf="${myconf} --enable-rfc2553"
-
-   econf \
-   $(use_with gtk) \
-   $(use_with gnome) \
-   $(use_with gssapi auth) \
-   $(use_with zer

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-04-07 Thread Mikle Kolyada
commit: 2333ad943349c36ff4084f16a287e27bf17379e4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Apr  8 06:53:56 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Apr  8 06:53:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2333ad94

sys-devel/distcc: alpha stable wrt bug #679912

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 sys-devel/distcc/distcc-3.3.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
index 00c0908f20b..bc5264bc18f 100644
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2019-03-16 Thread Matt Turner
commit: 7d193cf6247ffe8967ea79c8e68f6728605b3d40
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Mar 17 06:23:54 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Mar 17 06:26:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d193cf6

sys-devel/distcc: Drop --verbose from systemd service file

Causes enormous volumes of logspam. Acked by mgorny.

Signed-off-by: Matt Turner  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r5.ebuild  | 200 +++
 sys-devel/distcc/files/distccd.service-1 |  10 ++
 2 files changed, 210 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
new file mode 100644
index 000..24098b549c2
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -0,0 +1,200 @@
+# 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}"
+
+S="${WORKDIR}/distcc"
+
+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"
+   # crash on missing directory
+   eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.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_DISCRE

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-16 Thread Sergei Trofimovich
commit: ed59806936bc109deb7d780ff8dc0b9d76470d35
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 16 22:38:57 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 16 22:55:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed598069

sys-devel/distcc: stable 3.3.2-r4 for ppc64, bug #679912

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 2ae8bb5ff1d..9c94466284f 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-16 Thread Sergei Trofimovich
commit: 5342b596c228d69fdba351ed1778027bef54722a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 16 20:25:29 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 16 21:56:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5342b596

sys-devel/distcc: stable 3.3.2-r4 for ppc, bug #679912

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 98a2a3febb2..2ae8bb5ff1d 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-16 Thread Mikle Kolyada
commit: fafeb143bf1f82ba46f9990f432630b16e7bdb94
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar 16 14:02:34 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar 16 14:02:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fafeb143

sys-devel/distcc: arm stable wrt bug #679912

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 20876c8f76c..98a2a3febb2 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-15 Thread Mikle Kolyada
commit: 91575b4fbbc5f8e84e66f28398b93ea7bf74a122
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Mar 15 23:13:19 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Mar 15 23:13:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91575b4f

sys-devel/distcc: s390 stable wrt bug #679912

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 97f713b3a86..20876c8f76c 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-12 Thread Mikle Kolyada
commit: e55a0f11b581f4ba8b0642880e33c0d2dca363b8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Mar 12 17:06:29 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Mar 12 17:06:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55a0f11

sys-devel/distcc: amd64 stable wrt bug #679912

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 3459a593164..97f713b3a86 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-11 Thread Sergei Trofimovich
commit: b8b76fecb71f6c1e3e1eb48e407f92558fc6dd9b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 11 22:41:52 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 11 22:41:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b76fec

sys-devel/distcc: stable 3.3.2-r4 for hppa, bug #679912

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 972b6f8915c..3459a593164 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-03-10 Thread Sergei Trofimovich
commit: 1a45e6213c25c157026638318854a26d141c2eed
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 10 22:16:39 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 10 22:17:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a45e621

sys-devel/distcc: stable 3.3.2-r4 for ia64, bug #679912

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index b0c5ae3d8da..972b6f8915c 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-02-16 Thread Mikle Kolyada
commit: 4ba39a6eeba4329fa48dcb4bec3f324a179bbc0e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Feb 16 13:30:28 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Feb 16 13:31:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba39a6e

sys-devel/distcc: Add ~sh keyword wrt bug #643082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="~sh"

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 65403ced3ec..0ec472c9174 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-02-16 Thread Mikle Kolyada
commit: d1b346f948f2f77cfe914e66986b791cb8b9ce92
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Feb 16 13:29:59 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Feb 16 13:31:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b346f9

sys-devel/distcc: Add ~s390 keyword wrt bug #643082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="~s390"

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index c7c8995c8d6..65403ced3ec 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 
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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-02-16 Thread Mikle Kolyada
commit: c0f3c02860740a7b4a506cfc0c89f7c9a5223921
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Feb 16 13:30:53 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Feb 16 13:31:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f3c028

sys-devel/distcc: Add ~m68k keyword wrt bug #643082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="~m68k"

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 0ec472c9174..b0c5ae3d8da 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ 
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 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-02-12 Thread Mikle Kolyada
commit: 4ba1e776e4fd66c24248b66e67652d941fdabb7e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 12 12:20:16 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 12 12:28:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba1e776

sys-devel/distcc: Add ~sh keyword wrt bug #643082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-devel/distcc/distcc-3.2_rc1-r5.ebuild | 2 +-
 sys-devel/distcc/distcc-3.3.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild 
b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
index e5c08ae16dc..4cf615ddb12 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"

diff --git a/sys-devel/distcc/distcc-3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.ebuild
index 736374657e3..53a55d652f4 100644
--- a/sys-devel/distcc/distcc-3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.ebuild
@@ -14,7 +14,7 @@ 
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 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-02-12 Thread Mikle Kolyada
commit: 644ff8654b917a6974dc5a4b14f4865d41caf961
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 12 12:17:06 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 12 12:28:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644ff865

sys-devel/distcc: Add ~s390 keyword wrt bug #643082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-devel/distcc/distcc-3.2_rc1-r5.ebuild | 4 ++--
 sys-devel/distcc/distcc-3.3.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild 
b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
index 58a62383bae..e5c08ae16dc 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"

diff --git a/sys-devel/distcc/distcc-3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.ebuild
index 4ee28df450f..736374657e3 100644
--- a/sys-devel/distcc/distcc-3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 
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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2019-02-12 Thread Mikle Kolyada
commit: d733f3ccb70a3c4b6311c371223d726d36d7a1b8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 12 12:23:00 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 12 12:28:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d733f3cc

sys-devel/distcc: Add ~m68k keyword wrt bug #643082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-devel/distcc/distcc-3.2_rc1-r5.ebuild | 2 +-
 sys-devel/distcc/distcc-3.3.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild 
b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
index 4cf615ddb12..b4598fc9c5b 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+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"

diff --git a/sys-devel/distcc/distcc-3.3.ebuild 
b/sys-devel/distcc/distcc-3.3.ebuild
index 53a55d652f4..995a109a07b 100644
--- a/sys-devel/distcc/distcc-3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.ebuild
@@ -14,7 +14,7 @@ 
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 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+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"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2018-12-16 Thread Michał Górny
commit: 470daf82f90609f3ea3c695cf93d092e85214068
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 16 09:59:32 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 16 10:00:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470daf82

sys-devel/distcc: Add missing dep on sys-devel/autoconf-archive

Closes: https://bugs.gentoo.org/672954
Signed-off-by: Michał Górny  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 01cca1f446a..c7c8995c8d6 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -32,6 +32,7 @@ CDEPEND="${PYTHON_DEPS}
zeroconf? ( >=net-dns/avahi-0.6[dbus] )
 "
 DEPEND="${CDEPEND}
+   sys-devel/autoconf-archive
sys-libs/binutils-libs
virtual/pkgconfig"
 RDEPEND="${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2018-12-09 Thread Michał Górny
commit: 1ae7ddd19bc5c2713e5b6a100c69663d58ca72fa
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec  9 19:06:09 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec  9 19:16:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae7ddd1

sys-devel/distcc: Backport fix for crash on non-existing dir

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

 ...stcc-3.3.2-r3.ebuild => distcc-3.3.2-r4.ebuild} |  2 ++
 .../distcc/files/distcc-3.3.2-noexist-crash.patch  | 22 ++
 2 files changed, 24 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.2-r3.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
similarity index 98%
rename from sys-devel/distcc/distcc-3.3.2-r3.ebuild
rename to sys-devel/distcc/distcc-3.3.2-r4.ebuild
index 1266d913df9..01cca1f446a 100644
--- a/sys-devel/distcc/distcc-3.3.2-r3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
# SOCKSv5 support needed for Portage, bug #537616
eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+   # crash on missing directory
+   eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.patch
eapply_user
 
# Bugs #120001, #167844 and probably more. See patch for description.

diff --git a/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch 
b/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch
new file mode 100644
index 000..7f378082d99
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch
@@ -0,0 +1,22 @@
+From 24f73c5cd8f839bd520eb52e91d0d26e07689373 Mon Sep 17 00:00:00 2001
+From: Shawn Landden 
+Date: Wed, 29 Aug 2018 04:52:38 -0700
+Subject: [PATCH] fix #304
+
+---
+ src/daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index 5765982..c8fee7c 100644
+--- a/src/daemon.c
 b/src/daemon.c
+@@ -166,7 +166,7 @@ static void dcc_warn_masquerade_whitelist(void) {
+ rs_log_crit(LIBDIR "/distcc not found. %s", warn);
+ dcc_exit(EXIT_COMPILER_MISSING);
+ }
+-if (!readdir(e) && !readdir(d)) {
++if ((!e || !readdir(e)) && (!d || !readdir(d))) {
+ rs_log_crit(LIBDIR "/distcc empty. %s", warn);
+ dcc_exit(EXIT_COMPILER_MISSING);
+ }



[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2018-12-09 Thread Georgy Yakovlev
commit: 9a6b6ae2b6542b104fc5618f46c6d3636ac089ce
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Dec  9 08:28:51 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Dec  9 08:29:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6b6ae2

sys-devel/distcc: revbump, fix whitelist libdir

pass --libdir=/usr/lib to configure unconditionally

distcc was looking for whitelist symlinks in lib64
(dcc_check_compiler_whitelist) CRITICAL! no /usr/lib64/distcc

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r3.ebuild | 197 
 1 file changed, 197 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.2-r3.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r3.ebuild
new file mode 100644
index 000..1266d913df9
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.2-r3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2018 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 ~mips ~ppc ~ppc64 ~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-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}"
+
+S="${WORKDIR}/distcc"
+
+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_dounit "${FILESDIR}/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}"
+   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/

2018-12-09 Thread Georgy Yakovlev
commit: 86c70ade701f5e8cb6c6d87f20c1e5f01af90ee7
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Dec  9 08:31:47 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Dec  9 08:32:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c70ade

sys-devel/distcc: drop broken versions

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r2.ebuild | 196 
 sys-devel/distcc/distcc-3.3.2.ebuild| 196 
 2 files changed, 392 deletions(-)

diff --git a/sys-devel/distcc/distcc-3.3.2-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r2.ebuild
deleted file mode 100644
index 22f3c738ebd..000
--- a/sys-devel/distcc/distcc-3.3.2-r2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 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 ~mips ~ppc ~ppc64 ~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-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}"
-
-S="${WORKDIR}/distcc"
-
-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
-   $(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_dounit "${FILESDIR}/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 "

[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/, sys-devel/distcc/files/

2018-12-09 Thread Georgy Yakovlev
commit: 20ea2072e04e1804fbe0b2c351b22167149ed272
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Dec  9 08:00:26 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Dec  9 08:04:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ea2072

sys-devel/distcc: revbump, fix distcc-config py2<-> py3 errors

error:
Creating symlinks...
Creating /usr/lib/distcc/bin/gcc symlink...
Creating /usr/lib/distcc/bin/cc symlink...
Creating /usr/lib/distcc/bin/c++ symlink...
Creating /usr/lib/distcc/bin/g++ symlink...
Traceback (most recent call last):
  File "/usr/bin/distcc-config", line 154, in 
installlinks()
  File "/usr/bin/distcc-config", line 93, in installlinks
lines = p.stdout.read().rstrip().split('\n')
TypeError: a bytes-like object is required, not 'str'

throw in extra .decode() to stdout.read()

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-devel/distcc/distcc-3.3.2-r2.ebuild | 196 
 sys-devel/distcc/files/distcc-config| 180 +
 2 files changed, 376 insertions(+)

diff --git a/sys-devel/distcc/distcc-3.3.2-r2.ebuild 
b/sys-devel/distcc/distcc-3.3.2-r2.ebuild
new file mode 100644
index 000..22f3c738ebd
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.2-r2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 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 ~mips ~ppc ~ppc64 ~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-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}"
+
+S="${WORKDIR}/distcc"
+
+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
+   $(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_dounit "${FILESDIR}/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.
+ 

  1   2   >