diff options
Diffstat (limited to 'app-admin/metalog')
| -rw-r--r-- | app-admin/metalog/Manifest | 3 | ||||
| -rw-r--r-- | app-admin/metalog/files/metalog-20230719-metalog-conf.patch | 13 | ||||
| -rw-r--r-- | app-admin/metalog/metadata.xml | 3 | ||||
| -rw-r--r-- | app-admin/metalog/metalog-20220214.ebuild (renamed from app-admin/metalog/metalog-20200113-r1.ebuild) | 20 | ||||
| -rw-r--r-- | app-admin/metalog/metalog-20230719.ebuild | 72 |
5 files changed, 99 insertions, 12 deletions
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest index d99dd76fd94a..24d3adf61687 100644 --- a/app-admin/metalog/Manifest +++ b/app-admin/metalog/Manifest @@ -1 +1,2 @@ -DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93 +DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd +DIST metalog-20230719.tar.gz 42579 BLAKE2B 6088c86fad90185fcb22a96ff88686647eac1fb4216884f43c07dff23274efc748c908f6f98162f743d2528437748f79809dfe6911d8d47e6cf7e58c8f3ca3b4 SHA512 a717dca5e00e9e66b97a84c3dbb0cdda522cbe628fad4cfbcb5256ee69659c63149bbb1e8797028bbab55d97787661c1d7316c7c2cbfe3b65932f84d64af15f6 diff --git a/app-admin/metalog/files/metalog-20230719-metalog-conf.patch b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch new file mode 100644 index 000000000000..504c2a28291f --- /dev/null +++ b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch @@ -0,0 +1,13 @@ +diff --git a/metalog.conf b/metalog.conf +index 8f53b87..54332c6 100644 +--- a/metalog.conf ++++ b/metalog.conf +@@ -44,6 +44,8 @@ maxfiles = 5 + # merely write $@ to some device (your console for messages): + # echo "$@" > /dev/tty10 + # ++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog ++# + #console logging: + # facility = "*" + # command = "/sbin/consolelog.sh" diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml index cf5328e7d009..61646ab7d054 100644 --- a/app-admin/metalog/metadata.xml +++ b/app-admin/metalog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">metalog</remote-id> + <remote-id type="github">hvisage/metalog</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/metalog/metalog-20200113-r1.ebuild b/app-admin/metalog/metalog-20220214.ebuild index 0d7d5d920584..4d63d0832473 100644 --- a/app-admin/metalog/metalog-20200113-r1.ebuild +++ b/app-admin/metalog/metalog-20220214.ebuild @@ -1,32 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools systemd DESCRIPTION="A highly configurable replacement for syslogd/klogd" HOMEPAGE="https://github.com/hvisage/metalog" SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="unicode" -RDEPEND=">=dev-libs/libpcre-3.4" +RDEPEND="dev-libs/libpcre2" DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/autoconf-archive +BDEPEND="dev-build/autoconf-archive virtual/pkgconfig" -S="${WORKDIR}/${PN}-${P}" - PATCHES=( "${FILESDIR}"/${PN}-0.9-metalog-conf.patch ) src_prepare() { default + eautoreconf } @@ -43,7 +43,7 @@ src_install() { newinitd "${FILESDIR}"/metalog.initd-r1 metalog newconfd "${FILESDIR}"/metalog.confd metalog - systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service } pkg_preinst() { @@ -59,8 +59,8 @@ pkg_preinst() { pkg_postinst() { if ${MOVED_METALOG_CONF} ; then ewarn "The default metalog.conf file has been moved" - ewarn "from /etc/metalog/metalog.conf to just" - ewarn "/etc/metalog.conf. If you had a standard" + ewarn "from ${EROOT}/etc/metalog/metalog.conf to just" + ewarn "${EROOT}/etc/metalog.conf. If you had a standard" ewarn "setup, the file has been moved for you." fi } diff --git a/app-admin/metalog/metalog-20230719.ebuild b/app-admin/metalog/metalog-20230719.ebuild new file mode 100644 index 000000000000..623f82164f01 --- /dev/null +++ b/app-admin/metalog/metalog-20230719.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="A highly configurable replacement for syslogd/klogd" +HOMEPAGE="https://github.com/hvisage/metalog" +SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="unicode" + +RDEPEND=" + dev-libs/libpcre2 +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/metalog-20230719-metalog-conf.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf $(use_with unicode) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog README NEWS metalog.conf + + into / + newsbin "${FILESDIR}"/consolelog.sh-r1 consolelog.sh + + newinitd "${FILESDIR}"/metalog.initd-r1 metalog + newconfd "${FILESDIR}"/metalog.confd metalog + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service +} + +pkg_preinst() { + if [[ -d "${ROOT}"/etc/metalog && ! -e "${ROOT}"/etc/metalog.conf ]] ; then + mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf + rmdir "${ROOT}"/etc/metalog + export MOVED_METALOG_CONF=true + else + export MOVED_METALOG_CONF=false + fi +} + +pkg_postinst() { + if ${MOVED_METALOG_CONF} ; then + ewarn "The default metalog.conf file has been moved" + ewarn "from ${EROOT}/etc/metalog/metalog.conf to just" + ewarn "${EROOT}/etc/metalog.conf. If you had a standard" + ewarn "setup, the file has been moved for you." + fi +} |