From 8850a1ff90facedd3d077eaf8ac5c32b39fba760 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 3 Aug 2018 02:57:46 +0200 Subject: [PATCH] app-admin/rsyslog: restructure FILESDIR "8-stable" sub directory is not needed anymore since upstream has changed release/version schema long time ago (in 2014). Package-Manager: Portage-2.3.44, Repoman-2.3.10 --- .../files/{8-stable => }/50-default-r1.conf | 0 .../files/{8-stable => }/README.gentoo | 0 .../rsyslog-8.35.0-fix-issue2719.patch | 0 .../rsyslog-8.35.0-fix-issue2726.patch | 0 .../files/{8-stable => }/rsyslog-r1.logrotate | 0 .../rsyslog/files/{8-stable => }/rsyslog.conf | 0 .../files/{8-stable => }/rsyslog.confd-r1 | 0 .../files/{8-stable => }/rsyslog.initd-r1 | 2 +- app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild | 20 ++++++++----------- app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild | 14 ++++++------- 10 files changed, 15 insertions(+), 21 deletions(-) rename app-admin/rsyslog/files/{8-stable => }/50-default-r1.conf (100%) rename app-admin/rsyslog/files/{8-stable => }/README.gentoo (100%) rename app-admin/rsyslog/files/{8-stable => }/rsyslog-8.35.0-fix-issue2719.patch (100%) rename app-admin/rsyslog/files/{8-stable => }/rsyslog-8.35.0-fix-issue2726.patch (100%) rename app-admin/rsyslog/files/{8-stable => }/rsyslog-r1.logrotate (100%) rename app-admin/rsyslog/files/{8-stable => }/rsyslog.conf (100%) rename app-admin/rsyslog/files/{8-stable => }/rsyslog.confd-r1 (100%) rename app-admin/rsyslog/files/{8-stable => }/rsyslog.initd-r1 (97%) diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf b/app-admin/rsyslog/files/50-default-r1.conf similarity index 100% rename from app-admin/rsyslog/files/8-stable/50-default-r1.conf rename to app-admin/rsyslog/files/50-default-r1.conf diff --git a/app-admin/rsyslog/files/8-stable/README.gentoo b/app-admin/rsyslog/files/README.gentoo similarity index 100% rename from app-admin/rsyslog/files/8-stable/README.gentoo rename to app-admin/rsyslog/files/README.gentoo diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch rename to app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch rename to app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate b/app-admin/rsyslog/files/rsyslog-r1.logrotate similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate rename to app-admin/rsyslog/files/rsyslog-r1.logrotate diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf b/app-admin/rsyslog/files/rsyslog.conf similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog.conf rename to app-admin/rsyslog/files/rsyslog.conf diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/rsyslog.confd-r1 similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 rename to app-admin/rsyslog/files/rsyslog.confd-r1 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/rsyslog.initd-r1 similarity index 97% rename from app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 rename to app-admin/rsyslog/files/rsyslog.initd-r1 index 7d7aa4bc9313b..f34bacb7511b0 100644 --- a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 +++ b/app-admin/rsyslog/files/rsyslog.initd-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"} diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild index 3ff1c28e0acdc..55f6815d83a2e 100644 --- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild @@ -9,8 +9,6 @@ inherit autotools eutils linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" HOMEPAGE="https://www.rsyslog.com/" -BRANCH="8-stable" - if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" @@ -49,8 +47,8 @@ else " PATCHES=( - "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch - "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch + "${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch + "${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch ) fi @@ -183,7 +181,6 @@ src_configure() { --disable-generate-man-pages --without-valgrind-testbench $(use_enable test testbench) - $(use_enable curl libcurl) # Input Plugins without depedencies --enable-imdiag --enable-imfile @@ -221,7 +218,6 @@ src_configure() { $(use_enable debug) $(use_enable debug diagtools) $(use_enable debug memcheck) - $(use_enable debug rtinst) $(use_enable debug valgrind) # Misc $(use_enable curl fmhttp) @@ -298,15 +294,15 @@ src_install() { local DOCS=( AUTHORS ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo + "${FILESDIR}"/README.gentoo ) use doc && local HTML_DOCS=( "${S}/docs/build/." ) default - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} keepdir /var/empty/dev keepdir /var/spool/${PN} @@ -314,13 +310,13 @@ src_install() { keepdir /etc/${PN}.d insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf + newins "${FILESDIR}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf + newins "${FILESDIR}/50-default-r1.conf" 50-default.conf insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN} + newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} if use mysql; then insinto /usr/share/doc/${PF}/scripts/mysql diff --git a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild index 27d2078ef8fd0..7e8144dac25a2 100644 --- a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild @@ -9,8 +9,6 @@ inherit autotools eutils linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" HOMEPAGE="https://www.rsyslog.com/" -BRANCH="8-stable" - if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" @@ -307,15 +305,15 @@ src_install() { local DOCS=( AUTHORS ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo + "${FILESDIR}"/README.gentoo ) use doc && local HTML_DOCS=( "${S}/docs/build/." ) default - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} keepdir /var/empty/dev keepdir /var/spool/${PN} @@ -323,13 +321,13 @@ src_install() { keepdir /etc/${PN}.d insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf + newins "${FILESDIR}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf + newins "${FILESDIR}/50-default-r1.conf" 50-default.conf insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN} + newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} if use mysql; then insinto /usr/share/doc/${PF}/scripts/mysql