sys-devel/distcc: Add USE blocker between gtk and gnome, #416595; bump EAPI; move to new python eclasses

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 190 insertions, 7 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 036047b7a6f1..a8c3952e9fc2 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.217 2013/02/03 12:42:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.218 2013/02/03 18:59:23 jlec Exp $
+
+*distcc-3.1-r7 (03 Feb 2013)
+
+  03 Feb 2013; Justin Lecher <jlec@gentoo.org> +distcc-3.1-r7.ebuild,
+  metadata.xml:
+  Add USE blocker between gtk and gnome, #416595; bump EAPI; move to new python
+  eclasses
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #22900
diff --git a/sys-devel/distcc/distcc-3.1-r7.ebuild b/sys-devel/distcc/distcc-3.1-r7.ebuild
new file mode 100644
index 000000000000..cf7243635f75
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.1-r7.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r7.ebuild,v 1.1 2013/02/03 18:59:23 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils fdo-mime flag-o-matic multilib python-single-r1 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="avahi gnome gtk hardened ipv6 selinux xinetd"
+
+REQUIRED_USE="^^ ( gtk gnome )"
+
+RESTRICT="test"
+
+RDEPEND="
+	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
+	)
+	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 )"
+
+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) \
+		$(use_with gnome) \
+		${myconf}
+}
+
+src_install() {
+	# In rare cases, parallel make install failed
+	MAKEOPTS+=" -j1"
+	default
+
+	dobin "${FILESDIR}/3.0/distcc-config"
+
+	newinitd "${FILESDIR}/${PV}/init" distccd
+
+	cp "${FILESDIR}/3.0/conf" "${T}/distccd"
+	if use avahi; then
+		cat >> "${T}/distccd" <<-EOF
+
+		# Enable zeroconf support in distccd
+		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+		EOF
+	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 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 "${D}/usr/bin/distccmon-gnome" "${D}/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 gnome && fdo-mime_desktop_database_update
+
+	if use ipv6; then
+		elog
+		elog "IPv6 has 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 gnome || 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 gnome && fdo-mime_desktop_database_update
+}
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index cb0f4bf135f8..3dcc309a3965 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<longdescription lang="en">
+  <herd>cluster</herd>
+  <longdescription lang="en">
 		Distcc is a program to distribute compilation of C code across several
 		machines on a network.
 	</longdescription>
-	<use>
-		<flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag>
-		<flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag>
-	</use>
+  <use>
+    <flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag>
+    <flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag>
+  </use>
 </pkgmetadata>