From d1849ceeb9c09150c11cc0d112883cfba503af27 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Jul 2023 01:09:27 +0100 Subject: gentoo auto-resync : 21:07:2023 - 01:09:27 --- app-admin/metalog/Manifest | 5 +- .../files/metalog-20230719-metalog-conf.patch | 13 ++++ app-admin/metalog/metalog-20230707.ebuild | 70 --------------------- app-admin/metalog/metalog-20230719.ebuild | 72 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 72 deletions(-) create mode 100644 app-admin/metalog/files/metalog-20230719-metalog-conf.patch delete mode 100644 app-admin/metalog/metalog-20230707.ebuild create mode 100644 app-admin/metalog/metalog-20230719.ebuild (limited to 'app-admin/metalog') diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest index 8e8dad7f64ab..62d1a17a4e12 100644 --- a/app-admin/metalog/Manifest +++ b/app-admin/metalog/Manifest @@ -1,10 +1,11 @@ AUX consolelog.sh-r1 276 BLAKE2B 0db3c2201f4d628a4e650b39aa17998e0523bc33861375d3bebd2729e649451793ebed46bfbdfee5c56d79902c489152d57d6e3951a19dbb872e5e1f9711e11d SHA512 022bc6510cf744e1beded8999f61e87ae31dbb151d5abbc4acee6f37a46684edcceb5259d6ea25e0ceea5a3056bb50fde869e97371678f302269b31be2cade0b AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c806fc8bb90b86ca6357fea949ff6f231b42b37fdf2f044541c07fbbc4b0a67db4d6dcdcb18c9cd5091e2c3106bb4fc34 SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df +AUX metalog-20230719-metalog-conf.patch 387 BLAKE2B 18dfdb4f24d2b0b6ddf9fcbb92a2b3fa34d59985fd502850a38b2e84f6638275b52efd07c9b317b444bcd765d3bdf06f6572367150aa71e1c8f8a96b52519e01 SHA512 8c54f5e04b37747ebd6a23d45dd94b477c6900552724861cd49564232e0c0a2c9b225622a836dfe063d60e3e6e67840274d64b25e0c401b0430adb18bbc6a0e0 AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7f67e6cd347ef3361fe7212ce1441ba4a582cb0e59f8b2c9d2e7832b4e8b4f019c87d268a2833639f0 SHA512 09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8 DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd -DIST metalog-20230707.tar.gz 41729 BLAKE2B e027b918c3b6d795459d9b219a5d84a7813a27b48b6be9e059c19dd2ea546d24e48724360968a2078be8b81b32b296d5444389616afdc16ce9234fd105ee37c9 SHA512 ab341f5f2ac757e4579a1f4fad2a92fd446fe7e930e95e55231830d88bf177f79102f99554b56da0529aaa6fc37c02863824705bde2f47546d44284ab13538b9 +DIST metalog-20230719.tar.gz 42579 BLAKE2B 6088c86fad90185fcb22a96ff88686647eac1fb4216884f43c07dff23274efc748c908f6f98162f743d2528437748f79809dfe6911d8d47e6cf7e58c8f3ca3b4 SHA512 a717dca5e00e9e66b97a84c3dbb0cdda522cbe628fad4cfbcb5256ee69659c63149bbb1e8797028bbab55d97787661c1d7316c7c2cbfe3b65932f84d64af15f6 EBUILD metalog-20220214.ebuild 1596 BLAKE2B 53c041f5274b99fadb2f50447e0586b4c6ff50cef2352fa6ccd94fb81b5415e5c19eb7fa5ead9a78790005ecab64bbb116a24c4503c60ee7aa7757adf2bfbfc8 SHA512 ff8ce0ffb00b10176481a91488a99a143f50989f987901d0f92eaa84dbe48c7eec0da7b5552498fe89121ccf2f0f4731a5c44ce2f29d625f85adffaed6f73785 -EBUILD metalog-20230707.ebuild 1610 BLAKE2B d520fc2a1e579d4cc351029abd6774b6f38e38d5441a5c390edd384427e08135ec73bc100b31f8c1b296fa6a02f8da9466452cf6289cfaed4aa40ceb55fcbc41 SHA512 020a787671af37e15e6571077ee26c64c15a248dee78127af4761e770bef12b179d672b9185f9ea03c774000aa0265c69abf676a15b4b7adbeff461c6d49210b +EBUILD metalog-20230719.ebuild 1620 BLAKE2B 4a1576b0815ff4b652d3e0743a38f42d54f187bb93b2960784383cb685d4d00b40c32dea8805508faaae54b33de9bd75449d3ae068f04e78a3b476087ac5c62e SHA512 c15ec77bce5ec82013a5346342f59efd57a6890cd0046d1832ea5a3f2cdabc964e0733c5c54bef89805cef47a20e1aeb70441ba83693ebd72c9fdca7d60fd896 MISC metadata.xml 390 BLAKE2B 84c414c7f1c23c5eff546e465a36844c13f5f774c0e53117a1d3584af4f16a1bebeba681f6714af316437f2125ee2f65f0a1fb110699438e8d6a28f4aa0fd6f8 SHA512 5656e552504213e621d2804cc877f623feb243a166b7da0507a3ac1d934db9d438b6d087ba9d7b0d2c38551227bd0c190e42374771bdc4422fc263b894101998 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/metalog-20230707.ebuild b/app-admin/metalog/metalog-20230707.ebuild deleted file mode 100644 index 91000efc30e5..000000000000 --- a/app-admin/metalog/metalog-20230707.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 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" -IUSE="unicode" - -RDEPEND=" - dev-libs/libpcre2 -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9-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 -} diff --git a/app-admin/metalog/metalog-20230719.ebuild b/app-admin/metalog/metalog-20230719.ebuild new file mode 100644 index 000000000000..4e0803b008b6 --- /dev/null +++ b/app-admin/metalog/metalog-20230719.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 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=" + sys-devel/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 +} -- cgit v1.2.3