sys-devel/distcc: Bump to new python eclasses and bump to EAPI=5

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 44 insertions, 28 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 46968463d840..e431727ca39f 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.235 2014/05/16 19:53:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.236 2014/05/21 06:38:17 jlec Exp $
+
+  21 May 2014; Justin Lecher <jlec@gentoo.org> distcc-3.1-r9.ebuild,
+  distcc-3.2_rc1.ebuild:
+  Bump to new python eclasses and bump to EAPI=5
 
   16 May 2014; Jeroen Roovers <jer@gentoo.org> distcc-3.0-r4.ebuild,
   distcc-3.1-r5.ebuild, distcc-3.1-r6.ebuild, distcc-3.1-r7.ebuild,
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index b2656af843d1..ae389bcd2015 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
@@ -42,14 +42,26 @@ EBUILD distcc-3.0-r4.ebuild 4500 SHA256 890af2113a538fb7a4d12644e9adc8aea49c7e1f
 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 4684 SHA256 6ba3e5ff24e64292f267dd70682b85a63d005abee500a901317a786c09c92cdf SHA512 da530c24818497b51c61669daae21b7c997258136b7affe2238a6ed3d484f41fe199c267c673ff7eb730f8bae3a330509e72c15a5aa3daef446143f7c6bf9a23 WHIRLPOOL 289429955a69fff29141117ef16c9f03af55e7e8feba3448c51bbf44ff7d267f1ebeed54d8e01e795dda0cac7ffff0d055db23f2954a822c572cd3fefba621e0
-EBUILD distcc-3.2_rc1.ebuild 6025 SHA256 bc399460fa19b0de9537c5a907fc3e2bb37857cebf6aae3b7b64d5e571995ba5 SHA512 91c112f854dcc2f54921aa8f303ce3bc43bdb5e19d3058fd9a597b5888734cc87cd2561994d09102a0d94693ea4efc2d2b72392a77d522b24d87e21737dc64be WHIRLPOOL ef8d9b5d75bd116780fa157d7336549235dcf62636e4eee4ad4f2b1ee896e74ed266194b3343da4d4aa88865940abfe1e5d518e13344ebdfc7b1046bc53d09a9
-MISC ChangeLog 41736 SHA256 04fd049759384d1412b667400f61a31a3c1f5a770d594f230bdbd3e00b8f22d9 SHA512 c746fe6803927694e329de56196a5ffaaf04fb6bc736451dc262f0924cabb417d683580871af96bdd7a046bacb61f84197efc44b155b267aeaa0dc996da32b64 WHIRLPOOL 47adc08b1b37ef5b6b7644605a5a08ea794f6dfee68969b18dccdae3b8ef87ecbef9dc33e80cdead8e2efb492aa4a6dbb21ece0b4b4c967a029207c529637ca1
+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
 MISC metadata.xml 490 SHA256 c507fd5ee99486759c3acb83a13d874253ce959acd93ac3084febc424a46df86 SHA512 b076932259b157a51d6006324835ab91a9cb86538fb95b8e321647e90675c210051fa3ea342ed1b26b884c166e2825aa16056f2178029cf5d7bf1042cc9425ef WHIRLPOOL 53eb51b9e8fa1acbbef117955d1ad51b36ead058b6cd0b09d902467a58de9854f0b896d7a8961ec2ef019b7d7e39ef24802a5fbb23a11618a9535c17e98bc038
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN2bKQACgkQVWmRsqeSphM+egCfcq99gP3VukkDyOBEKqoRN6g6
-UgkAn0m7GGz6fkWRmxBQRiH8azXhvGnq
-=Tnnv
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-3.1-r9.ebuild b/sys-devel/distcc/distcc-3.1-r9.ebuild
index 9d15dbb71c61..00c6912e2fac 100644
--- a/sys-devel/distcc/distcc-3.1-r9.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r9.ebuild
@@ -1,12 +1,12 @@
 # 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.9 2014/05/16 19:53:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild,v 1.10 2014/05/21 06:38:17 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user systemd
+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/"
@@ -82,7 +82,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}/distccd.service"
 	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
 
-	cp "${FILESDIR}/3.1/conf" "${T}/distccd"
+	cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die
 	if use avahi; then
 		cat >> "${T}/distccd" <<-EOF
 
@@ -118,7 +118,7 @@ src_install() {
 	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
+		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
 		dosym distccmon-gui /usr/bin/distccmon-gnome
 	fi
 
diff --git a/sys-devel/distcc/distcc-3.2_rc1.ebuild b/sys-devel/distcc/distcc-3.2_rc1.ebuild
index e8214e05cfd1..8c115f58a474 100644
--- a/sys-devel/distcc/distcc-3.2_rc1.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1.ebuild
@@ -1,14 +1,15 @@
 # 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.7 2014/01/19 01:53:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v 1.8 2014/05/21 06:38:17 jlec Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
+EAPI=5
 
-inherit autotools eutils fdo-mime flag-o-matic multilib python systemd toolchain-funcs user
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user
 
 MY_P="${P/_}"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
+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"
 
@@ -19,7 +20,8 @@ IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
 
 RESTRICT="test"
 
-RDEPEND="dev-libs/popt
+RDEPEND="
+	dev-libs/popt
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	gnome? (
 		>=gnome-base/libgnome-2
@@ -40,11 +42,11 @@ RDEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 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
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -61,10 +63,9 @@ src_prepare() {
 	# Bugs #120001, #167844 and probably more. See patch for description.
 	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
 
-	python_convert_shebangs -r $(python_get_version) .
 	sed -i \
 		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
-		-e "s:@PYTHON@:${EPREFIX}$(PYTHON -a):" \
+		-e "s:@PYTHON@:${EPYTHON}:" \
 		pump.in || die "sed failed"
 
 	sed \
@@ -77,7 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--disable-Werror"
+	local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}"
 	# More legacy stuff?
 	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
 
@@ -89,16 +90,15 @@ src_configure() {
 		$(use_with gtk) \
 		$(use_with gnome) \
 		$(use_with gssapi auth) \
-		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		${myconf} || die "econf failed"
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
-	dobin "${FILESDIR}/3.0/distcc-config" || die
+	dobin "${FILESDIR}/3.0/distcc-config"
 
-	newinitd "${FILESDIR}/3.1/init" distccd || die
+	newinitd "${FILESDIR}/3.1/init" distccd
 	systemd_dounit "${FILESDIR}/distccd.service"
 	systemd_install_serviced "${FILESDIR}/distccd.service.conf"