diff options
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/Manifest.gz | bin | 32014 -> 32017 bytes | |||
| -rw-r--r-- | app-admin/rsyslog/Manifest | 6 | ||||
| -rw-r--r-- | app-admin/rsyslog/rsyslog-8.2404.0.ebuild (renamed from app-admin/rsyslog/rsyslog-8.2310.0.ebuild) | 44 |
3 files changed, 27 insertions, 23 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 2584af3efe2f..ad39ae310e2e 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 3bb3f43d1ea8..1b9087e15825 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -6,13 +6,13 @@ AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039 -DIST rsyslog-8.2310.0.tar.gz 3349174 BLAKE2B df451f473fdf1714d2ff2bf92afe5e53d00395eb21508fd00c628784fa577aaf6fed597f79c99e64f62bd3a5eadde0748ce08e6c082a24a507fa687055599d70 SHA512 f04e14ede8c35e1799eadc711a6e99dbe56d312c7909c7ebed4d4bd489d310a44a5c2d3ed23968fbf3ccff5b580870d0f3ceeb690deb1d1424420fc9d3220696 DIST rsyslog-8.2312.0.tar.gz 3358109 BLAKE2B 8b463c07a44efa60b6faeaa466498a2540eefc158efa759479cc6fc36acb04a718dd6ee4015f311343e6b66b6e074d5ed40db29cbcad6c71b42286a58cb92d7c SHA512 a65ca1c6fe2d9dd853d073d93cfd4d007c3533bd10c633113fcf94c4746192945ed0a2b2ff84f9174b55de90ade2a062a0bd556ffe375864fad3772ef8ce39e3 DIST rsyslog-8.2402.0.tar.gz 3404026 BLAKE2B fc33244f0e4699d446ffab19aa8078ac49518b1722a5d7e72e57d7768ef42565bc3fa54b6c594e857715b5d5439ef675811eee888c81aadec3d1e05d5416c51e SHA512 dea9a14abc6ea25b3e5b676eda6a772c0c6266afd95eea0446ea85b29b2f98c058e1495cbdc16dba1c78d5d0919980e4fdfc13ef597082e7f3bf8b6be4cb5723 -DIST rsyslog-doc-8.2310.0.tar.gz 6674428 BLAKE2B e951d564a63c57c1d9d130a315c4bc9f4c25c9cfaf83bece1bbda582eb40260f000c7d9805faca550d8df7b0f6074aff6cc86ff877706cad69909040c3dff5b1 SHA512 cf452f3705680fc81495e940ea7d5ae705a6dbfe0e2ce5a87865c3043f79daaec243df20e8aadd9fac6144a3df8f19d7c56fdf19ec68df78e2fdaffa45096143 +DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1 DIST rsyslog-doc-8.2312.0.tar.gz 6621561 BLAKE2B 2aca14d24606e3a125259cad5fa43af61da2b70ba0b1916e5496f3d4eb6a28b612287bb83c3fa610f0f367deedcec4f0b3e93a552643194fdcf552dff3d408b6 SHA512 2fe8ab0e37a6899a545c09ea2586c33ab89a3e3d93ff079f99b15e9b1743423bbe54931684ba8509ed4f578a4b55ea22f6306aca256ee2245f88115a5f44e400 DIST rsyslog-doc-8.2402.0.tar.gz 6525910 BLAKE2B 20bc3398db00cc2a0e92b610032cb86bcf17b71b31f70a47213b608c7ea9a1a81e9aad5caa74b7f23f0a28fdab7ef3627ec89f5910d535ac1ade5408b3300939 SHA512 dfffb6138cff6121020648c7ed20cec7c881020af956295f88ea297c3198ed6dd49a7fbcb651164c6a774520391d00743a3c34c7acc5f705b668c8048c289eea -EBUILD rsyslog-8.2310.0.ebuild 13424 BLAKE2B 0f0b68dc92f0755565d00dc059e57266eef980fb9f17a59b903c612fdafcbf9a31aaaad3f36db49229c2e7ccd8773d92918f34ce13116274272cfea519ac9222 SHA512 d6c149f0101f720225c3e1cf29248ad71bc67fa58711e13db441f8e0604d8380dcdef89cb725c98adf946bc408bb9863bb437809147377d3ac589192c71c355b +DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264 EBUILD rsyslog-8.2312.0.ebuild 13437 BLAKE2B 3b2f391562688f65e731ff1c92e4abf36b90dfe59aec1de95082457f79782f13e664a1a9600f9bd16a15af3a01d411aeb3a411f7f8953435d77116c7825ebf48 SHA512 dbb4a85d9adc4a1c39663353da053bcd1f330f54a91e1a38063767a9cec70663d1f78a84755b02d6757b9b7d5bd69a2afd62ef08a6279cf4a22a54cc81e10091 EBUILD rsyslog-8.2402.0.ebuild 13433 BLAKE2B 69d67212c301414dbf2d65d400afef63078ddf7b599a7979b63ca04cd8915ffc5faa0d02151ab4c267ce31098219785d81e29d6a596a564121e4080abb92f16b SHA512 1c142b36b54d5ed6fa43cf86aad8d68ea16d9e70908946c369f876d31e76e617d9580d54065a56a9fb18893a4ba090da42526a39db6e668a9279d5f922faa76f +EBUILD rsyslog-8.2404.0.ebuild 13436 BLAKE2B bd0118ecceabca923ee48a2456ae8277088baefda082113bba257987b40c16b89d27b2e081549485aa8aa98535ddd50809b69cb1edf4b827e1c4390ed35eab12 SHA512 b052581a91e21d38522096e98a0d06c18f4541f61530f553e0fce0fdb0a91c97d0f6f6e0357373256a1eee911b877bc9dbb430dc49772a5aa513c5bac21b043d MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365 diff --git a/app-admin/rsyslog/rsyslog-8.2310.0.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild index 94d0e88e7958..bb01f397f550 100644 --- a/app-admin/rsyslog/rsyslog-8.2310.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild @@ -3,26 +3,28 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="https://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/ + https://github.com/rsyslog/rsyslog/" -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" inherit git-r3 else - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" - SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + doc? ( + https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz + ) " + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -107,7 +109,7 @@ DEPEND=" elibc_musl? ( sys-libs/queue-standalone ) " -if [[ ${PV} == "9999" ]]; then +if [[ "${PV}" == "9999" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" BDEPEND+=" >=app-alternatives/lex-2.5.39-r1" BDEPEND+=" >=app-alternatives/yacc-2.4.3" @@ -117,26 +119,27 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" -PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) +PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" ) pkg_setup() { use test && python-any-r1_pkg_setup } src_unpack() { - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then git-r3_fetch git-r3_checkout else - unpack ${P}.tar.gz + unpack "${P}.tar.gz" fi if use doc; then - if [[ ${PV} == "9999" ]]; then + if [[ "${PV}" == "9999" ]]; then local _EGIT_BRANCH= if [[ -n "${EGIT_BRANCH}" ]]; then # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} + _EGIT_BRANCH="${EGIT_BRANCH}" + unset EGIT_BRANCH fi @@ -151,7 +154,8 @@ src_unpack() { cd "${S}" || die "Cannot change dir into '${S}'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${PN}-doc-${PV}.tar.gz + + unpack "${PN}-doc-${PV}.tar.gz" fi fi } @@ -189,12 +193,12 @@ src_configure() { # upstream PR 129 and 136) so we need to export HIREDIS_* # variables because rsyslog's build system depends on pkg-config. - if use redis; then + if use redis ; then export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" fi - local myeconfargs=( + local -a myeconfargs=( --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench @@ -283,7 +287,6 @@ src_configure() { $(use_enable uuid) $(use_enable zeromq imczmq) $(use_enable zeromq omczmq) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) econf "${myeconfargs[@]}" @@ -328,13 +331,13 @@ src_test() { } src_install() { - local DOCS=( + local -a DOCS=( AUTHORS ChangeLog "${FILESDIR}"/README.gentoo ) - use doc && local HTML_DOCS=( "${S}/docs/build/." ) + use doc && local -a HTML_DOCS=( "${S}/docs/build/." ) default @@ -407,9 +410,10 @@ pkg_postinst() { } pkg_config() { - if ! use ssl; then + if ! use ssl ; then einfo "There is nothing to configure for rsyslog unless you" einfo "used USE=ssl to build it." + return 0 fi |