Added missing python dependencies, cleaned up old v3.1 ebuilds as per discussion with untrabug on irc

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x2B6559ED

7 files changed, 26 insertions, 545 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index e431727ca39f..603352d0df83 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -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_) <axs@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 <jlec@gentoo.org> distcc-3.1-r9.ebuild,
   distcc-3.2_rc1.ebuild:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index ae389bcd2015..8733031a5cf8 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.18-r1/conf 1345 SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef SHA512 538241a2730f6b0c942a32abf47f4cb41b8ebfbc1e8c6fc3b260c290b4cae536e282277c491da2bbd2a905c3d2758ebf507eb21ee9af9fd7529666dfddae9f5d WHIRLPOOL 9d6ced9dd30b987a1650496f6c9671e6a3006b7929035bd0ef7004dbcacaad9b21f92e736f1ba4e87bd61e615a99b8d2623f40556453a80f7aa3a0c8be56ee67
 AUX 2.18-r1/init 927 SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167 SHA512 b31de8f3acfd3067d8c1514b48b77334770fca62c1fdbcc3c6ed13928d501a544e9a8e49341c1c5e687c4d4376dc88647b0449e9d53e039e69908ffc86991a6a WHIRLPOOL 97e9d2813c2e2bb1208522e5a2fcf4f90662afb89f75a6cc206278f0d53ba404f9aeae4beb2a9c71d739671bd1bf70d82d64ea1f6c62c96082d830d5faff7712
@@ -39,29 +39,14 @@ DIST distcc-3.1.tar.bz2 588820 SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90
 DIST distcc-3.2rc1.tar.bz2 609904 SHA256 311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee WHIRLPOOL d366abb05d10aa5a458acf7b57f5bf52fd4f5ff46c68494e28140eb944524e66d729ebef60190acb1d9b33a0fb8faea6b909509de67294c29dbebcf01d500a36
 EBUILD distcc-2.18.3-r10.ebuild 4890 SHA256 9eef0dc109e35aa396cf0300e53e3835559412da2d58f3dc401ec1ef812833ea SHA512 fbd2b4a36422c1178d7cac938f9cd5bcc6851b88c9d8d05bad7e53f5aeca61a0a1921a38eb104be8b211dc7d5953d44a13dcfe9d981a020d43a2f880d0fb06b3 WHIRLPOOL ca30a1d4145824bcab02defa98372137b01b7d96c8df99ff0cc5456163b69a587abe033168e38492ab40812f26716b0fc01387012e52d1fd301aed14be4e24da
 EBUILD distcc-3.0-r4.ebuild 4500 SHA256 890af2113a538fb7a4d12644e9adc8aea49c7e1f25723404bf6185a401357b2f SHA512 b0f652003f49e63c04c5a2a9463b70c6aee94b74f3e5a55f51656eb6fc0f305bfdb1e0dca4142929129f8acde233cfa5e996420cedae1b3dcffb218dbcfcda3e WHIRLPOOL 13f8abc008068cc4aa2a296a2cbf75048ec433302f2d4806685e619f9cbcadaa7934762f964619ca8ab11e6e6f9059f87bf6373cae486130a415d347932a2e6b
-EBUILD distcc-3.1-r5.ebuild 4738 SHA256 2520d7b197aef8fb9d22bc79429b9703b771bbc7023927df9d2f18ce71a6d604 SHA512 a4b1533353235c16513671e7adcb63523cbf4db621f2fee497f498305d5d213ad7cea60ee3a22375c806a0aeb3a245a5b8ce9337f21f399acd148bdbe6356e6b WHIRLPOOL 45c418b46ea0a2918cbafd6c5e15454211de0a662e91837e52e691b86394b86e670acb63b5f59cc1d1ae1791656f62ab1fc15cc62004c0d61e6938bd5c2a2aee
-EBUILD distcc-3.1-r6.ebuild 4806 SHA256 b6ae731be02bf4374ff2282a127ab7b960c17e1a62bdf0dac26ba8d857e31283 SHA512 9aa5219b86f9ad3b35ea87cbd3f6c16cd0f1bea0d6489097e10676be47f361bcf83e1d2aa3c458dc3f874b5b3eb9866650fc6cdbdc2f810e8392428adcd89aa4 WHIRLPOOL bbbe0811bf238b48945d962b16d337e04c9de51e2c39bc2becc0753a1643b8c751e6ab95139cd334fc2ca05d33a9edce237d2fbda1cfcd1ad6cb45f7208b0c83
-EBUILD distcc-3.1-r7.ebuild 4480 SHA256 f8247391c8ab77a601f35cf5013ae77e313800e133ac4bc3d1361dd2285314c8 SHA512 b3c5e5d87d39fe0596972f1e20e6a4c7c2bacef10f2dda83f46d35642d494936503e89dc3d37f188c8262cf83437c6cd7c541c4b2302725333d2a0034d56d213 WHIRLPOOL f091b9b428305b7d038607ff3f625067f4ce9bc45956c8e6829fab39ce8ba639e36963203430b909355bd7db4663d335c8b5ddbdd4bca46518a6ec9c4c41f9ea
-EBUILD distcc-3.1-r9.ebuild 4695 SHA256 19c1dd02feaf123b8ef3f249fddbbc881105b6a5d56ae8f5e8456da0698468b7 SHA512 912baefe62043927c6baaa13088f2f197990ecd77936d643760e80f60515df75182af9d5124d968b43a186a46f1df7b1fc40b3b90ddb20c1432c80ed0bcb4b7e WHIRLPOOL b8a0055c9602ccc16b82ca788c4d6a7c05795b2b9f8dcaa6ef1408bad727f467917c7592822331de077198314e110f2b4100ce48b879f20f024bda8854364ff7
-EBUILD distcc-3.2_rc1.ebuild 5883 SHA256 e37a6d017d9d514b4784b44b8f98837051cbd60c7c210bb42d71878f6aa42b28 SHA512 2688326661fd60b2ad45ebb3d2781f8c13b18dea2c1d359ba109f38fe2ca7195b93fb1aa23264c507649de265f76dbe7b84b875e1607e0e0ed497b23d4c68ddd WHIRLPOOL 7665365eed2a37f37b7b7bcb251cdd2431879e2a2c9313277d5184f2a5731bd78bcc2019d5407d62308669102f9a975f1a076501759018a599a17c0ad289dd55
-MISC ChangeLog 41881 SHA256 428744cf05d24a92af17e5d2806dea43d761e61b4023b6d44bcb189af6f62265 SHA512 eaabb471a61614cf6b230d861fa7df235d4b54cdf1b6b4fd9e332db17e084788b14776be7679a2421d8e6af2e28dc00cd645477d3099e45bb2395c5451bbe0b2 WHIRLPOOL d18286e66d8bc23a58d06fd9e4c0f6071bfc34b114af6454a8003748e5bb48cf3c38abc2332bcab2d97d28521af05355f2b774b914d227e581031b7f121040ca
+EBUILD distcc-3.1-r10.ebuild 4747 SHA256 84246657be7eb6d63e7ff4611e5a89a5771dd91f071ccf12d430a183475d5871 SHA512 6195ee98481c5c8c310cd237155f2ac27a5c51a0c27dea803af736cd04fc284907460a967f65164c4a1800d427674dd0de03d784e788ebbc0c94817e14ecb03f WHIRLPOOL 12c3cba315375c55404ebd63078994d39c8b282ed272517827e081c582a118a76e1793ca47110ab21fa2cde4ae461af2a8070f23fdb1a2beb85392f55d10a300
+EBUILD distcc-3.2_rc1-r1.ebuild 5938 SHA256 5ad3eb202e34d6855927d15b6ba63205751f01e654366172852976532ff999d9 SHA512 5b821eac87b246bf14c297ae747ea0660b0e61e8ad75a1789714ec5e4376076976a83a41f3e386ca75166c70db09064167726df9b806f50c6228fb9be17e5a9c WHIRLPOOL fdebd20ae290f7825b63fabab612ab98f7c9beb0b9e6e1d7758966dd40627bee68af9c6eaf879ee5afdcbaff6b3a98d1bbba1767ae658558c1c9f12903466b8b
+MISC ChangeLog 42279 SHA256 cd62e224956f49b75003543e5e9e195a0169b079dd483d7c227c0758325999eb SHA512 e0ab207376b308c81a050f1d44fb1f5fc639f2800ff85a053f667e459a0350341211df2c27fb07f15ae1d9dce751a09e597dfacb347d944032990cecc843762d WHIRLPOOL a9e6aa8be40868e336751fff8302ca680613c3295db2a198c745136d3d8ec2c76df6fafa0afa89f4da661491ea8e377c5fa37e0d2b69e870cf3e4b4c4966dc59
 MISC metadata.xml 490 SHA256 c507fd5ee99486759c3acb83a13d874253ce959acd93ac3084febc424a46df86 SHA512 b076932259b157a51d6006324835ab91a9cb86538fb95b8e321647e90675c210051fa3ea342ed1b26b884c166e2825aa16056f2178029cf5d7bf1042cc9425ef WHIRLPOOL 53eb51b9e8fa1acbbef117955d1ad51b36ead058b6cd0b09d902467a58de9854f0b896d7a8961ec2ef019b7d7e39ef24802a5fbb23a11618a9535c17e98bc038
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJTfEnaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHlEP/1v2OPa/ywRGyN5kS7hxY9nA
-IETpDZKv867oQ8sygW8rnCQEKcCdJcHuSVa+i0J1dUxKBRPV8/uWk8K6tmWytF9s
-TQRV7k8QDGbN5QPdGFCw4RUfIgMluRTwcrGW8/HNPiPia4ndcOQpd623o2IawzjE
-VeQzVmIK254FOStoE43i2Ncem86dS0B2cH29s5XrdnmIzslyrNvC13DXXdrvN9ng
-MIC7auCFUCDikNYf7J5zNDfRFFmpLiSppD/U/yGC96KVGstuce99VURzCd8HTPOu
-tHufUDp1ySE3R3+B7XSyxbtavE8MtMkJfnseRNMey+3hOaN9BPUCMuIpPwKk/isn
-p0lQcTBauMrj76NVWxhazZnU+CQr/ava0CPxe0wTtlhFvVLa/Cw/6+oa2i9oFMqI
-fDpg/aRWuR4gRW/deAdlmKOfzvWUpQtkzM08/1Hp5u5E2jTXYjA3YkIbpmOfG0Ol
-r5r8iIDGQm1B2xSqEGSasOsoi9593q7Y5fAccCfqDIawuIQd8rBJwNUxPxCxkIt0
-kWx/00bETwy5vRztAyTYbeHOamZVOgeYwTyjuULurcinqOeq8FUvn2jOHhGagvW4
-Pa6opbGvWROudG6OAUvjLEK/RzwBPRvl574zDfIJt6wophe7ei67RL8E60IBkc4D
-yqG7Si0U7hxbWjgTtp3K
-=WX9X
+iF4EAREIAAYFAlRRN3kACgkQ2ugaI38ACPAKTwEAnxWroLC6exGix8FyrTfh/tw3
+Dn0Gv5IG6XdIQPpxrx4A/iSEWB8eXkq8OtjX9o3ee9ZeaMPZBg0iXwTpClNVfoFS
+=lkGv
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-3.1-r9.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild
index 00c6912e2fac..3b8386d5b83f 100644
--- a/sys-devel/distcc/distcc-3.1-r9.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r10.ebuild
@@ -1,6 +1,6 @@
 # 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-r9.ebuild,v 1.10 2014/05/21 06:38:17 jlec Exp $
+# $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
 
@@ -19,7 +19,7 @@ IUSE="avahi gtk hardened ipv6 selinux xinetd"
 
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/popt
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	gtk? ( x11-libs/gtk+:2 )"
@@ -31,6 +31,8 @@ RDEPEND="${RDEPEND}
 	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"
diff --git a/sys-devel/distcc/distcc-3.1-r5.ebuild b/sys-devel/distcc/distcc-3.1-r5.ebuild
deleted file mode 100644
index 6d4e880860e7..000000000000
--- a/sys-devel/distcc/distcc-3.1-r5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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-r5.ebuild,v 1.5 2014/05/16 19:53:04 jer Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils fdo-mime flag-o-matic multilib python toolchain-funcs user
-
-DESCRIPTION="a program to 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"
-
-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_set_active_version 2
-	python_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"
-
-	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} || die "econf failed"
-}
-
-src_install() {
-	# In rare cases, parallel make install failed
-	emake -j1 DESTDIR="${D}" install || die
-
-	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"
-	rm -f "${D}/etc/distcc/clients.allow"
-	rm -f "${D}/etc/distcc/commands.allow.sh"
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-	sed -e "s:${EPREFIX}/usr/bin/python:$(PYTHON -a):" -i "${ED}usr/bin/pump" || die "sed failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize include_server
-	use gnome && 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 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() {
-	python_mod_cleanup include_server
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.1-r6.ebuild b/sys-devel/distcc/distcc-3.1-r6.ebuild
deleted file mode 100644
index 7ce96d9f57ae..000000000000
--- a/sys-devel/distcc/distcc-3.1-r6.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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-r6.ebuild,v 1.4 2014/05/16 19:53:04 jer Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils fdo-mime flag-o-matic multilib python toolchain-funcs user
-
-DESCRIPTION="a program to 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"
-
-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_set_active_version 2
-	python_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} || die "econf failed"
-}
-
-src_install() {
-	# In rare cases, parallel make install failed
-	emake -j1 DESTDIR="${D}" install || die
-
-	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"
-	rm -f "${D}/etc/distcc/clients.allow"
-	rm -f "${D}/etc/distcc/commands.allow.sh"
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-	sed -e "s:${EPREFIX}/usr/bin/python:$(PYTHON -a):" -i "${ED}usr/bin/pump" || die "sed failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize include_server
-	use gnome && 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 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() {
-	python_mod_cleanup include_server
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.1-r7.ebuild b/sys-devel/distcc/distcc-3.1-r7.ebuild
deleted file mode 100644
index 84de38258749..000000000000
--- a/sys-devel/distcc/distcc-3.1-r7.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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-r7.ebuild,v 1.7 2014/05/16 19:53:04 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="avahi gtk hardened ipv6 selinux xinetd"
-
-RESTRICT="test"
-
-RDEPEND="
-	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 )"
-
-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
-
-	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 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 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
-}
diff --git a/sys-devel/distcc/distcc-3.2_rc1.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild
index 8c115f58a474..639bf4fe9ed9 100644
--- a/sys-devel/distcc/distcc-3.2_rc1.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.8 2014/05/21 06:38:17 jlec Exp $
+# $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
 
@@ -20,7 +20,7 @@ IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
 
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/popt
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	gnome? (
@@ -39,6 +39,8 @@ RDEPEND="${RDEPEND}
 	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"