ssuominen 14/05/12 11:36:29
Modified: distcc-3.0-r4.ebuild distcc-2.18.3-r10.ebuild
ChangeLog
Log:
Convert from EAPI 1 to 5 as 1 is declared obsolete and will go away.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.16 sys-devel/distcc/distcc-3.0-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild?r1=1.15&r2=1.16
Index: distcc-3.0-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- distcc-3.0-r4.ebuild 15 Sep 2012 22:03:36 -0000 1.15
+++ distcc-3.0-r4.ebuild 12 May 2014 11:36:29 -0000 1.16
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.15 2012/09/15 22:03:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v
1.16 2014/05/12 11:36:29 ssuominen Exp $
-EAPI=1
+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"
@@ -44,9 +44,7 @@
enewuser distcc 240 -1 -1 daemon
}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}/${P}-gentoo.patch"
epatch "${FILESDIR}/${P}-svn617.patch"
epatch "${FILESDIR}/${P}-xinetd.patch"
@@ -62,7 +60,7 @@
sed -i -e "s:-Werror::" configure* include_server/setup.py || die
}
-src_compile() {
+src_configure() {
# More legacy stuff?
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
@@ -74,13 +72,12 @@
$(use_with gtk) \
$(use_with gnome) \
$(use_enable ipv6 rfc2553) \
- --with-docdir="/usr/share/doc/${PF}" || die "econf failed"
- emake || die "emake failed"
+ --with-docdir="/usr/share/doc/${PF}"
}
src_install() {
# In rare cases, parallel make install failed, bug #249695
- emake -j1 DESTDIR="${D}" install || die
+ emake -j1 DESTDIR="${D}" install
dobin "${FILESDIR}/${PV}/distcc-config"
@@ -132,7 +129,6 @@
rm -rf "${D}/etc/default"
rm -f "${D}/etc/distcc/clients.allow"
rm -f "${D}/etc/distcc/commands.allow.sh"
- prepalldocs
}
pkg_postinst() {
1.16 sys-devel/distcc/distcc-2.18.3-r10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild?r1=1.15&r2=1.16
Index: distcc-2.18.3-r10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- distcc-2.18.3-r10.ebuild 15 Sep 2012 22:03:36 -0000 1.15
+++ distcc-2.18.3-r10.ebuild 12 May 2014 11:36:29 -0000 1.16
@@ -1,11 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.15 2012/09/15 22:03:36 vapier Exp $
+# $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 $
-# If you change this in any way please email [email protected] and make an
-# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
-
-EAPI=1
+EAPI=5
inherit eutils flag-o-matic toolchain-funcs user
PATCHLEVEL="2.18"
@@ -38,10 +35,7 @@
)
selinux? ( sec-policy/selinux-distcc )"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
# -Wl,--as-needed to close bug #128605
epatch "${FILESDIR}/distcc-as-needed.patch"
@@ -53,7 +47,7 @@
use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
}
-src_compile() {
+src_configure() {
local myconf="--with-included-popt "
#Here we use the built in parse-options package. saves a dependancy
@@ -72,14 +66,12 @@
ewarn "either via a module or compiled code"
ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge
distcc"
myconf=" ${myconf} --enable-rfc2553 "
- epause 5
fi
- econf ${myconf} || die "econf ${myconf} failed"
- emake || die "emake failed"
+ econf ${myconf}
}
src_install() {
- make DESTDIR="${D%/}" install
+ emake -j1 DESTDIR="${D%/}" install
insinto /usr/share/doc/${PN}
doins "${S}/survey.txt"
@@ -125,7 +117,6 @@
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."
- ebeep 2
fi
# By now everyone should be using the right envfile
1.234 sys-devel/distcc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.234&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.234&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?r1=1.233&r2=1.234
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- ChangeLog 19 Jan 2014 01:53:44 -0000 1.233
+++ ChangeLog 12 May 2014 11:36:29 -0000 1.234
@@ -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.233
2014/01/19 01:53:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.234
2014/05/12 11:36:29 ssuominen Exp $
+
+ 12 May 2014; Samuli Suominen <[email protected]> distcc-2.18.3-r10.ebuild,
+ distcc-3.0-r4.ebuild:
+ Convert from EAPI 1 to 5 as 1 is declared obsolete and will go away.
19 Jan 2014; Mike Frysinger <[email protected]> distcc-3.1-r9.ebuild,
distcc-3.2_rc1.ebuild:
