From acfd7c956a7b45da7af1452ec12e0b2d5e6ac65b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Feb 2025 19:26:07 +0000 Subject: gentoo auto-resync : 26:02:2025 - 19:26:07 --- dev-libs/Manifest.gz | Bin 99631 -> 99616 bytes dev-libs/check/Manifest | 1 + dev-libs/check/check-0.15.2-r2.ebuild | 53 +++++++++ dev-libs/libezV24/Manifest | 1 - dev-libs/libezV24/libezV24-0.1.1-r2.ebuild | 37 ------ dev-libs/libwacom/Manifest | 2 +- dev-libs/libwacom/libwacom-2.14.0.ebuild | 2 +- dev-libs/poco/Manifest | 1 - dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch | 13 --- dev-libs/rocm-comgr/Manifest | 1 - .../rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch | 71 ------------ dev-libs/stfl/Manifest | 1 - dev-libs/stfl/stfl-0.24-r4.ebuild | 127 --------------------- 13 files changed, 56 insertions(+), 254 deletions(-) create mode 100644 dev-libs/check/check-0.15.2-r2.ebuild delete mode 100644 dev-libs/libezV24/libezV24-0.1.1-r2.ebuild delete mode 100644 dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch delete mode 100644 dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch delete mode 100644 dev-libs/stfl/stfl-0.24-r4.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 7780fa1c0eb9..627f122ec77e 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest index 1438e0aca8e1..6f528fbdd7a3 100644 --- a/dev-libs/check/Manifest +++ b/dev-libs/check/Manifest @@ -2,4 +2,5 @@ AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f AUX check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch 887 BLAKE2B 7e3828af77a430ef366b2d7855c1fb5f909c9e8b13273e2d89b34711c95e5b930f95d39b21438e115b208f8eb1f4637aec0eb4ab0e6efb293174d9ddbd2946a2 SHA512 eae3e3b2d3f7f59c94af3c39797490247df827450999edadd363d99c373a465aeec913e90656e94d04215268742fb79d049a32bb3910b16b64175f1177de43f8 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e EBUILD check-0.15.2-r1.ebuild 1471 BLAKE2B d836ad8736b8bb3822f69333ea69d31ac597549b4ba65c3177e4565cba0c60ddeb30e8b1d328809421cc979ace8f5659fab744307e1781a4e0b7f34de0890658 SHA512 efc0fe690a27dafddd114a948d82506f4ac0fb33eb5fd109de4f6f044f6c9bbafa67ca563fefc8275901fadad6261b2d2498bbbe1c089c2845bb33293bd2456d +EBUILD check-0.15.2-r2.ebuild 1374 BLAKE2B dad754fcc86d70ff53d4ec2145cd25c6ed7dce228826c11a7dc1ea246c9821ad66d96c0ebc03bc6d151107c5a400e3de3a83fae47da6995c55260bfaa9c2797d SHA512 6b722c51668dab8ebc24d0a109cc6497ab957f49394e9cc61ada55b8f61fbafff25622ed9ad2a54bff26ecca679fc20f485cbd103a6b48b309565231298085ad MISC metadata.xml 489 BLAKE2B f5dbc4485b84b992c52f782c4bfd273ca189d1287c1930d228ca05c2094426f1837cedd0cc871098b3b46321237a1d9d6e09f90da37782727346848f7c4e314e SHA512 0e9877c532a01511532a00399f2dd4a1c310410f57155e4a9a4cfe9a9369c6789cc14cb991370beda468394a40599004cb28f832761b4a8e7cccf7c8f083febd diff --git a/dev-libs/check/check-0.15.2-r2.ebuild b/dev-libs/check/check-0.15.2-r2.ebuild new file mode 100644 index 000000000000..6c569081dac7 --- /dev/null +++ b/dev-libs/check/check-0.15.2-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A unit test framework for C" +HOMEPAGE="https://libcheck.github.io/check/" +SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc subunit test" + +# Tests seem to timeout on ppc* systems, #736661 +RESTRICT="ppc? ( test ) + ppc64? ( test ) + !test? ( test )" + +RDEPEND="subunit? ( dev-python/python-subunit[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + sys-apps/texinfo" +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/check-0.14.0-r2-disable-automagic-dep.patch + "${FILESDIR}"/${P}-Fix-pkgconfig-file-s-libdir-value.patch +) + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF) + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + + if use doc && multilib_is_native_abi; then + cd "${S}"/doc/ || die "Failed to switch directories." + doxygen "." || die "Failed to run doxygen to generate docs." + fi +} + +multilib_src_install_all() { + use doc && local HTML_DOCS=( "${S}"/doc/html/. ) + einstalldocs +} diff --git a/dev-libs/libezV24/Manifest b/dev-libs/libezV24/Manifest index 25ffe9604fdc..24b43c2761b1 100644 --- a/dev-libs/libezV24/Manifest +++ b/dev-libs/libezV24/Manifest @@ -2,6 +2,5 @@ AUX libezV24-0.1.1-build.patch 4869 BLAKE2B 13f3e7a7493825ff2d7242baf499a3844d36 AUX libezV24-0.1.1-clang16-build-fix.patch 398 BLAKE2B c2dca10de1eb12cab625a235dc768b1990263bcdb4c918a7fdbcc76bc7f10fe4743dad6c5b94207faf5b68273ba7d9f2ca2a75976ddc67880f040cf7f67425b7 SHA512 a5a87aaeed14b708fcf5f282d70442d9526ec2c63a19e5725b0eedb90e7b6dedc04a25f44bbee0a9fb2a5e527637d46c9e7f61b73f766061636e728fdeddc6b7 AUX libezV24-0.1.1-test.patch 472 BLAKE2B 9e7b928e271fc7b963e3f8f82c818de06fc0a0477c972a143a48669c67dbcec9c83e70da6cd38ef37968d91d438439090fbdf7ff521e69291a555ced5cf7aa1f SHA512 f2bc15b6c99ad760215406f2a4fc2d230671d0bac9a8249b6ac25aaec4fba16c435ce0871f42ff41cd54d9d0d9e4a72fdc19dc84426ae594bf9293b1b6efe906 DIST libezV24-0.1.1.tar.gz 50515 BLAKE2B 5a4dfdb4e4875203cfc2c06a1d5966d79c84407539ad3b3419aea04e7fcfc5ba05e6e69d1a09d999a1c8820f35bd5adc7fe3d833ceb739e52f1246491d339034 SHA512 99b277a04354e2587567ae5f1ebc99e41d127ec94bf5de53021b94df8d731ce2f2ceacedd8b7fa29902cf98f5c4243bddaa96636e1f900f1434a3da857b0e6c5 -EBUILD libezV24-0.1.1-r2.ebuild 781 BLAKE2B 9b932e17c6474361d65aacda25b6d2951e3d2775880b0fed5ffd8b01b91cfe5e6ee1728ed73c8270e3a94d26d8a15d7a705479244f6be86981f87ca963f8f0aa SHA512 dc5755a891caf969c2d36c055b6d9d81bddf5b50925cc6ae70871500a932ce998c8d3ec80054b206d518a484b8979b85b1b3c7d1488f1a65c495e898ad08eb6b EBUILD libezV24-0.1.1-r3.ebuild 826 BLAKE2B 5f73b47aabbdec81b40c29c9943df3e13d29e17d5ba51186016063d643408565c8d202c193269e5bd24fc3a26a2a5cec55d5b16dceb15ff59b61b3a9775a400a SHA512 7f0d931cd62f6a2699a33115a815136aaac82936b5253c26872131eb11f0080794a8d552d66d57fffc4612e69ccc724ecaa8b25cd0e00a2993d6c17d730fc71b MISC metadata.xml 642 BLAKE2B 04978c981fef1717c72251342c16b4dc72968cc4f3d799e465c8206ed7578b025b938ab6ae0f62ddb63055e7af101008f883b8722d24c95ce18fa63e78c42dff SHA512 fb11d8c2945b522ef3edaa6b7a5733f5cb3a4212986738006abffda5451026e39c6f478c2fa49a9667f0c6921b97e6ebf9b8f923dae76631ec4a973a11a63f16 diff --git a/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild b/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild deleted file mode 100644 index 21e1bcb0b753..000000000000 --- a/dev-libs/libezV24/libezV24-0.1.1-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="library that provides an easy API to Linux serial ports" -HOMEPAGE="http://ezv24.sourceforge.net" -SRC_URI="https://downloads.sourceforge.net/ezv24/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ppc sparc x86" - -HTML_DOCS=( api-html/. ) - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-test.patch -) - -src_prepare() { - default - - tc-export AR CC RANLIB - sed -i -e 's:__LINUX__:__linux__:' *.c *.h || die -} - -src_install() { - export NO_LDCONFIG="stupid" - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" install - einstalldocs - - find "${ED}" -name '*.a' -delete || die -} diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest index e351599b7bf0..1bcb62c90e93 100644 --- a/dev-libs/libwacom/Manifest +++ b/dev-libs/libwacom/Manifest @@ -3,5 +3,5 @@ DIST libwacom-2.13.0.tar.xz 154512 BLAKE2B 3b63231af2e92052fce3eed87aad7d465cf82 DIST libwacom-2.14.0.tar.xz 164228 BLAKE2B 8936343bbba4d9687bc124ed2fdc610dbee6090100b1a3a59f1cdade90f46b9744280567a650c2433a66d99528fed162405f994c27061c32575ca8441ff342bd SHA512 f2980d4728d3164be325a9a21cf0c27a7d8004c6812f9c1e730916259420b666cc2e5d6166acdb55542a8a35533291d1bd7284a58c2a194558a77215d1580f86 EBUILD libwacom-2.12.2.ebuild 1429 BLAKE2B f475047763502f98e648c31acbffcee652d18f813abb7c1536694240e71945c2b1192af6b6dfca809df5a55531fa02944cbf76058b87d30062d7909d6a93b01d SHA512 da3bb72743869316910f0d00a89a7b0bb3641c552096b00ff6617fa5919932a45dae9fd4349ab75258e06296ec27370803247a5092d120e917a91304e2a3b870 EBUILD libwacom-2.13.0.ebuild 1285 BLAKE2B 24dbbf1f2d90758589bb558896a0bd912fc99c986d1cbfad63199b8d487f0468a0bbc1ca83c746e270daf95109321cdbf0511fe4388302e344baf6030e8bd94a SHA512 941609b713d1260534590cd3f81db27fe8346a62bd65374ae85f94866d995184e7c904d32353e3da24f473e5a6faa3380bd5972f95bc4c0b17c4782376a7078f -EBUILD libwacom-2.14.0.ebuild 1298 BLAKE2B 55356c5b69fe8892e0f2cadec4f41c1b957ce887090836fc2d8e1c107663f79c193e3521f49061e82989a454cea436f8dbc83f0901366ddbbe7d6377a56edd74 SHA512 9520b1affb6075fe3d2d2d1a9f201db5b3091d81050214fc310a8d89e4981b2504ff71e674eb538d5c9cb98648c91b9225362824555e1c7c4d2eafbed9af362e +EBUILD libwacom-2.14.0.ebuild 1292 BLAKE2B d63d6878b0962833c79cda11b65ceaad7901c3f423e61c778c6c69a462f25f3465cd83c03c8eb75d25677be05854a60057a0a330cf4a2de113de3ee281affac3 SHA512 44530401433c6843cbd0cdf3d7f9de0bdf31dd747a92aa3aea153156c1f9a335d2818281edba31b644551b6fb7b00fba1d0afe6e2e710ed495573b39136f6141 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633 diff --git a/dev-libs/libwacom/libwacom-2.14.0.ebuild b/dev-libs/libwacom/libwacom-2.14.0.ebuild index 9781eb37ce3e..69858a76db5b 100644 --- a/dev-libs/libwacom/libwacom-2.14.0.ebuild +++ b/dev-libs/libwacom/libwacom-2.14.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz" LICENSE="MIT" SLOT="0/9" # libwacom SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index 78df419e0e7c..09182c4ab6b0 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,4 +1,3 @@ -AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10 AUX poco-1.14.0-missing-utf8proc.patch 1979 BLAKE2B 34b8b4595939a0fb95f9acc92636206e80ae0192f35e84fef292a6e62eb2ed2cdb1cd4a7f64290a281aafd7258d25a4c3883c66e6e1865facc1ca1e8bb4183ae SHA512 2b0645880aa1409b0097bfa40396c94b25f29212795f4e600226d59486266d9f605905418bf402ed28cd54419e882f498f72c0d68db460dcd4f350b473c622d2 DIST poco-1.13.3.tar.gz 11332562 BLAKE2B 04380cae92bbd2427873f0ea1a3fcade244ee5168390e26081983ded9faaf22e456bdd4ae87f9c77bafc92155f860ea9f56678ec2204bcd7c51a871e7f00d759 SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92 DIST poco-1.14.0.tar.gz 12158142 BLAKE2B 3ae9a520941634ac9aa72d323541d6433ac2e73d4d19e0654f932ea031d17870ca4ad764a8e3c5e68d69c5dc9750d779102d80d6d810598db275f269928ae8ea SHA512 4475a0ede5d06e4ce9537295fec92fa39b8fd5635d1cfb38498be4f707bc62b4a8b57672d2a15b557114e4115cc45480d27d0c856b7bd982eeec7adad9ff2582 diff --git a/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch b/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch deleted file mode 100644 index afac9bc79229..000000000000 --- a/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake -index 55318b520..fb7efbffe 100644 ---- a/cmake/FindODBC.cmake -+++ b/cmake/FindODBC.cmake -@@ -34,7 +34,7 @@ find_path(ODBC_INCLUDE_DIR - ${ODBC_ROOT_INCLUDE_DIRS} - PATHS - ${PC_ODBC_INCLUDE_DIRS} -- /usr/include -+ /usr/include/iodbc - /usr/local/include - /usr/local/odbc/include - /usr/local/iodbc/include diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index c86095976c1e..d4a75e22b90b 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,7 +1,6 @@ AUX 0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch 2249 BLAKE2B 50208a5f2bed91d52eeec4f192cae5fe57d5f43221dd6333ed8e95ac3e0047588952ab2ca2188d4b401354032ddfa24b83a0e8e8e416748249001910abd2ef55 SHA512 cc9a3cab03d0d7c930b667bc61ba0404448d4ac1c3adf708c994c8e0f9d49232edc3beb1209ebe72990e97793f7b34ae4c9f68745343e07f6fa873989c12a14d AUX 0001-Specify-clang-exe-path-in-Driver-Creation.patch 2098 BLAKE2B 0bb6902e322ba6354f5cf31b6b7b842d0db43a1f14293edf228c31bb299a336267c573f5ddbc2bacb0525468625b98b260cc81d1cdd7fa43cdf6e484404b3f5b SHA512 26bce5f9fbd964774945e1b056985aead0a9dedb0c85256eb7b9556f5a196cff9aae6441afc9a6f4fe3e7f7178ce4f6032fa7c3b9c7b4dcdacf1d26c0011195c AUX rocm-comgr-5.0-rocm_path.patch 419 BLAKE2B 2adfe03cd86d84b1f183689e5feff298860c22b12a87bddf357d746d96f2e4df3de3d01962138e02b7670b28a7884d4b16fe9f52f937a22caf931e74bd46de21 SHA512 1ca24101e3c296127a7b429f0f6b05bbff388a0db2d4ffc3003844353ca43ddf0d95c4f13c902b841d748c19cfa11c39a300786af04919da3919b8aa7724fc1a -AUX rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch 3434 BLAKE2B d5841e32974bb8750ff7d9d32256c13823b26a7d200c603162c66b04dc55ae0e5ee795a449f2e6f35a2bd2efddb5c67b03499d2aa4e441fbe54a5f8178e167a5 SHA512 d0da78fbbbdc9ee3bb4f0d4f98b2321913f9ad197edd1c0128c4785d14134646a5f8b9a1b75e268111dcb4dff872c0b8db398b475fa8b28c83324ae5801bd279 AUX rocm-comgr-5.1.3-rocm-path.patch 422 BLAKE2B 23200a9ead9cefe1af9b553da7448d93b1c7d0db7aa02a2dae0fa0b70b44b75056fe720fea8919c5315c5804289c30d6b476e43aa7aeaf25cc5c2430431f7a9a SHA512 6d1d2cfac7f2b70409e8cc3cb1556f516f495c4a217e85408fbd99587697912d82fc6a8745c37d2fe392ddbd0e8503489c353f26b3fbc6bce640c567f4230e89 AUX rocm-comgr-5.7.0-disassembly.patch 656 BLAKE2B b1ac5227b7b4d7a25cc5674ca185075e22dc91eb2e64ea1598fae03915a22153cfdafee4c34afc34e7490515bbdb09d49ba290d4544c617f23427d04296181ac SHA512 647a0a613786df7907616af43397ba9b16a80a7f6e7420ac41be7cc424a94df7f3248875bcb336e13de0f2ae13832362c6cbc42356703b655efc58cc4d6e4b6d AUX rocm-comgr-5.7.0-lld.patch 1355 BLAKE2B 565e3052974b99ee5050fc1b64d5f3b337866cf21a5d37fa37888e6257cf00b1718a0d3933b3f0e4e27caca4537652824c1ce01a8600852da503eead94a12d8f SHA512 35e6b2c8ad97d3dd5a870ed5c547c3727cd384c773371fa9608e29f7d525252f34fb784798c82c2071098667fd69ca4b89dfee20a8bf28b73b14bd13b4b00a50 diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch deleted file mode 100644 index 362f5fcf16ca..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4c01c63a49af5748a8ee698553aa107803b60362 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu -Date: Tue, 14 Jun 2022 20:21:22 +0800 -Subject: [PATCH] Find CLANG_RESOURCE_DIR using clang -print-resource-dir - -Suggested-By: https://reviews.llvm.org/D49486 -Signed-off-by: Yiyang Wu ---- - lib/comgr/cmake/opencl_pch.cmake | 24 +++--------------------- - 1 file changed, 3 insertions(+), 21 deletions(-) - -Index: comgr/cmake/opencl_pch.cmake -=================================================================== ---- comgr.orig/cmake/opencl_pch.cmake -+++ comgr/cmake/opencl_pch.cmake -@@ -1,26 +1,8 @@ - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - find_package(Clang REQUIRED CONFIG) -- -- # FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but -- # really there is no way to reliably discover this header. -- # -- # We effectively back up to the Clang output directory (for the case of a build -- # tree) or install prefix (for the case of an installed copy), and then search -- # for a file named opencl-c.h anywhere below that. We take the first result in -- # the case where there are multiple (e.g. if there is an installed copy nested -- # in a build directory). This is a bit imprecise, but it covers cases like MSVC -- # adding some additional configuration-specific subdirectories to the build -- # tree but not to an installed copy. -- file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h") -- -- list(GET OPENCL_C_H_LIST 0 OPENCL_C_H) -- -- if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}") -- message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.") -- endif() --else() -- get_target_property(clang_build_header_dir clang-resource-headers RUNTIME_OUTPUT_DIRECTORY) -- set(OPENCL_C_H "${clang_build_header_dir}/opencl-c.h") -+ execute_process(COMMAND "${CLANG_INSTALL_PREFIX}/bin/clang" -print-resource-dir OUTPUT_VARIABLE CLANG_RESOURCE_DIR) -+ string(STRIP ${CLANG_RESOURCE_DIR} CLANG_RESOURCE_DIR) -+ set(OPENCL_C_H "${CLANG_RESOURCE_DIR}/include/opencl-c.h") - endif() - - # Macro to create and install a custom target for generating PCH for given -Index: comgr/src/comgr-compiler.cpp -=================================================================== ---- comgr.orig/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -42,6 +42,7 @@ - #include "lld/Common/Driver.h" - #include "clang/Basic/Version.h" - #include "clang/CodeGen/CodeGenAction.h" -+#include "clang/Config/config.h" - #include "clang/Driver/Compilation.h" - #include "clang/Driver/DriverDiagnostic.h" - #include "clang/Driver/Job.h" -@@ -988,11 +989,8 @@ amd_comgr_status_t AMDGPUCompiler::addCo - HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str(); - // HIP headers depend on hsa.h which is in ROCM_DIR/include. - ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str(); -- ClangIncludePath = -- (Twine(env::getLLVMPath()) + "/lib/clang/" + CLANG_VERSION_STRING).str(); -- ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/lib/clang/" + -- CLANG_VERSION_STRING + "/include") -- .str(); -+ ClangIncludePath = (Twine(env::getLLVMPath()) + "/bin/" + CLANG_RESOURCE_DIR).str(); -+ ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/bin/" + CLANG_RESOURCE_DIR + "/include").str(); - - Args.push_back("-x"); - diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest index 0d1441832634..f2eb283fc13e 100644 --- a/dev-libs/stfl/Manifest +++ b/dev-libs/stfl/Manifest @@ -4,6 +4,5 @@ AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab AUX stfl-0.24-ncurses-widechar.patch 828 BLAKE2B 5916f745b819fad0c6dedb882acfca4395eab60de656ec138988c756cddbe1109088279aef1a5b55e33931735426958a0f654a9ef3f567845960a8e17198a635 SHA512 897e32ad0d67e424ee66c1d572611f3707c665a6830b7c4560378bcb4ec4a9d2fc65eab7b2a827785bd724bf45f1eea9f20824e02ddb36e611c42b036d19c2aa DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0 -EBUILD stfl-0.24-r4.ebuild 3145 BLAKE2B 4303a6411bd6056674a721f33ec8117161b223d2a3f4453dbe8dd71a60298713c2d5078b49c27e6855e16d325f4ecd433ea1550e12ffa0dbc6813884039d313a SHA512 5e572785347e6326c20b6acf68f2095e9d2b770330bccd0be1acb199425b670679b46ead5f84cb4c8c241ae3913a8fe62c740e04d94e487969688f2082268c9d EBUILD stfl-0.24-r5.ebuild 3256 BLAKE2B 81e2a9f2927186a8ed863d79d596aca43d88366f0dde2d88182f276cbb94ea13cf151de84b3bce4b5e0c1530463fd42ffac2b9e5b052da0f05b5ac8bf80feff6 SHA512 168e9c2fa2b441d1c9860f3287aa5d7f2bf78e5285b3bb11a13ebfb34eadd9fa5707cd03dda59260e20c8cea1d07c01ced34127c4caf0bebbc6493e72c53a5ed MISC metadata.xml 836 BLAKE2B 98950b6de83635b53b6cc202e39f0a347bda220c686777cf0bf3b55aefdbf09996488bc7c8e99f3727e3eaf489242506319c0ab77ac65b978d4b8a105c6f1de9 SHA512 c12d047d32cc1f0d302881d1e73db0a3bf1ea620f4fcbdbf90db0cf3b48e338a4913908457ef22fa950b5e84d7ab76acbcfbf78a1a4a04d0d4d291aad82f22ce diff --git a/dev-libs/stfl/stfl-0.24-r4.ebuild b/dev-libs/stfl/stfl-0.24-r4.ebuild deleted file mode 100644 index 6fc8cd5251c2..000000000000 --- a/dev-libs/stfl/stfl-0.24-r4.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) -GENTOO_DEPEND_ON_PERL=no -inherit perl-module python-r1 toolchain-funcs - -DESCRIPTION="A library which implements a curses-based widget set for text terminals" -HOMEPAGE="http://www.clifford.at/stfl/" -SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="examples perl python ruby static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/ncurses:=[unicode(+)] - perl? ( dev-lang/perl:= ) - ruby? ( dev-lang/ruby:* ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND} - perl? ( dev-lang/swig ) - python? ( >=dev-lang/swig-1.3.40 ) - ruby? ( dev-lang/swig ) -" -RESTRICT="test" # Upstream does not provide tests #730112 - -PATCHES=( - "${FILESDIR}/${PN}-0.21-python.patch" - "${FILESDIR}/${PN}-0.22-soname-symlink.patch" - "${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch" - "${FILESDIR}/${PN}-0.22-pc-libdir.patch" -) - -src_prepare() { - default_src_prepare - - sed -i \ - -e 's/-Os -ggdb//' \ - -e 's/^\(all:.*\) example/\1/' \ - -e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \ - -e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \ - -e 's/-lncursesw/-lncursesw -pthread/' \ - -e 's/\/$(AR)/' \ - -e 's/\/$(RANLIB)/' \ - Makefile || die "sed failed" - - if ! use static-libs ; then - sed -i -e "/install .* libstfl.a/d" Makefile || die - fi - - if use perl ; then - echo "FOUND_PERL5=1" >> Makefile.cfg - else - echo "FOUND_PERL5=0" >> Makefile.cfg - fi - - if use ruby ; then - echo "FOUND_RUBY=1" >> Makefile.cfg - else - echo "FOUND_RUBY=0" >> Makefile.cfg - fi - - echo "FOUND_PYTHON=0" >> Makefile.cfg -} - -src_configure() { :; } - -src_compile() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - - if use python ; then - local BUILD_DIR="${S}/python" - python_copy_sources - - # Based on code from python/Makefile.snippet. - building() { - pushd "${BUILD_DIR}" &>/dev/null || die - echo swig -python -threads stfl.i - swig -python -threads stfl.i || die - echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so - "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so || die - popd &>/dev/null || die - } - python_foreach_impl building - fi -} - -src_install() { - emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install - - if use python ; then - local BUILD_DIR="${S}/python" - - installation() { - pushd "${BUILD_DIR}" &>/dev/null || die - python_domodule stfl.py _stfl.so - popd &>/dev/null || die - } - python_foreach_impl installation - fi - - dodoc README - - local exdir="/usr/share/doc/${PF}/examples" - if use examples ; then - insinto ${exdir} - doins example.{c,stfl} - insinto ${exdir}/python - doins python/example.py - if use perl ; then - insinto ${exdir}/perl - doins perl5/example.pl - fi - if use ruby ; then - insinto ${exdir}/ruby - doins ruby/example.rb - fi - fi - - perl_delete_localpod -} -- cgit v1.2.3