From: "Alexys Jacob" <ultrabug@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/ultrabug:master commit in: app-admin/rsyslog/
Date: Wed, 11 May 2011 21:07:27 +0000 (UTC) [thread overview]
Message-ID: <e0a51cdae98ac667f83fde53d15079e5ba42efdb.ultrabug@gentoo> (raw)
commit: e0a51cdae98ac667f83fde53d15079e5ba42efdb
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 21:07:20 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed May 11 21:07:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=e0a51cda
fix thx to mgorny
---
app-admin/rsyslog/Manifest | 6 +--
app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild | 76 ++++++++++++++--------------
2 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index cb52080..45255d7 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,11 +1,7 @@
-AUX 3-stable/rsyslog-gentoo.conf 2535 RMD160 2e0447f015851e098fdbb62d8eee591633ac9fb1 SHA1 4577c6889112d5597f75b178c3f385da8f90b993 SHA256 d3291188dc03e2709d1b64ed23518c591538e1408be8a96efd4981a9256d91fc
-AUX 3-stable/rsyslog.conf 448 RMD160 7e793828710e6edc189149322b1bdeb5e2e94079 SHA1 d7d2ff8a30a1552108f284492c41e177973a7ca3 SHA256 3f72fdae2c58074a99ac71a9de3e36683dc8b2bf7647dcda0c46ef721e6fd7b1
-AUX 3-stable/rsyslog.init 817 RMD160 c2c6e3a697ce8763008a630140954fca7ed3e3e9 SHA1 acec0956768f19157b57f9930bc90dbb9bb61af0 SHA256 8999f132424ee7de89ee00f108c0d20bc22479e8d5c6fffddca03a0199b8b07a
-AUX 3-stable/rsyslog.logrotate 390 RMD160 8639ed6de74a17b5ea895d4b1a92c34242c5ec0e SHA1 c611b0df1808c621a2ab4d200cb42bd51033e282 SHA256 ab84fcdd6bd17a4b2e1b53eb42e96914197a66e04be1bcdf4b43051f1bde4dc2
AUX 5-stable/rsyslog-gentoo.conf 3998 RMD160 db8979c4cfe4aa43c6ae5583972a21037dddd161 SHA1 9d4702ac3b505293ad922cc85ef20f0a4a3ae848 SHA256 d31ba477fb94c82cd2362694b680d43bfc5eb83c6e930202feb7531c4396982b
AUX 5-stable/rsyslog.confd 654 RMD160 ca340f748c84404df86bfdaf9ca9d47d0ff38121 SHA1 e56695ebc21a30f60f1b070f8f26236677ef5d81 SHA256 c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56
AUX 5-stable/rsyslog.initd 798 RMD160 691fa40e5f7aadad2ff0d3795a7dd6f544b523eb SHA1 2013e291f02c6a687551a4653dc6dbe21166431e SHA256 79cbd52fd54fa36e9d8d658124b24e7f388fc7cb34240afdd9d0aaa35b3badfa
AUX 5-stable/rsyslog.logrotate 440 RMD160 b2599c94c718af02a641e762960b9796952411bb SHA1 228dba04c683d778bccd86f6bcd80650b9c774b4 SHA256 f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5
DIST rsyslog-5.8.0.tar.gz 2336866 RMD160 ee0491ec0986ab1ec507a40d5129ea90a0bbdb85 SHA1 5a64f0ca8b6d5b32db1c20d46965803a2d8d047a SHA256 e034b02473fd7e5313522173ec2f6c57e6fbcaec2c6b289edb968b1d64ae3ffd
-EBUILD rsyslog-5.8.0-r1.ebuild 6408 RMD160 22b33d0637f4bf058ea681ca417e452e162d9c78 SHA1 86bbb63b32ff9613dc6896fe21b9db416484a298 SHA256 fd72c79d821fc9d3092b372a1e4b0f7903e3cc58e4861b7de8e6c6432d22cf7a
+EBUILD rsyslog-5.8.0-r1.ebuild 6309 RMD160 460a4df996d35f128104b2e44a7017374c6c9911 SHA1 dd1a6c1495fea7011bd4f9c675a9268fbfa48b0e SHA256 21d50564790817490fdb40af6291206118e8dde7bb8c74e71e6c3a0b92cb44de
MISC metadata.xml 677 RMD160 02eb7182593e766a62cfbad77295d36ebecbc728 SHA1 1f9ed7a28d21a7fef0df3a354709775756d169d2 SHA256 0f2b6a04926147b5436f5b303cde33b0fd291ca4d1a56b9bcf4f8c0dc9f890fc
diff --git a/app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild b/app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild
index 401091b..3992f83 100644
--- a/app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild
@@ -36,7 +36,6 @@ RESTRICT="test"
AUTOTOOLS_IN_SOURCE_BUILD=1
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-HTML_DOCS=("${S}/doc/")
src_configure() {
# Maintainer notes:
@@ -46,37 +45,37 @@ src_configure() {
# The maintainer says there is no real installation support
# for the java GUI, so we disable it for now.
local myeconfargs=(
- --disable-gui \
- --disable-rfc3195 \
- --enable-largefile \
- --enable-unlimited-select \
- --enable-imdiag \
- --enable-imfile \
- --enable-imtemplate \
- --enable-imptcp \
- --enable-mail \
- --enable-omprog \
- --enable-omstdout \
- --enable-omtemplate \
- --enable-omdbalerting \
- --enable-omuxsock \
- --enable-pmlastmsg \
- --enable-pmrfc3164sd \
- $(use_enable extras omudpspoof) \
- $(use_enable zlib) \
- $(use_enable mysql) \
- $(use_enable dbi libdbi) \
- $(use_enable postgres pgsql) \
- $(use_enable oracle oracle) \
- $(use_enable gnutls) \
- $(use_enable kerberos gssapi-krb5) \
- $(use_enable relp) \
- $(use_enable snmp) \
- $(use_enable debug) \
- $(use_enable debug rtinst) \
- $(use_enable debug diagtools) \
- $(use_enable debug memcheck) \
- $(use_enable debug valgrind) \
+ --disable-gui
+ --disable-rfc3195
+ --enable-largefile
+ --enable-unlimited-select
+ --enable-imdiag
+ --enable-imfile
+ --enable-imtemplate
+ --enable-imptcp
+ --enable-mail
+ --enable-omprog
+ --enable-omstdout
+ --enable-omtemplate
+ --enable-omdbalerting
+ --enable-omuxsock
+ --enable-pmlastmsg
+ --enable-pmrfc3164sd
+ $(use_enable extras omudpspoof)
+ $(use_enable zlib)
+ $(use_enable mysql)
+ $(use_enable dbi libdbi)
+ $(use_enable postgres pgsql)
+ $(use_enable oracle oracle)
+ $(use_enable gnutls)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable relp)
+ $(use_enable snmp)
+ $(use_enable debug)
+ $(use_enable debug rtinst)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug valgrind)
$(use_enable static-libs static)
)
@@ -85,28 +84,29 @@ src_configure() {
}
src_install() {
+ use doc && HTML_DOCS=(doc/)
autotools-utils_src_install
insinto /etc
- newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf || die
- newconfd "${FILESDIR}/${BRANCH}/rsyslog.confd" rsyslog || die
- newinitd "${FILESDIR}/${BRANCH}/rsyslog.initd" rsyslog || die
+ newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
+ newconfd "${FILESDIR}/${BRANCH}/rsyslog.confd" rsyslog
+ newinitd "${FILESDIR}/${BRANCH}/rsyslog.initd" rsyslog
keepdir /var/spool/rsyslog
keepdir /etc/ssl/rsyslog
keepdir /etc/rsyslog.d
if use mysql; then
insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/{createDB.sql,contrib/delete_mysql} || die
+ doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
fi
if use postgres; then
insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql || die
+ doins plugins/ompgsql/createDB.sql
fi
insinto /etc/logrotate.d/
- newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog || die
+ newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
}
pkg_postinst() {
next reply other threads:[~2011-05-11 21:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 21:07 Alexys Jacob [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-12 15:22 [gentoo-commits] dev/ultrabug:master commit in: app-admin/rsyslog/ Alexys Jacob
2011-05-12 16:07 Alexys Jacob
2011-08-22 15:59 Alexys Jacob
2011-08-31 10:04 Alexys Jacob
2011-08-31 10:15 Alexys Jacob
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=e0a51cdae98ac667f83fde53d15079e5ba42efdb.ultrabug@gentoo \
--to=ultrabug@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