Don't use -Werror else gcc-4.6 will drive us mad; move 4.10.3 to EAPI=4; use wrappers for chown and chmod

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 48 insertions, 18 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 52eff544153b..44ffbb983783 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.20 2011/04/24 17:10:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.21 2011/04/24 21:16:04 dilfridge Exp $
+
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.3-r1.ebuild, +files/collectd-4.10.3-werror.patch,
+  collectd-5.0.0-r1.ebuild:
+  Don't use -Werror else gcc-4.6 will drive us mad; move 4.10.3 to EAPI=4;
+  use wrappers for chown and chmod
 
 *collectd-5.0.0-r1 (24 Apr 2011)
 *collectd-4.10.3-r1 (24 Apr 2011)
diff --git a/app-admin/collectd/collectd-4.10.3-r1.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild
index 58e73fd8ac05..596b004237c2 100644
--- a/app-admin/collectd/collectd-4.10.3-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.3-r1.ebuild,v 1.1 2011/04/24 17:10:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.3-r1.ebuild,v 1.2 2011/04/24 21:16:04 dilfridge Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils base linux-info perl-app autotools
 
@@ -103,7 +103,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
 	"${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch
-	"${FILESDIR}/${PN}-4.10.3"-lt.patch
+	"${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch
 	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
@@ -292,24 +292,24 @@ src_install() {
 	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
 	# we cannot do this yet
 
-	chown root:collectd "${D}/etc/collectd.conf" || die
-	chmod u=rw,g=r,o= "${D}/etc/collectd.conf" || die
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
 
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use contrib ; then
 		insinto /usr/share/doc/${PF}
-		doins -r contrib || die
+		doins -r contrib
 	fi
 
-	keepdir /var/lib/${PN} || die
-	chown collectd:collectd "${D}/var/lib/${PN}" || die
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" collectd || die
+	newins "${FILESDIR}/logrotate" collectd
 
 	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
 	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die
diff --git a/app-admin/collectd/collectd-5.0.0-r1.ebuild b/app-admin/collectd/collectd-5.0.0-r1.ebuild
index bd2cd36217c9..3ef5d3d12ff5 100644
--- a/app-admin/collectd/collectd-5.0.0-r1.ebuild
+++ b/app-admin/collectd/collectd-5.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.1 2011/04/24 17:10:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.2 2011/04/24 21:16:04 dilfridge Exp $
 
 EAPI=4
 
@@ -103,7 +103,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
 	"${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch
-	"${FILESDIR}/${PN}-4.10.3"-lt.patch
+	"${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch
 	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
@@ -292,8 +292,8 @@ src_install() {
 	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
 	# we cannot do this yet
 
-	chown root:collectd "${D}/etc/collectd.conf" || die
-	chmod u=rw,g=r,o= "${D}/etc/collectd.conf" || die
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
@@ -303,7 +303,7 @@ src_install() {
 	fi
 
 	keepdir /var/lib/${PN}
-	chown collectd:collectd "${D}/var/lib/${PN}" || die
+	fowners collectd:collectd /var/lib/${PN}
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
diff --git a/app-admin/collectd/files/collectd-4.10.3-werror.patch b/app-admin/collectd/files/collectd-4.10.3-werror.patch
new file mode 100644
index 000000000000..6ddb508cdc1f
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.3-werror.patch
@@ -0,0 +1,24 @@
+diff -ruN collectd-4.10.3.orig/src/Makefile.am collectd-4.10.3/src/Makefile.am
+--- collectd-4.10.3.orig/src/Makefile.am	2011-03-26 17:08:53.000000000 +0100
++++ collectd-4.10.3/src/Makefile.am	2011-04-24 22:56:39.521229944 +0200
+@@ -7,7 +7,7 @@
+ endif
+ 
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+ 
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"'
+diff -ruN collectd-4.10.3.orig/src/libcollectdclient/Makefile.am collectd-4.10.3/src/libcollectdclient/Makefile.am
+--- collectd-4.10.3.orig/src/libcollectdclient/Makefile.am	2011-03-26 17:04:26.000000000 +0100
++++ collectd-4.10.3/src/libcollectdclient/Makefile.am	2011-04-24 22:57:12.231229943 +0200
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ 
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+ 
+ pkginclude_HEADERS = client.h lcc_features.h