From 66cff68a570314b74073c484d11eb8717ceb3b14 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 20 Mar 2015 17:04:07 +0000
Subject: [PATCH] Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
---
 sys-devel/distcc/ChangeLog                |   6 +-
 sys-devel/distcc/Manifest                 |  43 ++---
 sys-devel/distcc/distcc-2.18.3-r10.ebuild | 151 ----------------
 sys-devel/distcc/distcc-3.0-r4.ebuild     | 167 ------------------
 sys-devel/distcc/distcc-3.1-r10.ebuild    |   4 +-
 sys-devel/distcc/distcc-3.2_rc1-r2.ebuild | 205 ----------------------
 6 files changed, 26 insertions(+), 550 deletions(-)
 delete mode 100644 sys-devel/distcc/distcc-2.18.3-r10.ebuild
 delete mode 100644 sys-devel/distcc/distcc-3.0-r4.ebuild
 delete mode 100644 sys-devel/distcc/distcc-3.2_rc1-r2.ebuild

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 635e372097a3..da076ce8b871 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.241 2015/02/27 21:14:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.242 2015/03/20 17:04:06 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -distcc-2.18.3-r10.ebuild,
+  -distcc-3.0-r4.ebuild, -distcc-3.2_rc1-r2.ebuild, distcc-3.1-r10.ebuild:
+  Drop old
 
 *distcc-3.2_rc1-r3 (27 Feb 2015)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 1f1e786e857e..5e8b05e7ba1f 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.18-r1/conf 1345 SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef SHA512 538241a2730f6b0c942a32abf47f4cb41b8ebfbc1e8c6fc3b260c290b4cae536e282277c491da2bbd2a905c3d2758ebf507eb21ee9af9fd7529666dfddae9f5d WHIRLPOOL 9d6ced9dd30b987a1650496f6c9671e6a3006b7929035bd0ef7004dbcacaad9b21f92e736f1ba4e87bd61e615a99b8d2623f40556453a80f7aa3a0c8be56ee67
 AUX 2.18-r1/init 927 SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167 SHA512 b31de8f3acfd3067d8c1514b48b77334770fca62c1fdbcc3c6ed13928d501a544e9a8e49341c1c5e687c4d4376dc88647b0449e9d53e039e69908ffc86991a6a WHIRLPOOL 97e9d2813c2e2bb1208522e5a2fcf4f90662afb89f75a6cc206278f0d53ba404f9aeae4beb2a9c71d739671bd1bf70d82d64ea1f6c62c96082d830d5faff7712
@@ -34,33 +34,28 @@ AUX distcc-hardened.patch 1084 SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d
 AUX distcc-march-native.patch 934 SHA256 bc95daad65a3c3a7429b94b432b5d2aa470cb50d6e67c65303865df1e28831e7 SHA512 5508202c6fbb690f68780d9189947f0c65bb30a54f5b488b079ce3d9b5d3ad663a4cb12655ceda58c81ae6c40782ff1c2d7042fa1908a3ad925a646c2ad0b6ad WHIRLPOOL 04ceafe485977b33006d61a95ee99f022b699b11b7402eb73fae322c2933a939cd8598593b8ed6253b0f94723a500f31b8673c083166e41036d76c06134a5097
 AUX distccd.service 244 SHA256 d9cbc0f6fbadd1628dfdd9b31f5ade85f4a29cdd2dc05382aff8d9539881a746 SHA512 0626a2da412df4a124ec8f3486b48af92895e97ad626bb848f14e60c9b016de313ca7c17a09565de95fa48233c9f7e37bf79038d1115b339a2033f0eacf0a22f WHIRLPOOL 31e258449949cd8185e5f83cfdc62017dd5576e8c80468fc5624c6f49abd133b488f3d333096fbdb213a8a7dddfb2d2414949e5fc1e68c79c569fd73298f3c93
 AUX distccd.service.conf 186 SHA256 75fd7954ab324efeeb3c7a9379bf261370f4aa715c57f3a9b39413822ce5ebc7 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6 WHIRLPOOL 7b110c3a799469d368ae510d915fbdc6999a4750fa4abd91045e5576ac5aedb5daa063741a5833388d2dfb97d5b76e235bfd49875bd571f4732e27e8cabdabc7
-DIST distcc-2.18.3.tar.bz2 341601 SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 SHA512 2cd1cbd40ae34580f1cf45502e13f683a420d0f954418307942091cb4b34e3e437439ec3f5c971639af89441dccdd0bf40efa503907e435379aac5246ab686e3 WHIRLPOOL 917ff071834ca6767bd1a8e913d704ca5b26988ed6589af107bb07f8d0dbe428cb922c1fce4a7196672a369909b95239d259674966b4f00b018bfa27bd64c2a7
-DIST distcc-3.0.tar.bz2 582700 SHA256 bb6f5674b619ef1438da67739d982e8a6b11e01f748708e0fcbe371c02f020fe SHA512 92d90d6403f4fa1b64281303760f35f66613f932b4a08e4307cc72adc5f0a00d2e0f1aca806744f4df0cfb6095f16bc5b8a896b95c3a9cb06acb1bf30f3204c4 WHIRLPOOL cfc7d4d558ec277d41e2af810113525a67cf05c663dd9a4d48e340e25b8b8e451c51302b678b74d3d316d211cd8b000698fe590c93effe1005e39216400d8543
 DIST distcc-3.1.tar.bz2 588820 SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 SHA512 0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd WHIRLPOOL 9152feab2b7def17606259293fe7af7815ec295defa0287b7e5c054f17b0cb73d07f6e721855fd06eec4fc838c44ff509db20fc89c47871f7f1349e08cd126bd
 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-r10.ebuild 4763 SHA256 e434bde1e1f5ecdf187855ee788975db5174527f80fd3b2d4065ba8764a7107b SHA512 d729c3107b0e07316c68352b0dae5cd2c505d2b7a3c186217c381091a3795ec71644d56fae76713c0b1966d99d460452d4a992380e4495666ca311bb25af6ed5 WHIRLPOOL 9e0454ad3b8c80ad6dfeb5ba2e9249e13f4215fd1d6a62f2ff2c5aca83e5dccbc18c9ffc5e0a73960bc1b55c12b6f13aa7995aef17e9b19344db74b553156709
-EBUILD distcc-3.2_rc1-r2.ebuild 5900 SHA256 26d3e34af34da7d94b8adc99b6e6eff399ad0e378a79dab91e7df21558e0d573 SHA512 ecf8c003b5eafb851b3d7c7f39ca21f8aab0efd18360088a3f3a7aaeeff7742794094867036ed23fb2420b1d54b95e59c838763da88bd1582564783dafcc0782 WHIRLPOOL 2894eddfcbf6482b6ff3cfa8734379c2e7e2420b0a7b3f814118ecd9c60352d2be90207b944ca1a013366ea751aadc459ccbc63b4e2a5842379ab2d844962897
+EBUILD distcc-3.1-r10.ebuild 4755 SHA256 364d88588f7a34bdc554944b7a8096115b95ed37ae5fdb17b3112c8242909648 SHA512 c630267f9eb1e5c4e6c5499f7b282adadbe60d34437d3e209b5982d172c473cefc79f59916438668bf182f83f80a561572bb7a22be877a0a22623c4a271ea09c WHIRLPOOL d9ccebc0885137dc41b745dc0fecc9d7c1a6f3ab581a05fc6c83ca31e3d8ece44ee643a87bc3fb73b4cc0d2c51cace36c7850cd30a0f7de7854131cb1a3679ee
 EBUILD distcc-3.2_rc1-r3.ebuild 6000 SHA256 b67c9414bb57dd843e16e2169bf58b44334f1b30e7ce64a825da0ed6ca5014a7 SHA512 bef7c082f9be19525751cd1ad7d5ceb6cbbceff43d343ca9ec80269a8d2abeeb0e429160930d5e8d77d0d5cb1df37505a91295020233d5622adf66792250a07b WHIRLPOOL 3f70ebe04214cd5d7efbabb24a2254ef8aa71481b656fdb32dbc45fea5e862fc4861c1ed309bc5a78be85f894ebbe758f09aed63bd1c3ae5056fcb6152cfa319
-MISC ChangeLog 43028 SHA256 946f306a2187dcaa7346af687e4e00f7780e26888ea7cc235872aa3a31a9ad84 SHA512 24401349d91fc9ab8d898b797d2458c8186c01ee3f6ca449a5c6a861dfa9197c1c3498f4412e7213c5c85a694a832ccc475368c5c1bbb8f7d0c2d30599c258f9 WHIRLPOOL e0141689ee596623a0360ff386d5bfd66b4286ea2c9762e48b988d5cdba88169f451a9479e98d2e2a566fb8f61c36c9d53097ca4de4aecd993a45f1856bef6e6
+MISC ChangeLog 43187 SHA256 092f07c773f2361956f0e8b4d28d338aaa03ee4143644db6922a803e93f90f75 SHA512 2845de19f4949be5630835998b1b2a95369f2d49454579f14df5070186f3416d750014cd2945353d07f88e7e06fd53a125834570f2a2e496060697da36cb7991 WHIRLPOOL db2463f7da6cbf5ed97ee04e7498b804862ac6614eb9b6e84f30280c34103bf5bd47f798d5d516f597ebf3abbad5fd9af6af8e1a5ee58c32b615c994a8b2519e
 MISC metadata.xml 490 SHA256 c507fd5ee99486759c3acb83a13d874253ce959acd93ac3084febc424a46df86 SHA512 b076932259b157a51d6006324835ab91a9cb86538fb95b8e321647e90675c210051fa3ea342ed1b26b884c166e2825aa16056f2178029cf5d7bf1042cc9425ef WHIRLPOOL 53eb51b9e8fa1acbbef117955d1ad51b36ead058b6cd0b09d902467a58de9854f0b896d7a8961ec2ef019b7d7e39ef24802a5fbb23a11618a9535c17e98bc038
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU8N4uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAp8QAKl/EeeYruXIalBeuusBsRVl
-zsPjM1V6nE1heEBc5bodwyq2I4QzIkvWHy0uySLtRigm0NdcylX7aUXBbB/AeTOR
-oF5Rf4mX5cELAQ8jqvFu6QsMOuBZkT4SXNqMbDORZeWqawOkOxsNmBXN+cBjQZww
-XU0nEj3PeHkuQBWEIJhvBQ2u1Bw+MxKEjH6GR2w6cmxdadBxMwfQnpuJ7mynvzAp
-dvfhIBjICGlplPXFuaUPWy7qxsf49oB4j1a4LUjP3DeWWZYdV6deDLLMqDUQI9oJ
-1vhAoS1e2MPHk3utE1qDQnRvg8DZq4xz1ZgR12TI/dFJNlv8NYwPch4czubB8e3r
-acBhcyqj5ezwlzZhcZmx/2WYM8jDe0gi1GMo8CdpE6mEkbLy3doRAFBQFi4j7CXH
-4adaQmfpsnjXzJdYpW+byZtbHXmS0ruFzucLpMPAijBGU38M9zwZ9SP/KYCw3gnh
-vgJLUoBvku4qIpRbjgxGsxenqf230yc7P3Kq0gfcicP2ec5fyomv+7ErFpB72Cs9
-LLa3dfCEF0M5Ia1ws9Y2bjxmvpM+MzFpwfLuO1s9eQ/nSGPxFXfuMi3mxHn0NvcL
-mXnacnWXaTwPpdDx7Lga4x4toWQ8KFZqmzTBN7QU5ed57bkleFZGoicwkbnNaK6m
-ylF7VRRDyZpalRzzSZzN
-=XxrU
+iQJ8BAEBCgBmBQJVDFMHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpfoQAIaEr/Geo3Pfv5k+rrMgPiHx
+B3dS1UPFjsHL7dfZD6oKzNGhmJ5Zfrf8mxSEGI15KGDDmCxloJnUgnHiMrpP5G0G
+UYZ5tQ/hyTb+ZgLODMoHFn2GpqHSSszzD0YemLPaJvrGqCmCWiP5//F6ggHOyuv8
+Z+jqgQIszqXlKOtgHIXqXKD9KK6Da2fAh/boxb4TuVekohlP0atf73xGjBKjZJWx
+G01r5hbWjD3gk6StMqhjCSs1BStr0pOUEmEeq7Z8SB+r/rj42qChrif8XFGkge3Y
+6J7nPCQuBR0NWwWamNEiPjm5pQbXlebhzE2hNJC3riCD1IafjcfV7gF0Hqdh06bj
+t+WUtSlUh+7A8cjIPslCaFGqbfJLKtAGEAb6jwrvMx7wg2hBsxMfz9QpZJxtAqm5
+Eqs0ZmHkDlHT7qtZ962aPx9yg664pR/EKN9ijs7MIbGv4C+k1durk4OlgcDkUMEa
+7sOnXd2a3t9i0egSBKG70zGd7BNlpWj6/WXrRvbCzwJKYt+BaObhGCbr4CqlnaRJ
+PdmeNaOopk/EMyRM1wUTJVKrPkq2/paUrDmlM9PRXd4k+9W0WF/6mV/mdzIPwuoz
+gfkfvwTp+ZBNTx9MjyHphKa2MgmITMQgDSaFawDxBxguhU+TCEXakO9+SemUz2i9
+1ELV6BBggqjcxXCV+k7i
+=zAON
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-2.18.3-r10.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
deleted file mode 100644
index e1a2c3a94991..000000000000
--- a/sys-devel/distcc/distcc-2.18.3-r10.ebuild
+++ /dev/null
@@ -1,151 +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-2.18.3-r10.ebuild,v 1.16 2014/05/12 11:36:29 ssuominen Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs user
-
-PATCHLEVEL="2.18"
-
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.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="gnome gtk hardened selinux ipv6"
-
-DEPEND=">=sys-devel/gcc-config-1.3.1
-	userland_GNU? ( sys-apps/shadow )
-	gnome? ( virtual/pkgconfig )
-	gtk? ( virtual/pkgconfig )"
-RDEPEND="
-	gnome? (
-		x11-libs/gtk+:2
-		>=gnome-base/libgnome-2.0.0
-		>=gnome-base/libgnomeui-2.0.0.0
-		gnome-base/libglade:2.0
-		x11-libs/pango
-		>=gnome-base/gconf-2.0.0:2
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	selinux? ( sec-policy/selinux-distcc )"
-
-src_prepare() {
-	# -Wl,--as-needed to close bug #128605
-	epatch "${FILESDIR}/distcc-as-needed.patch"
-
-	# See bug #75420 for more multilib stuff
-	epatch "${FILESDIR}/distcc-gentoo-multilib-r1.patch"
-	einfo "Please report to bug #75420 success or failure of this patch."
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-}
-
-src_configure() {
-	local myconf="--with-included-popt "
-	#Here we use the built in parse-options package. saves a dependancy
-
-	#not taking any chances here, guessing which takes precedence in the
-	#configure script, so we'll just make the distinction here:
-	#gnome takes precedence over gtk if both are specified (gnome pulls
-	#in gtk anyways...)
-	use gtk && ! use gnome && myconf="${myconf} --with-gtk"
-	use gtk && use gnome && myconf="${myconf} --with-gnome"
-
-	#More legacy stuff?
-	[ `gcc-major-version` -eq 2 ] && filter-lfs-flags
-
-	if use ipv6; then
-		ewarn "To use IPV6 you must have IPV6 compiled into your kernel"
-		ewarn "either via a module or compiled code"
-		ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc"
-		myconf=" ${myconf} --enable-rfc2553 "
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D%/}" install
-
-	insinto /usr/share/doc/${PN}
-	doins "${S}/survey.txt"
-
-	exeinto /usr/bin
-	doexe "${FILESDIR}/distcc-config"
-
-	newconfd "${FILESDIR}/${PATCHLEVEL}/conf" distccd
-
-	newinitd "${FILESDIR}/${PATCHLEVEL}/init" distccd
-
-	# create and keep the symlink dir
-	dodir /usr/lib/distcc/bin
-	keepdir /usr/lib/distcc/bin
-
-	# create the distccd pid directory
-	dodir /var/run/distccd
-	keepdir /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"
-	  dosym /usr/bin/distccmon-gui /usr/bin/distccmon-gnome
-	fi
-
-}
-
-pkg_preinst() {
-	# non-/ installs don't require us to do anything here
-	[ "${ROOT}" != "/" ] && return 0
-
-	# stop daemon since script is being updated
-	[ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \
-		/etc/init.d/distccd stop
-}
-
-pkg_postinst() {
-	#are we doing bootstrap with has no useradd?
-	if [[ ${CHOST} != *-*-gnu && ${CHOST} != *-linux* ]] || [ -x /usr/sbin/useradd ]; then
-	  enewuser distcc 240
-	else
-	  ewarn "You do not have useradd (bootstrap) from shadow so I didn't"
-	  ewarn "install the distcc user.  Note that attempting to start the daemon"
-	  ewarn "will fail. Please install shadow and re-emerge distcc."
-	fi
-
-	# By now everyone should be using the right envfile
-
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install
-	else
-		# distcc-config can *almost* handle ROOT installs itself
-		#  but for now, but user must finsh things off
-		ewarn "*** Installation is not complete ***"
-		ewarn "You must run the following as root:"
-		ewarn "  /usr/bin/distcc-config --install"
-		ewarn "after booting or chrooting into ${ROOT}"
-	fi
-	einfo "Setting permissions on ${ROOT}var/run/distccd"
-	chown -R distcc:daemon "${ROOT}var/run/distccd"
-	echo ""
-
-	einfo "Tips on using distcc with Gentoo can be found at"
-	einfo "http://www.gentoo.org/doc/en/distcc.xml"
-	echo ""
-	einfo "To use the distccmon programs with Gentoo you should use this command:"
-	einfo "      DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N"
-	use gnome || use gtk && einfo "Or:   DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome"
-
-	ewarn "***SECURITY NOTICE***"
-	ewarn "If you are upgrading distcc please make sure to run etc-update to"
-	ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
-	ewarn "added security precautions (the --listen and --allow directives)"
-	ebeep 5
-}
diff --git a/sys-devel/distcc/distcc-3.0-r4.ebuild b/sys-devel/distcc/distcc-3.0-r4.ebuild
deleted file mode 100644
index 47cdcc1f404e..000000000000
--- a/sys-devel/distcc/distcc-3.0-r4.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.0-r4.ebuild,v 1.17 2014/05/16 19:53:04 jer Exp $
-
-EAPI=5
-inherit eutils fdo-mime flag-o-matic multilib 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 ~x86-fbsd"
-IUSE="avahi gnome gtk hardened ipv6 selinux xinetd"
-
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-libs/popt
-	avahi? ( >=net-dns/avahi-0.6 )
-	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.3.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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-svn617.patch"
-	epatch "${FILESDIR}/${P}-xinetd.patch"
-	epatch "${FILESDIR}/${P}-uninitialized.patch"
-	# bug #253786
-	epatch "${FILESDIR}/${PN}-3.0-fix-fortify.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"
-
-	# Bug #244847
-	sed -i -e "s:-Werror::" configure* include_server/setup.py || die
-}
-
-src_configure() {
-	# More legacy stuff?
-	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
-	# -O? is required
-	[ "${CFLAGS/-O}" = "${CFLAGS}" ] && CFLAGS="${CFLAGS} -O2"
-
-	econf \
-		$(use_with avahi) \
-		$(use_with gtk) \
-		$(use_with gnome) \
-		$(use_enable ipv6 rfc2553) \
-		--with-docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	# In rare cases, parallel make install failed, bug #249695
-	emake -j1 DESTDIR="${D}" install
-
-	dobin "${FILESDIR}/${PV}/distcc-config"
-
-	newinitd "${FILESDIR}/${PV}/init" distccd
-
-	cp "${FILESDIR}/${PV}/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"
-}
-
-pkg_postinst() {
-	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() {
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild
index e3cd11cbc149..802694eb91e2 100644
--- a/sys-devel/distcc/distcc-3.1-r10.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 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.3 2015/01/24 23:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild,v 1.4 2015/03/20 17:04:06 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user
 
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild
deleted file mode 100644
index 67a8b87e1081..000000000000
--- a/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 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-r2.ebuild,v 1.2 2015/01/24 23:18:13 mgorny 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"
-
-CDEPEND="${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="${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"
-	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}/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
-	python_optimize
-
-	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
-
-	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
-
-	use gnome && fdo-mime_desktop_database_update
-}
-- 
2.26.2