From: "Andreas K. Huettel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/, app-admin/collectd/files/
Date: Sun, 24 Apr 2011 21:12:05 +0000 (UTC) [thread overview]
Message-ID: <5a21c080a6194ff1c4d4cdb468e75e51c9f6d8ea.dilfridge@gentoo> (raw)
commit: 5a21c080a6194ff1c4d4cdb468e75e51c9f6d8ea
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 24 21:13:06 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 21:13:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5a21c080
[app-admin/collectd] Various cleanup
(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
app-admin/collectd/ChangeLog | 6 +++
app-admin/collectd/Manifest | 33 ++++++++++---------
app-admin/collectd/collectd-4.10.3-r1.ebuild | 22 ++++++------
app-admin/collectd/collectd-5.0.0-r1.ebuild | 8 ++--
.../collectd/files/collectd-4.10.3-werror.patch | 24 ++++++++++++++
5 files changed, 62 insertions(+), 31 deletions(-)
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 5f357da..8f3fcac 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -3,6 +3,12 @@
# $Header: $
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
+
+ 24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
collectd-4.10.3-r1.ebuild, collectd-5.0.0-r1.ebuild:
Properly set no shell
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index d215067..7ce625c 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -8,30 +8,31 @@ 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 0e2655d185bc5bb973cbe7a32fbdfa832bc51d54 SHA1 88f9398411dea63ff19e07e27fe68da2a97cd1da SHA256 cde0eedcdf29bb9994a7897388c3d60b069900f4a5e304cfc033be89c303992b
AUX collectd.initd 1644 RMD160 b290f64b0c08bd42d367d6a2ef78bf81d75145cd SHA1 db188725f6a93e14e51a17c5b9177590a0ae3908 SHA256 cd17fb867783ce8c1a4dcbabae696eec734c7b1c88aa66f0586911908d02d1b6
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 6965 RMD160 53e5895595b8b24362608a3db50c45a0dcb8f5c9 SHA1 d8ad4d1950537c503087dbdca263dca9630f3e7c SHA256 f8107d628707b00041ba433a4bd238f55a0bf131215c0f4722e0d6020a70fb64
+EBUILD collectd-4.10.3-r1.ebuild 12509 RMD160 a868c47d13e2d3f0b0c690909f0295e74a195ff9 SHA1 d043277bd65904f0c5a1c589314321afcad3f722 SHA256 56ef4977df9a6b9616107bb6057b346372136b0e54ba0b04977ef993048bafab
+EBUILD collectd-5.0.0-r1.ebuild 12835 RMD160 3428af56cc424899eafa0e2059fbf76cd61d5712 SHA1 e6af4d250bc7766fc17589e42485af62dc947520 SHA256 9f4d0e42a356b877853a8417bf0792b01ca82b2109f1be6b62bd96e5e7066786
+MISC ChangeLog 7227 RMD160 1d479c9ae53c193eb711b69c57bc793bfaa27d45 SHA1 c88ea53572b8849b7d924358c0f82e10b27dbd5b SHA256 1952a16848a1d6dc33df625506e7c82b76f349c087f2f0657f90920934488b41
MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNtI3vAAoJENwGBM22xffeWWoQAJrh9AViibdit/Z7eYjGON1i
-F3fP9F9Yl7WKlVc37U8BrBVk3nfuL/svtqur+QrnMMl69XSX58Bc3pWF2WDEyj74
-fyip+mRLl7urjpbX8ISsPJbU+pZ1nu7xYUsKUQM/Sogt4SuqOdXN4KLsl994/a6X
-ZiPRKP1PM8v0nsjHoVwymw2jsTsVC3Ui9g+bxl3/sNUvZV5Y00WncckdR65MqzpB
-wEUTvTOaqWJ5uQlmKVCsMCKUD18SFvMHImf9LRg9a1f5aZG2GzkSSW6/NSbIHyLV
-YWa93IhBEKNrIhpzkEkt9MIHZ2NFb8I1EvTty8c1pWkDbDV2t/ZJpz7IJTEvupP/
-wm8zGojBgOZzvQj8wtes6xqtiNptvJ7kH9ltf+aHXezY+j1KAgomEw8kxofiwF2z
-cEifavcJdCmA2x598fTJPbVrE4ZdmpZuD0Iv/U8i0BjPJGb3UQsbfuYAb4YAWoT5
-G7hRvxHg7HRZ9UfpvBMskX0Z/j1r3iyM9NlIJvHniQYRKe/NR26NT9gKh+MbTvDl
-R/o81XtBFfMs71iTd0OIKS6G3RUTj2KHBkPcDnmoG1NdqFa7WHEVGXHn9tC7Btwz
-PToPjDI7QWMpDjsivPNA92klJna6iAx+/RsDYCIPjvW0WAMeSlCtky6fvNPunLhw
-W2mjRVMgFhsM6/8j1pAe
-=nQGU
+iQIcBAEBCgAGBQJNtJJiAAoJENwGBM22xffeP7AP/0ASz60srRNHrhWe/pUOh1Ps
+JNP6BRQuyOJFAabPpSjS2TuLWNwkVFflxjjrhKD3lMcQ0M85FxE7uyyfs99ZtWZc
+KqnxHZET+TaYWjHILt+Dcwo9SyCDmINi4MEU4G4B9CHRyokqsBS7+pYVrikkgQA+
+UBNVKliIaEoYwWY/BCqr7HLVPGhWnN5H1vc+6G+nt53t0dMn5sUpvAsjOwqNX2f9
+F9waidkyMdhNNmxjtW8hzveDZ0qq6+v35K2zPjK8iRXoimweJATMim5VPSFwUeh8
+aMEjbj8E51FW15QRomsm6Zf2jEoE9LPjxXyaFTFzlipBPe5mq3hSffC6eHjTsVgt
+/Ffb/BeeCJvW+F0AgxyDEK1SWHBHCyoTqcqXKP6mI6I13YX43edJHjt74FFrR780
+91tJn24WXH3ZAVEiv5iByrS5I6NzxV3RRRrRMog838Yaange3M7kyRdG7DhRAXgB
+dXoBYqXVnM57LqS4G/Zh3wBFhfKI53yboGkTYgD9ZPs/9Zx1KT2V5EhK6u+gTxDt
+fjvU3nP9AmJRbh/SipwXf0konLzEF2MUMVvO0yj93v0EwRzsRC/go5WhbBUw4nUA
+5SamPJFe+EhYwEr49n72y7mSlHhJltW9n48VtArUDwWEpzS1e9Fv7+K++FfcZQQ1
+mXDeQLVcBVtKxeev+jzh
+=jqeB
-----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 58e73fd..c1fd53f 100644
--- a/app-admin/collectd/collectd-4.10.3-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.3-r1.ebuild
@@ -2,7 +2,7 @@
# 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 $
-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 bd2cd36..bd3b67f 100644
--- a/app-admin/collectd/collectd-5.0.0-r1.ebuild
+++ b/app-admin/collectd/collectd-5.0.0-r1.ebuild
@@ -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 0000000..6ddb508
--- /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
next reply other threads:[~2011-04-24 21:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-24 21:12 Andreas K. Huettel [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-08 22:06 [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/, app-admin/collectd/files/ Andreas Hüttel
2011-04-24 16:54 Andreas K. Huettel
2011-04-24 15:59 Andreas K. Huettel
2011-03-29 22:40 Andreas K. Huettel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5a21c080a6194ff1c4d4cdb468e75e51c9f6d8ea.dilfridge@gentoo \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox