From 63a01a3024a6fa402d123768cd38f1cabe13adf6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Mar 2024 07:12:54 +0000 Subject: gentoo auto-resync : 28:03:2024 - 07:12:54 --- dev-util/Manifest.gz | Bin 65258 -> 65256 bytes dev-util/ccache/Manifest | 3 - dev-util/ccache/ccache-4.9.ebuild | 131 ---------------------------------- dev-util/pkgconf/Manifest | 2 + dev-util/pkgconf/pkgconf-2.2.0.ebuild | 73 +++++++++++++++++++ 5 files changed, 75 insertions(+), 134 deletions(-) delete mode 100644 dev-util/ccache/ccache-4.9.ebuild create mode 100644 dev-util/pkgconf/pkgconf-2.2.0.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 76c0c99ae60f..77b1b0752734 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index ac9cf93a1f0f..a7c37ad0f48f 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -10,10 +10,7 @@ DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c SHA512 870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467 DIST ccache-4.9.1.tar.xz 583764 BLAKE2B 9ebaf335fda54666e4bfc8f2c402f2b908b3922f3898b6a739b0256481256c6121546021b80fd2dbc93f3aea254db63a8624b97b2820b88e73e502a243bf2562 SHA512 5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B a157b0c2c0777732d9a51fb7519f561fac098bbac9ba33fe453b210a6e9a34372b5d00b0fa940d2b783ab0eb48e7bc98707de884b191d83120d9ad8239c9fb76 SHA512 43605eca0f9a62565486c6c7ff622fc4d18a400518aa9c9e3c9d865a99c40c63a6a09d42ccd3428d28575c4de8a69be89c93830d26261d3479792e67179d0839 -DIST ccache-4.9.tar.xz 583744 BLAKE2B 682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675 SHA512 04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563 -DIST ccache-4.9.tar.xz.asc 833 BLAKE2B ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2 SHA512 2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa EBUILD ccache-4.8.3.ebuild 3752 BLAKE2B 0f308f104c92a68219f1a54b2122f6913030eaa59d72fe8730d0cdeff62d4db234146d4d2e6abed64f5c86b770ea335c8a06788590b6d23d040d869ab8e3347c SHA512 bec7baf39f9f603fa242be8bfba506431e1de7e8c8f182a6f1b15fe14823748478dc24db2672282831baadb65153a1a20d19441ced32c56f0da6ec2ccd68d190 EBUILD ccache-4.9.1-r1.ebuild 3793 BLAKE2B fea414050268f8e482cb1a15eb475306767a69e032c92f210a7f248b0f20fcb0077cce80e2d54e054271c11e73637d977c94e9585a69bb4be596ba8b06defbb8 SHA512 f0761dc2a39ad24cfae310fb3f0690389809ae3e482d15e0fea893d96fc06099ebebb17e8f15af5f6fb2c0a46cfb99b99e8b7449054680f122b97c2fe9ad218d EBUILD ccache-4.9.1.ebuild 3753 BLAKE2B 063506fa6e15a4eb56b9c73e72a99b5a36572834a3ffe431bb4a45e24b36bbe4b346651ccd5a37752ef026469d3ff8dd0a1fcfcb1001dc42e7596db4ccd33dc5 SHA512 77182f3bb63c2f301af8fc46b8c8a530a848e720bed2585d998b7895c7d83fc8aaec529e4af5f48835d48d35bc65a133b7d33538adef755cc264f7b85366a158 -EBUILD ccache-4.9.ebuild 3760 BLAKE2B 2609fa81c3b2eecb895c9c97156af0259dff8fbdd4f29667272100f8fbfa8da3c7ebd225cf188f72c4b13c0230b372ba7b58b18d9c01da57a34df49743b93046 SHA512 01b76e8e9c3d048dc1f2f9fb33106c3da10320049242a571a4ee433af0d26a3b5e718defd540dbf7a642ca898efffe947b804e2d791ef9587e41c58e2db3b621 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1 diff --git a/dev-util/ccache/ccache-4.9.ebuild b/dev-util/ccache/ccache-4.9.ebuild deleted file mode 100644 index ae1a041c2953..000000000000 --- a/dev-util/ccache/ccache-4.9.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu -# because Portage unsets them. Aaaah! -# -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -: ${MY_DOCS_PREBUILT:=1} - -MY_DOCS_PREBUILT_DEV=sam -MY_DOCS_VERSION=$(ver_cut 1-2) -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# See bug #784815 -MY_DOCS_USEFLAG="+doc" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic prefix verify-sig - -DESCRIPTION="Fast compiler cache" -HOMEPAGE="https://ccache.dev/" -SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )" -if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )" - MY_DOCS_USEFLAG="doc" -fi - -# https://ccache.dev/license.html -LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )" -LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220 -IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/zstd:= - redis? ( dev-libs/hiredis:= ) -" -RDEPEND=" - ${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions -" -# Needed for eselect calls in pkg_* -IDEPEND="dev-util/shadowman" - -# clang-specific tests use dev-libs/elfutils to compare objects for equality. -# Let's pull in the dependency unconditionally. -DEPEND+=" test? ( dev-libs/elfutils )" -BDEPEND=" - doc? ( dev-ruby/asciidoctor ) - verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) -" - -DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-nvcc-test.patch - "${FILESDIR}"/${PN}-4.0-objdump.patch - "${FILESDIR}"/${PN}-4.9-avoid-run-user.patch -) - -src_unpack() { - # Avoid aborting on the doc tarball - if use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} - fi - - default -} - -src_prepare() { - cmake_src_prepare - - cp "${FILESDIR}"/ccache-config-3 ccache-config || die - eprefixify ccache-config -} - -src_configure() { - # Mainly used in tests - tc-export CC OBJDUMP - - # Avoid dependency on libstdc++.so. Useful for cases when - # we would like to use ccache to build older gcc which injects - # into ccache locally built (possibly outdated) libstdc++ - # See bug #761220 for examples. - # - # Ideally gcc should not use LD_PRELOAD to avoid this type of failure. - use static-c++ && append-ldflags -static-libstdc++ - - local mycmakeargs=( - -DENABLE_DOCUMENTATION=$(usex doc) - -DENABLE_TESTING=$(usex test) - -DZSTD_FROM_INTERNET=OFF - -DHIREDIS_FROM_INTERNET=OFF - -DREDIS_STORAGE_BACKEND=$(usex redis) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8] - fi -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ -z ${ROOT} ]] ; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index 33066f100a11..389b5c02914b 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,6 +1,8 @@ DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba DIST pkgconf-2.1.1.tar.xz 311956 BLAKE2B b59e57b1118bb75bc946a1e65e037a172c2ade3a7b9da8404b3598833cd091600045de151f2db06453b23563501b2dff7fdda8967e14c0c933ac50d28ddb3cd0 SHA512 cdf0998cd87f6d5e5a6560037eb847fd9613d237858d26eec321c42f54ca40ac72b6749c48c5b32611841d701393b1217bdb6c0cba5efd2c138be10d0e8fb32d +DIST pkgconf-2.2.0.tar.xz 311920 BLAKE2B c2a89e932e7671785799f4b82beb75e92f246c152c03e88c847cedef39f2123da0544ff914d1c1512b8616f8b8cfd9f5115b33560042bcfa7ac5f78c0ceb2a27 SHA512 c4ff254c7323bdebc2595037df60e33f17fc5c222d7500a4b9d8b18c8b451ac35cd3ac90d31c920c23e9495ece2b82422de61e13286d43de3a5d1fe8211bd944 EBUILD pkgconf-1.8.1.ebuild 1557 BLAKE2B 713707b02b74f5abbee292446c94ee2dff2040b01bae387f541a610aa9332f8bd4b094932f1f4e806c8db3da0ad2e7a8f8f1328fcacf7801de6f6c5d5cb2d331 SHA512 fe9f9aedf8f38686d5d83a9f17355955d1da48e0e3eed4176a37b36f8417b5b0d2c8d84ee2d3e98f9484b3a5a2f82e2d6a87f1aeb4dece86a7ad938fa3e944cc EBUILD pkgconf-2.1.1.ebuild 1627 BLAKE2B 2168a470e373fda42f1d4fe3ae70508c162d7fc06e7bb6bb1445ee933b80fe21d29d687800b0ca59e07c3e3db84777ff05e282ab219775bc62bf2ede3aed9428 SHA512 871885809ddf79fe02f02072d2a814a1ce063313679430c4996797271db4936f5dc14cb1ae845e8bb23eb4274ba52288f4785c28149ad9999f71d05b1062ea6d +EBUILD pkgconf-2.2.0.ebuild 1635 BLAKE2B 1711346ff25b3b4f03b28fc1a39241e6e1bc641e728e2568bd4c05c5d82d6aed814f41a7f24cdc5bd7174c2a5c72476a708fc46d8b01df5de61afd58eaeed456 SHA512 049f86c9dd851bd13976c399cfd7bb0a808ae5ca30c0c662b95249bb7da03815181c6d5ffeb91317229fa8bd8723fe3ebb92e6852de2ce978b3942a972f9b31d EBUILD pkgconf-9999.ebuild 1635 BLAKE2B 9c7892b34711442d3e81525efa7c2898759075569456c64ff110d973cdfcbd1ffb7c4d7bec337149ffb237a0a43ebc5b7f38a9a1927d3e10ac6326387de810f3 SHA512 be2a5add715c6dfb3faa20fb6e5cc74e65ef600174bf18441fb73e9143f215fa70ac45ca559f36f1ac2d8b4485345b40a768e93b4d4f558c683e23ff36e2dc18 MISC metadata.xml 667 BLAKE2B 38e2c6be57a2584630a634e98651c4cd6d86df6130cba3108c174dab434c5c0f0322a297543106fe543984c44e51c02eaeaa70a841f7fe1c5f70a48595d43b07 SHA512 30813cedabd5bb71c64e74c788d6c2c909d00aa78864a7fb1d2388ff9db23ddb4a8032dfc5767baa585467852a9b423b5c3b04ca22abf299030d196c1534f392 diff --git a/dev-util/pkgconf/pkgconf-2.2.0.ebuild b/dev-util/pkgconf/pkgconf-2.2.0.ebuild new file mode 100644 index 000000000000..46f8e97f290d --- /dev/null +++ b/dev-util/pkgconf/pkgconf-2.2.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 2012-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib multilib-minimal + +if [[ ${PV} == 9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" +else + SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" + +LICENSE="ISC" +SLOT="0/5" +IUSE="+native-symlinks test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND="!dev-util/pkgconfig" + +src_prepare() { + default + + [[ ${PV} == 9999 ]] && eautoreconf + + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local myeconfargs=( + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + + if ! use native-symlinks; then + rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die + fi + + find "${ED}" -type f -name '*.la' -delete || die +} -- cgit v1.2.3