commit: cadafb1c7f18fdc2f619d05de8624b5997056dd1 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Dec 26 09:10:38 2022 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Dec 26 09:10:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cadafb1c
app-misc/carbon-c-relay-3.7.4-r2: revbump for pcre removal libpcre is EOL, use libpcre2 or oniguruma instead Closes: https://bugs.gentoo.org/886529 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-misc/carbon-c-relay/Manifest | 1 - .../carbon-c-relay/carbon-c-relay-3.7.2-r1.ebuild | 58 ---------------------- ...3.7.4.ebuild => carbon-c-relay-3.7.4-r2.ebuild} | 26 ++++------ 3 files changed, 11 insertions(+), 74 deletions(-) diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest index 7a577435272b..c39232681687 100644 --- a/app-misc/carbon-c-relay/Manifest +++ b/app-misc/carbon-c-relay/Manifest @@ -1,3 +1,2 @@ -DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826 DIST carbon-c-relay-3.7.3.tar.gz 575680 BLAKE2B d2d07c7f1ec356a16bb375bd740ffa018a0d256ef1ce97ae0555001411a05e28173c2009f3980b0d711977068392b5a0baca68f9dda3a677c7c3d245cad70a0e SHA512 ba3e4b7173abe5e3b018413a8d46d91c3f433e785dcf3d7643836b91f9a6ff993b22c3db51192476c75d45486d1e2541ad73056671b4bdbfd1447dcfc3f26ff3 DIST carbon-c-relay-3.7.4.tar.gz 584098 BLAKE2B 27fe6d7b785129aa6edd81e0a92880eee3530249900662e63f1ad7a9c1b4c8f9ff98635989311de964e4c42d4bb98f3ce1956ed170b8eceeea558ec3c191f45e SHA512 a9bcaa699e071e57e0a9092b97d1ead6781af4e00ef19f289a986c5baf56dec2c747961dfc2622285de034c17ce7ed2f5a7c856d617b26488dbdea58c4d72754 diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2-r1.ebuild deleted file mode 100644 index 09b7c5973e5f..000000000000 --- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" -HOMEPAGE="https://github.com/grobian/carbon-c-relay"; -SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma" - -# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc) -# unforunately pcre is in global USE, so we have to exclude that here -REQUIRED_USE=" - pcre2? ( !oniguruma ) - oniguruma? ( !pcre2 ) -" -RDEPEND="lz4? ( app-arch/lz4 ) - snappy? ( app-arch/snappy ) - zlib? ( app-arch/gzip ) - ssl? ( dev-libs/openssl:0= ) - !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) - pcre2? ( dev-libs/libpcre2 ) - oniguruma? ( dev-libs/oniguruma ) - acct-group/carbon - acct-user/carbon" -DEPEND="${RDEPEND}" - -src_configure() { - local pcrecfg - if use !pcre2 && use !oniguruma ; then - pcrecfg=$(use_with pcre) - else - pcrecfg="--without-pcre" - fi - - econf $(use_with lz4) $(use_with snappy) \ - $(use_with ssl) $(use_with zlib gzip) \ - "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma) -} - -src_install() { - default - - # rename too generic name - mv "${ED}"/usr/bin/{relay,${PN}} || die - - # remove libfaketime, necessary for testing only - rm -f "${ED}"/usr/$(get_libdir)/libfaketime.* - - dodoc ChangeLog.md - - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} -} diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r2.ebuild similarity index 64% rename from app-misc/carbon-c-relay/carbon-c-relay-3.7.4.ebuild rename to app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r2.ebuild index 3f113f11f9cd..96bc608baa65 100644 --- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4.ebuild +++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r2.ebuild @@ -10,10 +10,9 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P} LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma" +IUSE="lz4 snappy zlib ssl pcre2 +oniguruma" -# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc) -# unforunately pcre is in global USE, so we have to exclude that here +# ensure only one of pcre2 and oniguruma is set, or none (libc) REQUIRED_USE=" pcre2? ( !oniguruma ) oniguruma? ( !pcre2 ) @@ -22,7 +21,6 @@ RDEPEND="lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) ssl? ( dev-libs/openssl:0= ) - !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma ) acct-group/carbon @@ -30,16 +28,14 @@ RDEPEND="lz4? ( app-arch/lz4 ) DEPEND="${RDEPEND}" src_configure() { - local pcrecfg - if use !pcre2 && use !oniguruma ; then - pcrecfg=$(use_with pcre) - else - pcrecfg="--without-pcre" - fi - - econf $(use_with lz4) $(use_with snappy) \ - $(use_with ssl) $(use_with zlib gzip) \ - "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma) + econf \ + $(use_with lz4) \ + $(use_with snappy) \ + $(use_with ssl) \ + $(use_with zlib gzip) \ + --without-pcre \ + $(use_with pcre2) \ + $(use_with oniguruma) } src_install() { @@ -53,6 +49,6 @@ src_install() { dodoc ChangeLog.md - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} }
