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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 25 insertions, 21 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/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"