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

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 65 insertions, 34 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/Manifest b/app-admin/collectd/Manifest
index 5718a2b50d7c..69ed3b110e24 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -8,29 +8,30 @@ AUX collectd-4.10.2-libnotify-0.7.patch 823 RMD160 f3a0febc8487be06ad1cc5ffc6120
 AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b
 AUX collectd-4.10.2-nohal.patch 888 RMD160 a7d5969f3119f44eeb1b163d13bfd86c727854f3 SHA1 275e928e2bbad3b01d7e129793922d48348334fa SHA256 d1b8fccc96289c42e6aa33187bfca250ae0152a44d5cfba41ccf9e941a6aa799
 AUX collectd-4.10.3-lt.patch 1006 RMD160 b7eee4c9261af6ac3d330494746b922792241bac SHA1 ce2f25fbb84912bce137866faecf147d4da4ee57 SHA256 b5640f7a029366d33d6821f8efe203097d56c0193ec39e1e52d93bc7723179c7
+AUX collectd-4.10.3-werror.patch 849 RMD160 1bf304deb3addbdeb4d7e12ea06f49dd3f85e387 SHA1 07f8c063f788c77e2958f2490bc910296a9db25e SHA256 c9b70f892f96c0d5da5d65702679bc0b4a38b4e77ff819f69c03ad68cc3f68fd
 AUX collectd.confd 865 RMD160 edf4e29bc193128d913443ba5251935726b13194 SHA1 0987c9546a814d0f6c888f46828ad66b3a190a97 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592
 AUX collectd.initd 1644 RMD160 70c454364fdcef21fa48467e9fd66d3d1e5907fd SHA1 a6bd53ce58210796b216687582fc7f58316ca7a9 SHA256 6a5e169cc00aa393e501788414a661051b6218f9ad9413b960da012a94c6d78a
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65
 DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c
-EBUILD collectd-4.10.3-r1.ebuild 12576 RMD160 cd13f21b8a20d1377a5d074595281f8c327765e0 SHA1 e5aaa66ebe93ef29077c89b8e23b4dbb02c7560a SHA256 2b31c89f69cf14589e41ca14b4b1eb9803b117984a2e1c419635c80d416dcef2
-EBUILD collectd-5.0.0-r1.ebuild 12860 RMD160 cf8db8fb0562aef7d99f58cdb2ca6cc287b91a3c SHA1 231c585fa421cca5f2613ac4db2eb31b1e779106 SHA256 b6b889a9581da351cf0cf5294b41c43631e7e73479474a817c8e6571445ca5d3
-MISC ChangeLog 4706 RMD160 c51af0c7c65d172a71c2fb82d718fc9730fe3fec SHA1 fa9cd1739d2e06f6bc9e44aba350b6a7872ae11f SHA256 991840ff3074e98a7873a8ebf62a56a06e903439959c06ee06a449f41e8fd2cd
+EBUILD collectd-4.10.3-r1.ebuild 12509 RMD160 6485469c971fc2b8d8a7de745f5c5c026cd320cd SHA1 8de82dcad14c62f12338c4fee66df7d8ae690d70 SHA256 060fe1c060fc57d8429ee2ed084be86d03d39067a2fc1142a2f4c0e073057429
+EBUILD collectd-5.0.0-r1.ebuild 12835 RMD160 df6195449c155a57a65ac5f96fb84c94bf732089 SHA1 244824ab250544552c4b3bb366a9f08c91042002 SHA256 8388b53753fc8478c5c482d74926b1b8decb52740948c61337dc2383450afeea
+MISC ChangeLog 4968 RMD160 7f406856e28086cc2d21ef0e19758d63d754ab78 SHA1 163cd699d181a2fc23a0af17ecbf0c7016372a4e SHA256 bf565ac1a1fbc29042a8da0503912d6a20a9509249219fca85557a4693c74477
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtFoMAAoJENwGBM22xffenSYP+QH3a9iMXR456oLj13O5/KmD
-4dlJ0AklO/MfmB4KpNbSj+F3CXzkCgj2dEbX9dJtt4dORxv76SXFDR2B4VdyCSkZ
-0tbJlD8MSdD+OOcxTubZa8G/fSJL3G78pfwX+6/FHv1ehZ0OW1eWEABc2yT8h4Vy
-vcQMFXB/qO2pSE3cILQNpBtPY5aDpNFy/36Z40PswXQ4RcRH74uXe7+N8ConaeHi
-QOgqWr54yF59wi6PMGl9A6fiDqbHtTG2s00QN4ccFRtcI19Hbnsugy9R7UdpOM2F
-+s7+vlTllDBLZeX6OapW6JE3tO/4da3m49lXogTbbug1M9ZJVkvTykw126CrVuMC
-Ll06rCya004VByjBfyG1tTX09BQ58JP8NFX0uCtI1vaUD9H3Y7ILC5q/QIAg3l+R
-eC3SuUnk3GAvgedhIpT9J4MgxUjKkZaR7y6WRPprDmIIxtBtLs/eJEwmnMBNvl46
-lbrf2fbnlbERIXJbSGL9itnTs9hEUUiynA6CIZoLS0hP/RjSYYr2+oI5h/8jHHP8
-n9Oq7nSn9mEP+U3in1k4FeAmW2tlcOHFcZqzhkTkz+uBidrVqAxcBGOCjD11+Xer
-hAC4EhFtp41K6gHSIzdJJiZ+LIrBLeeN7R81pOHdDXW6zKJTrkmJN9lQh5ssggJB
-6657zgKcW7Knwr34SMWT
-=HJpc
+iQIcBAEBCgAGBQJNtJOzAAoJENwGBM22xffevq4P/R8rzGRwRR+wuz60AQexh9K7
+soTHr7INSAMNcWAcXTKG0HBtxgdTIFT1zkbvjPQ390INTTWSD81AMG0yM4KHY85T
+hlEou/9Ygt3PZIzD3egx3OhbNipK7PoRhKHPIYwHOxnoK+nJMoU2R30foqTwsQVg
+dKKgI2jlC3DQ2eVoeqAX7xSX4S1SxNw4AaZjDfN7lwmXTZnFL5kwzLku5mRwGWlh
+bFVsdgwDOOQRu4HgsWuaZkHzvVEM1Pnzd+OnM4r4z1FUyhmTnsNWs0M3oelfkgEK
+0OEgH3zewxloptvAJKmrVkrY9UD9blWcFJ2Zpc0Af0KhgmPgMXXCMdPRAWg17V6h
+8dQkUdA9mKBSlZXvSjP+slxtH8sH1K1uSogpZOF0ZD+lxWWeLjgFi2GzJcwlevJ+
+eBiqwisXLzydX89Hk2t+ClclEX2Qvr4XtwS0sIdmIKsruQDKKmlXvaUtYs+6h5Si
+pu6VOlVQ+EPTqPUCXr4bgK4wzukdYSurLZTp/z19HRNDNROHNmxf5HnwLBeDRlGy
+TUMIXr+6NSErC4aGW9rm9+BflSiizU3EY1h0YOtqQCILeSZrE7ZixlWLhAxCQPcm
+t1NSQJMN9os0OQatxkrMO9bOKIfYmslossd4J1m97ICaAfH46YxO2ME1ws8Dm4p8
+Xic701cKTwWBo0EVSoSR
+=8w2T
 -----END PGP SIGNATURE-----
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