axs 14/10/29 18:52:29
Modified: ChangeLog
Added: distcc-3.1-r10.ebuild distcc-3.2_rc1-r1.ebuild
Removed: distcc-3.1-r5.ebuild distcc-3.1-r7.ebuild
distcc-3.2_rc1.ebuild distcc-3.1-r9.ebuild
distcc-3.1-r6.ebuild
Log:
Added missing python dependencies, cleaned up old v3.1 ebuilds as per
discussion with untrabug on irc
(Portage version: 2.2.8-r2/cvs/Linux x86_64, RepoMan options: --force, signed
Manifest commit with key 2B6559ED)
Revision Changes Path
1.237 sys-devel/distcc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.237&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.237&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?r1=1.236&r2=1.237
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog 21 May 2014 06:38:17 -0000 1.236
+++ ChangeLog 29 Oct 2014 18:52:28 -0000 1.237
@@ -1,6 +1,15 @@
# ChangeLog for sys-devel/distcc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.236
2014/05/21 06:38:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.237
2014/10/29 18:52:28 axs Exp $
+
+*distcc-3.2_rc1-r1 (29 Oct 2014)
+*distcc-3.1-r10 (29 Oct 2014)
+
+ 29 Oct 2014; Ian Stakenvicius (_AxS_) <a...@gentoo.org>
+distcc-3.1-r10.ebuild,
+ +distcc-3.2_rc1-r1.ebuild, -distcc-3.1-r5.ebuild, -distcc-3.1-r6.ebuild,
+ -distcc-3.1-r7.ebuild, -distcc-3.1-r9.ebuild, -distcc-3.2_rc1.ebuild:
+ Added missing python dependencies, cleaned up old v3.1 ebuilds as per
+ discussion with untrabug on irc
21 May 2014; Justin Lecher <j...@gentoo.org> distcc-3.1-r9.ebuild,
distcc-3.2_rc1.ebuild:
1.1 sys-devel/distcc/distcc-3.1-r10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild?rev=1.1&content-type=text/plain
Index: distcc-3.1-r10.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild,v 1.1
2014/10/29 18:52:28 axs Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd
toolchain-funcs user
DESCRIPTION="Distribute compilation of C code across several machines on a
network"
HOMEPAGE="http://distcc.org/";
SRC_URI="http://distcc.googlecode.com/files/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~sparc-fbsd ~x86-fbsd"
IUSE="avahi gtk hardened ipv6 selinux xinetd"
RESTRICT="test"
RDEPEND="${PYTHON_DEPS}
dev-libs/popt
avahi? ( >=net-dns/avahi-0.6[dbus] )
gtk? ( x11-libs/gtk+:2 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
RDEPEND="${RDEPEND}
!net-misc/pump
>=sys-devel/gcc-config-1.4.1
selinux? ( sec-policy/selinux-distcc )
xinetd? ( sys-apps/xinetd )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DISTCC_LOG=""
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}/${P}-freedesktop.patch"
# bug #258364
epatch "${FILESDIR}/${P}-python.patch"
# bug #351979
epatch "${FILESDIR}/${P}-argc-fix.patch"
sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die
# Bugs #120001, #167844 and probably more. See patch for description.
use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
}
src_configure() {
local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}"
# More legacy stuff?
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
# --disable-rfc2553 b0rked, bug #254176
use ipv6 && myconf="${myconf} --enable-rfc2553"
econf \
$(use_with avahi) \
$(use_with gtk) \
${myconf}
}
src_install() {
# In rare cases, parallel make install failed
MAKEOPTS+=" -j1"
default
dobin "${FILESDIR}/3.0/distcc-config"
newinitd "${FILESDIR}/${PV}/init" distccd
systemd_dounit "${FILESDIR}/distccd.service"
systemd_install_serviced "${FILESDIR}/distccd.service.conf"
cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die
if use avahi; then
cat >> "${T}/distccd" <<-EOF
# Enable zeroconf support in distccd
DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
EOF
sed -i '/ExecStart/ s|$| --zeroconf|'
"${ED}"/usr/lib/systemd/system/distccd.service || die
fi
doconfd "${T}/distccd"
cat > "${T}/02distcc" <<-EOF
# This file is managed by distcc-config; use it to change these
settings.
DISTCC_LOG="${DISTCC_LOG}"
DCCC_PATH="${DCCC_PATH}"
DISTCC_VERBOSE="${DISTCC_VERBOSE}"
EOF
doenvd "${T}/02distcc"
# create the masquerade directory
dodir "${DCCC_PATH}"
for f in cc c++ gcc g++; do
dosym /usr/bin/distcc "${DCCC_PATH}/${f}"
if [ "${f}" != "cc" ]; then
dosym /usr/bin/distcc
"${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}"
fi
done
# create the distccd pid directory
keepdir /var/run/distccd
fowners distcc:daemon /var/run/distccd
if use gtk; then
einfo "Renaming /usr/bin/distccmon-gnome to
/usr/bin/distccmon-gui"
einfo "This is to have a little sensability in naming schemes
between distccmon programs"
mv "${ED}/usr/bin/distccmon-gnome"
"${ED}/usr/bin/distccmon-gui" || die
dosym distccmon-gui /usr/bin/distccmon-gnome
fi
if use xinetd; then
insinto /etc/xinetd.d
newins "doc/example/xinetd" distcc
fi
rm -rf "${D}/etc/default" || die
rm -f "${D}/etc/distcc/clients.allow" || die
rm -f "${D}/etc/distcc/commands.allow.sh" || die
python_fix_shebang "${ED}"
python_optimize "${ED}"/$(python_get_sitedir)
}
pkg_postinst() {
use gtk && fdo-mime_desktop_database_update
if use ipv6; then
elog
elog "IPv6 is not supported yet by ${P}."
fi
elog
elog "Tips on using distcc with Gentoo can be found at"
elog "http://www.gentoo.org/doc/en/distcc.xml";
elog
elog "How to use pump mode with Gentoo:"
elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo
baz,cpp,lzo\""
elog "# pump emerge -u world"
elog
elog "To use the distccmon programs with Gentoo you should use this
command:"
elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5"
if use gtk; then
elog "Or:"
elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome"
fi
elog
elog "***SECURITY NOTICE***"
elog "If you are upgrading distcc please make sure to run etc-update to"
elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files
with"
elog "added security precautions (the --listen and --allow directives)"
elog
}
pkg_postrm() {
use gtk && fdo-mime_desktop_database_update
}
1.1 sys-devel/distcc/distcc-3.2_rc1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild?rev=1.1&content-type=text/plain
Index: distcc-3.2_rc1-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild,v
1.1 2014/10/29 18:52:28 axs Exp $
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="http://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 ~sparc-fbsd ~x86-fbsd"
IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
RESTRICT="test"
RDEPEND="${PYTHON_DEPS}
dev-libs/popt
avahi? ( >=net-dns/avahi-0.6[dbus] )
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 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
RDEPEND="${RDEPEND}
!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"
# 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}/distcc-config-3.2_rc1" > "${T}/distcc-config" ||
die
eaclocal -Im4 --output=aclocal.m4
eautoconf
}
src_configure() {
local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}"
# More legacy stuff?
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
# --disable-rfc2553 b0rked, bug #254176
use ipv6 && myconf="${myconf} --enable-rfc2553"
econf \
$(use_with avahi) \
$(use_with gtk) \
$(use_with gnome) \
$(use_with gssapi auth) \
${myconf}
}
src_install() {
default
dobin "${FILESDIR}/3.0/distcc-config"
newinitd "${FILESDIR}/3.1/init" distccd
systemd_dounit "${FILESDIR}/distccd.service"
systemd_install_serviced "${FILESDIR}/distccd.service.conf"
cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die
if use avahi; then
cat >> "${T}/distccd" <<-EOF
# Enable zeroconf support in distccd
DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
EOF
sed -i '/ExecStart/ s|$| --zeroconf|'
"${ED}"/usr/lib/systemd/system/distccd.service || die
fi
doconfd "${T}/distccd" || die
cat > "${T}/02distcc" <<-EOF
# 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
doenvd "${T}/02distcc" || die
keepdir "${DCCC_PATH}" || die
dobin "${T}/distcc-config" || die
# create the distccd pid directory
keepdir /var/run/distccd || die
fowners distcc:daemon /var/run/distccd || die
if use gnome || use gtk; then
einfo "Renaming /usr/bin/distccmon-gnome to
/usr/bin/distccmon-gui"
einfo "This is to have a little sensability in naming schemes
between distccmon programs"
mv "${ED}/usr/bin/distccmon-gnome"
"${ED}/usr/bin/distccmon-gui" || die
dosym distccmon-gui /usr/bin/distccmon-gnome || die
fi
if use xinetd; then
insinto /etc/xinetd.d || die
newins "doc/example/xinetd" distcc || die
fi
rm -r "${ED}/etc/default" || die
rm "${ED}/etc/distcc/clients.allow" || die
rm "${ED}/etc/distcc/commands.allow.sh" || die
}
pkg_postinst() {
if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then
if use crossdev; then
"${EPREFIX}/usr/bin/distcc-config"
--update-masquerade-with-crossdev
else
"${EPREFIX}/usr/bin/distcc-config" --update-masquerade
fi
fi
python_mod_optimize include_server
use gnome && fdo-mime_desktop_database_update
elog
elog "Tips on using distcc with Gentoo can be found at"
elog "http://www.gentoo.org/doc/en/distcc.xml";
elog
elog "How to use pump mode with Gentoo:"
elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo
baz,cpp,lzo\""
elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >>
/etc/make.conf"
elog "# emerge -u world"
elog
elog "To use the distccmon programs with Gentoo you should use this
command:"
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\"
distccmon-text 5"
if use gnome || use gtk; then
elog "Or:"
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\"
distccmon-gnome"
fi
elog
elog "***SECURITY NOTICE***"
elog "If you are upgrading distcc please make sure to run etc-update to"
elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files
with"
elog "added security precautions (the --listen and --allow directives)"
elog
}
pkg_postrm() {
# delete the masquerade directory
if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then
einfo "Remove masquerade symbolic links."
rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++}
rmdir "${EPREFIX}${DCCC_PATH}"
fi
python_mod_cleanup include_server
use gnome && fdo-mime_desktop_database_update
}
