diff options
Diffstat (limited to 'dev-libs')
28 files changed, 721 insertions, 92 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild deleted file mode 100644 index a505928cb56c..000000000000 --- a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 flag-o-matic cmake - -CommitId=135412d2646f3bd753c8f1cfd33616110bbccd27 - -DESCRIPTION="Facebook GEneral Matrix Multiplication" -HOMEPAGE="https://github.com/pytorch/FBGEMM" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -DEPEND=" - ~dev-libs/asmjit-2021.11.13 - dev-libs/cpuinfo -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - # Bug #855668 - filter-lto - - rm test/RowWiseSparseAdagradFusedTest.cc || die - rm test/SparseAdagradTest.cc || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFBGEMM_LIBRARY_TYPE=shared - -DFBGEMM_BUILD_BENCHMARKS=OFF - -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild index 9a2f09a92e45..b2c8f05937d7 100644 --- a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild +++ b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild @@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN}-${CommitId} PATCHES=( "${FILESDIR}"/${PN}-2022.01.13-gentoo.patch + "${FILESDIR}"/${P}-gcc13.patch ) src_prepare() { diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest index 3377ec6a4bfa..d0ba0d84ea7e 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1,6 +1,5 @@ AUX FBGEMM-2022.01.13-gentoo.patch 2260 BLAKE2B c3c690490b200e1191013259872ef826b63012161cb5664f11f2e838a632fd010a17d6913bd89c7fc45850c5e3273a0d087081b63964483fefd21f02fee60403 SHA512 f4c7c58e45568303aa2d9308586adb544185f30f72d989928889ef46c9ec44342272a865185cdeef761e5ce4e44299a08de4aff2a7b30efa4cc90a26cca14861 -DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba SHA512 a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157 +AUX FBGEMM-2022.07.16-gcc13.patch 230 BLAKE2B f90e3efc20dee725ca1f6b93180b0176090fd314b7049d90285e7d7634af8cacc588560f593d475db73c04c9f14ae620d2ab27ee974e7a473b806254cfb5f923 SHA512 abd30f206bba3104c0b675a52c3320a251b769e9f1ea58a79de351d0d2e57e81265c554e7e8cb505014a1b5d7f7edd77d838eec33bb0fd932dfbc795b1d732e4 DIST FBGEMM-2022.07.16.tar.gz 744470 BLAKE2B d1ee51ad72a22fb1b7abaefe330f70e27bc5d6dfda2587373d7e0209aef099ab10c8772612a9786fc2bd760f66154053b9e6c9a6b7f3c82ed2114536f7b30213 SHA512 7d245ea47c57c2da0555693624c45c8585aab5d1b171c9f3b909e140d9d0964cb9cf8f029c291c45f8070d5cfad6f7116e606fdd4120b2223279e39d4ba3f189 -EBUILD FBGEMM-2022.01.13-r1.ebuild 1041 BLAKE2B 075f05166dfe0c81a5b0a08ce91db7a52c6b065ca0e2ad40d73e9aeb344712f3abd5bef0b1f67276feee3dc1cd8119c39070a134b291bd9087b69cc212954dae SHA512 d427d15db43f8719b9dffa55ab212561f30d44756bd62982c9315acfb94aec15afbea5c60e0a156753b86290bbf3f5d99a9ae532bc6510bdfc33357a00ad5282 -EBUILD FBGEMM-2022.07.16.ebuild 1112 BLAKE2B d71e659f040c309ce301d8f87bc1814fcd4e9dc49251725363f16a786b342c4a1bbff84530f6edf676efd07f1f76dea5f98296fb0944ca896540e5bafcbe8a38 SHA512 e78deb36177cec4d9494e57304006d18b515d016991495785fd21a6e40f0f86459b1280066507dd316814676fb1d138a032e1448856a6782d51898a117b94944 +EBUILD FBGEMM-2022.07.16.ebuild 1144 BLAKE2B 485079dea4e03467bfe5aedb0cd9fc84fd2beed754264dab4886bd51c357e941fc6e6e9aebd4a007a1ab96fa02342b2cf382f6f132fcd278b1da0c16659fb1b2 SHA512 65d32b92edd01d00e99af037dd72969b07f665a7d47a15e6768071311bf8ad1a43f13976b2ecde0e564f3a7c5a892288bd495af6d04fe34dece801fd503e3acd MISC metadata.xml 327 BLAKE2B 860b9c0ecb3b0029c855db0a0054590135f3bd6ec9dad20cdf433fc70c119354518eea50fdbb2a204eb8cc6621de23e6928a2f9ec961ac0c51fd9dae22fa8488 SHA512 3a0d5a69421a41e62ce134636025e0024010c1938ee35f7489d8d870d915a66cd526aa60d107a378dc4522ff71b7f10486e20867c8b424b1b47e458988ebff58 diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch new file mode 100644 index 000000000000..cba259688d96 --- /dev/null +++ b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch @@ -0,0 +1,10 @@ +--- a/include/fbgemm/UtilsAvx2.h 2023-03-11 17:17:28.365325199 +0100 ++++ b/include/fbgemm/UtilsAvx2.h 2023-03-11 17:18:06.076766162 +0100 +@@ -9,6 +9,7 @@ + // flags. + + #include <string> ++#include <cstdint> + + namespace fbgemm { + diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 86caf465d137..4700246204b1 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest index b09a5d47909b..673165752e30 100644 --- a/dev-libs/bemenu/Manifest +++ b/dev-libs/bemenu/Manifest @@ -1,4 +1,4 @@ DIST bemenu-0.6.10.tar.gz 129568 BLAKE2B f81e84e6457175abf11b9dc6c426cb02121b4f101bdef55361c539f6d51144539129d2e2898e506c12f32d8f45a27fb0159083b5b964b33a0fc73485ebe41b00 SHA512 b8aadbe2cd11f7cc713ce683fcc9ce4779cd0050ee8cf41c4d3bca9f299ac99b9cd3b7611d87d27d7f7439f16fc2618671f2bec8878ad2ab65fade54f24ca92f -EBUILD bemenu-0.6.10.ebuild 1203 BLAKE2B 760331d14fcff99848150e7b7c3afb5457019eb910c6ca8384b20a2ae2ef6920d9c57ef3c3b0f58f4e67a323c2621f93f059d61079bb8f69a03ac377ab0cae7d SHA512 6e60eca7c0f3cfc6d57c7c3b60e4410619153475f03152e98d10f70569f21b8a22c1a1949c7354d5d800d5f4ba7dff91b3e7f5592a93825f61d829df3ee7a24f -EBUILD bemenu-9999.ebuild 1205 BLAKE2B efc4fad7ea0b666758e4aa9a51b1016b6e24dcdf3406fcf0f903f3e69aaa5db0365291308e3eb2d7967260ac9eb2a88706b9d4963e2b83c58054a6cd32784670 SHA512 88716bf65c5aca288211c2b47f2bd4cedf1a1a81afe8e95003347fa1af25eb73da07095d4bc2b30b8bd7c500b421f6421eab469d0ad12514d4d3a4432c286825 +EBUILD bemenu-0.6.10.ebuild 1219 BLAKE2B c2b9647b022ddf59b393e213048dcb9151c627bb463b525d881e4f2c8e194302fe82b72c73e5d902e6bab416b92bfdf035bfd6820d9b21b8336fa9565a686c05 SHA512 e7669e63c85b80da2d3a5579adac66d90b598f71a09557b8d168398a70086e28756630628c24c6f0d7e5e4251144519681da6fe07d0e151af3e8f0de22e994ea +EBUILD bemenu-9999.ebuild 1221 BLAKE2B 33e686ff01e95ee482efeb79882a8163547ed830d48ee2924f3694f743c6e35d6ef209abbeb0cbfcc5b13429536b64404d719a89da05d014a53fa83cbffff26b SHA512 4e8755cd9f99854f9da90d419d462b60a409dfd166a0ed27a2ba82ea54e90453b845a3fc893d2a516d8af19d4dfe7b69595b45af7e3198002859d6e764af3bd9 MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e diff --git a/dev-libs/bemenu/bemenu-0.6.10.ebuild b/dev-libs/bemenu/bemenu-0.6.10.ebuild index 26c2c2f1a7a4..bdb1770c6583 100644 --- a/dev-libs/bemenu/bemenu-0.6.10.ebuild +++ b/dev-libs/bemenu/bemenu-0.6.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,6 @@ DEPEND=" ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland - dev-libs/wayland-protocols x11-libs/cairo x11-libs/pango x11-libs/libxcb @@ -40,7 +39,11 @@ DEPEND=" x11-libs/libXinerama ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" BDEPEND="doc? ( app-doc/doxygen )" src_compile() { diff --git a/dev-libs/bemenu/bemenu-9999.ebuild b/dev-libs/bemenu/bemenu-9999.ebuild index bd5b9bc60d55..9110f1a404b0 100644 --- a/dev-libs/bemenu/bemenu-9999.ebuild +++ b/dev-libs/bemenu/bemenu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,6 @@ DEPEND=" ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland - dev-libs/wayland-protocols x11-libs/cairo x11-libs/pango x11-libs/libxcb @@ -40,7 +39,11 @@ DEPEND=" x11-libs/libXinerama ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" BDEPEND="doc? ( app-doc/doxygen )" src_compile() { diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 36dd96efbd14..497bee8ad1d0 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,5 +1,7 @@ DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614 DIST gjs-1.74.2.tar.xz 639012 BLAKE2B 12f6f60b801d96a4cff260a0abc5da96c30a5b77d69d31b646b16db20a586761b36b2601c8da8ab7b313c96b8fb2319ed65cb53f3f3ca2d3d255648ceccdbc7c SHA512 738176aabcc8d0147cf77b7af3271c93ca4e8a473b2d35722b4cf9a15dcdc9f87962a29dd949607d947256df9ffcfd499d7189b6eff7ac416bbad594a2bc8ea9 +DIST gjs-1.75.90.tar.xz 645228 BLAKE2B 853704b5eed8d14e070fe47ec10a27071ab6d7c6754f61206f03c20a3fba0038105c54fd2b2b2196dfeb0e74aea966a6bd886ad8d77a0c1d1d70bf6eb5bc0a54 SHA512 2bfdb9fb62612505e2f647c164944337257915d427e62c340b1dbe389d22cf309fe4ba4f55c9399c3027136e24b49ed441598b9fbd93389e8596e2de8a6917fc EBUILD gjs-1.74.1.ebuild 1960 BLAKE2B cc9f89f86583adacec4aee0d6d74696ff81a65356f8b455964c27d1910af46ea2365c8d4cc6586be739048a206447538476feccd324be373d47f8a8a22d65cb1 SHA512 304297e1c12d5dc1b86e09aa78ccd00fbf1a8137e2802e1852c0998b4aeef6f56adc92ee65e4002f6bbb0b2a6a567c8658690600d8705dfaeb1c100751a0d1c2 EBUILD gjs-1.74.2.ebuild 1966 BLAKE2B 2c2c4f2944ee02788e8b27d58b2e5c47ed7b3eed63cc4ff874ed9d2888215481b94b07a10025bd431925d1d245794c2f3e931e63e2acd4ab12f2cf83705bdf41 SHA512 a9a41000396bae156d79ed459b92f7db62ce4ed5b598385919854f4bbc5fd78894746c8cbbd4fc095b20dd2ac889fb96f9fe748e543e06a557dbe336920d408e +EBUILD gjs-1.75.90.ebuild 1966 BLAKE2B 1783a96ee082e74ca58cb4f7292969a4c0374c8da4af3020d96163eff29585b0bc470ab275304928ed361c66a2554ec0f046e536eeecdf25940582ca510fcecc SHA512 2e3a9f5c5d42e76a96dfe533a9142ec1b332486bd16007d42b66d52bf8635a289b493122f92195b3a614cde78a084bb20be5a72b72e6965e98dd4c86c1326ea6 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2 diff --git a/dev-libs/gjs/gjs-1.75.90.ebuild b/dev-libs/gjs/gjs-1.75.90.ebuild new file mode 100644 index 000000000000..be95ea793e8f --- /dev/null +++ b/dev-libs/gjs/gjs-1.75.90.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome.org meson virtualx + +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs" + +LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" +SLOT="0" +IUSE="+cairo examples readline sysprof test" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.66.0:2 + dev-libs/libffi:= + >=dev-libs/gobject-introspection-1.71.1:= + >=dev-lang/spidermonkey-102.2.0:102 + cairo? ( x11-libs/cairo[X,glib] ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) + test? ( + sys-apps/dbus + >=x11-libs/gtk+-3.20:3[introspection] + ) +" +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + append-cppflags -DG_DISABLE_CAST_CHECKS + + # On musl, it's required that either gjs, pixman or gnome-shell to be built + # with a larger stack otherwise librsvg fails to render a particular SVG, as + # a result we fail to get gdm or gnome-shell running (greeted with a fail + # whale screen). The bug has been reported to librsvg. This is ideally just + # a temporary workaround until we understand what exactly needs a larger + # stack size, as it's not sufficient to do just librsvg. + # + # Please refer to: + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/686 + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/874 + # + # TODO: Find an actual fix instead of increasing the stack + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + # FIXME: add systemtap/dtrace support, like in glib:2 + local emesonargs=( + $(meson_feature cairo) + $(meson_feature readline) + $(meson_feature sysprof profiler) + -Dinstalled_tests=false + $(meson_use !test skip_dbus_tests) + $(meson_use !test skip_gtk_tests) + -Db_pch=True # TODO this has to go + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index ffe11ea868c1..b053ca950321 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,6 +2,8 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923 AUX glib-2.74.5-tests-Skip-assert-msg-test.py-if-gdb-fails.patch 1356 BLAKE2B 42f485dcf2de7dc8a47285eaad083d7d9fe12a8e0b50f65b8093e8046621f371797b3c57ea308f5a99a8db60d103e72fb475256f991b3a894728f30a3e62acef SHA512 a63ad5c2d765bd67ca85455c9cff4859832676a821b4aa438c98cd3ecb9854138f5a26538a6e4d3e542dba1e53cf4114f3dc8e481ff0db00ac27340fa9a57f4e DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 DIST glib-2.74.6.tar.xz 5217312 BLAKE2B 07b0a5cb74c1451ba863d5f9a781a122d3d20af1f1227177025de114279277cacada3dd6ab5eb5ad5c0bff5ac7abab6fdfbe0551f44d07b2ddc9141a0640a8c8 SHA512 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b +DIST glib-2.76.0.tar.xz 5268620 BLAKE2B 74bfba6254787b6b386161c329899fe6a53c87290261866f8aceb6e23ebf0bcacd085b04f480a7297d6fc11d37a676fb2fad5661e9f2668ae81f872ff5e2054f SHA512 812834ca6d840dd9c15c0689685d8bd96f4acd69a89213f807a75732d1aa5efadbed0e0073f05a56a09beb2d4f0be1b83a4642259682aac84302632da2d62370 EBUILD glib-2.74.5.ebuild 10277 BLAKE2B 7fb6b90b3dcbeced1cb8a9258279b257fe880072a8844b84b2062766e5d82c2ff2aef141fbb29de0031ffa87c795dc5d6ff62a06f62ae2520880db20eafc0302 SHA512 5d93a71115aab66c0b465221fff9dd18b4580ce58b2aeb677d9dd67e284d5a475f4f373ebea5e52eb78771f0c77574b5843a27e402fa06832fba481ebf613e8e EBUILD glib-2.74.6.ebuild 10215 BLAKE2B a771708382538aad6fce9c6ff14183e505b3d5c7e2d836dc5491484af9109a723278bc720edc55a76e64ceb57aa947a1020dc7479401accba2fb994b4af76e1a SHA512 a2ed96db33cefa8bad4096b1307ba0fc02e09532010e4263ec7f5786f2468612473870d76aca67bbf49af13d654cd3af860b5cd6559177ed67774a3d4153bf15 +EBUILD glib-2.76.0.ebuild 10120 BLAKE2B 039ab33510d6340059027f16f80c75b05e030ed7b1a772c58da32b8f4e886dfc9f3a7687e5901d3762dd3c70f44f13d1ab612b37148ab9b48c76ddba32bf5d41 SHA512 2b8596225b27c912366570ac05913b5a9ce6534977db1b67fac8cb44defb167e203c1deb1aca59fe0479984e99e9be3f8b8bc957f3e8b84e793063a3de338e39 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b diff --git a/dev-libs/glib/glib-2.76.0.ebuild b/dev-libs/glib/glib-2.76.0.ebuild new file mode 100644 index 000000000000..11eedb4e806c --- /dev/null +++ b/dev-libs/glib/glib-2.76.0.ebuild @@ -0,0 +1,283 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{9..11} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !<dev-util/gdbus-codegen-${PV} + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + --buildtype $(usex debug debug plain) + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest index d3d27654cb2d..9642f8241843 100644 --- a/dev-libs/gobject-introspection-common/Manifest +++ b/dev-libs/gobject-introspection-common/Manifest @@ -1,3 +1,5 @@ DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0 +DIST gobject-introspection-1.75.6.tar.xz 1054100 BLAKE2B 3fb76550fc4f0ede1f0af93ef15d9923d25408ffc7d4f10fa4e10830ce1c7055760ec0fb11985f977eee9e81066e0712b4b6271398febd3e7592919db0335998 SHA512 6fb7b82c46eb79336ec654d34c94213bafd5ea6b293050698714c26afc929c73b6abbe75e09e992f0cccb7168f638a40219d6708e2758f620551a7b39306e0fb EBUILD gobject-introspection-common-1.74.0.ebuild 933 BLAKE2B fa5cd3f41118b786d1f70e05b37f5b3c8923c3216ac2eb14f5151278d0020e41b5f22b52aeff3dc14e7f5aa231529cc6680fa5f981d0d2513c2f2bb1d2ab5717 SHA512 21f2c5f753090a79f64dd080eb9f23616750cf89c38b68a686b8ab7e01ab06d5a211851088f2d00ab3c2032f2dcf363e92f08d108560b1a31051170c9594d883 +EBUILD gobject-introspection-common-1.75.6.ebuild 941 BLAKE2B 8e0355ca754ef7bd2e1b1283a04e2cde6592cd426cde56e574139d925e1b3c4670535d6afba36bf56ba30cdd4b79bfab1c60855c6db25d0ac1837b1f741124e9 SHA512 8045a509ff51cb59dcebb16420bcc929c1104f07013bfd17a6a1eecf51ff4d2731899d8ea40aae82ae2cafbc7a5c08320d9717f94252fc3af1b41a76949f9f5f MISC metadata.xml 362 BLAKE2B 18f3d214e624758a552818e8c02cebcaf9340d5201cb23c6999c36247f969b65c912de4515101acdc0862338d697a510b15182b904dca7f4a7ae12e3c1b188b9 SHA512 f08d8077b802b7c95433d8e4e31d89183b072306ebf16570977f65339641c29a1917dc3c869d5268bd3a9ebba5537ed15623183a7dada64f811943a16bab676b diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.75.6.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.75.6.ebuild new file mode 100644 index 000000000000..bce7762306ba --- /dev/null +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.75.6.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="gobject-introspection" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for GObject Introspection" +HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" +# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: +# https://forums.gentoo.org/viewtopic-p-7421930.html + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins m4/introspection.m4 + + insinto /usr/share/gobject-introspection-1.0 + doins Makefile.introspection +} diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest index 69c524d05299..eaecdf9f5e36 100644 --- a/dev-libs/gobject-introspection/Manifest +++ b/dev-libs/gobject-introspection/Manifest @@ -1,3 +1,5 @@ DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0 +DIST gobject-introspection-1.75.6.tar.xz 1054100 BLAKE2B 3fb76550fc4f0ede1f0af93ef15d9923d25408ffc7d4f10fa4e10830ce1c7055760ec0fb11985f977eee9e81066e0712b4b6271398febd3e7592919db0335998 SHA512 6fb7b82c46eb79336ec654d34c94213bafd5ea6b293050698714c26afc929c73b6abbe75e09e992f0cccb7168f638a40219d6708e2758f620551a7b39306e0fb EBUILD gobject-introspection-1.74.0.ebuild 1999 BLAKE2B b87fcfbbf75a219a6a5b258d7f0bbc7d77603139fd92a1289edb4c362c7fc62bbceb0fdd25efbeaa3d6ee74ba3a615099fd45e9fbdcbdd7ce9675d7f82c6454c SHA512 61924dd1698f62ffc2161260a775e85158b5d7cdc004336611d2b72a803fa18cebeb70f3e236b12080c8c4b18c96cb6454b2932237139b45078465b3e33d4ca7 +EBUILD gobject-introspection-1.75.6.ebuild 2007 BLAKE2B 83923aa2b95ef5026dea4493da60d6ea1c7921617acd1db1a6656484a50a2ad8157069f769eaecff6fafaaf0acecace3898f9fcf6a9a60bfce8d4dc4dcdada57 SHA512 d958f55bf81e645d5cbb06e6a408bfd077bac5fecd0ee8826dea03ace40895f15fe68a87bb3c466de943acd2105db40a6314ab8a9f84e059a831bdeaa465d243 MISC metadata.xml 485 BLAKE2B 6ecc9396bcb29a8365be4058592c307ddcb0cc16ab56723ca32a378b5608b86378ab291345a6a3ccbe8225c6ffc91b6ba1e2996b5b0d1f4271d0757bf376ef8e SHA512 43a479854b1d5783c028ecfd8357a632db089f95de9e703608de7f229a37beee5e43781ff3f68b2dfa9bceac1355597373d31d209fdea0301917be5fbe7e7fbe diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.75.6.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.75.6.ebuild new file mode 100644 index 000000000000..7362abb83315 --- /dev/null +++ b/dev-libs/gobject-introspection/gobject-introspection-1.75.6.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" +inherit gnome.org meson python-single-r1 xdg + +DESCRIPTION="Introspection system for GObject-based libraries" +HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" + +LICENSE="LGPL-2+ GPL-2+" +SLOT="0" +IUSE="doctool gtk-doc test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# virtual/pkgconfig needed at runtime, bug #505408 +RDEPEND=" + >=dev-libs/gobject-introspection-common-${PV} + >=dev-libs/glib-2.75.0:2 + dev-libs/libffi:= + doctool? ( + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ') + ) + virtual/pkgconfig + ${PYTHON_DEPS} +" +# Wants real bison, not app-alternatives/yacc +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( + >=dev-util/gtk-doc-1.19 + app-text/docbook-xml-dtd:4.3 + app-text/docbook-xml-dtd:4.5 + ) + sys-devel/bison + sys-devel/flex + test? ( + x11-libs/cairo[glib] + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ') + ) +" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature test cairo) + $(meson_feature doctool) + #-Dglib_src_dir + $(meson_use gtk-doc gtk_doc) + #-Dcairo_libname + -Dpython="${EPYTHON}" + #-Dgir_dir_prefix + ) + meson_src_configure +} + +src_install() { + meson_src_install + python_fix_shebang "${ED}"/usr/bin/ + python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner + + # Prevent collision with gobject-introspection-common + rm -v "${ED}"/usr/share/aclocal/introspection.m4 \ + "${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die + rmdir "${ED}"/usr/share/aclocal || die +} diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index cfe2895b9033..a8785f155af5 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -4,11 +4,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c +DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc +DIST llvm-project-16.0.0rc4.src.tar.xz.sig 566 BLAKE2B bfcf39070f32e16cfeae699d95d06f184b1331c3af403340c31cc5a973a3bb1faec0b6342445176cebed5819ddf68e4abfdaa8542ec425b1c822fc8c03c03349 SHA512 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca EBUILD libclc-16.0.0_rc3.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca +EBUILD libclc-16.0.0_rc4.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca EBUILD libclc-17.0.0.9999.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3 EBUILD libclc-17.0.0_pre20230304.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5 diff --git a/dev-libs/libclc/libclc-16.0.0_rc4.ebuild b/dev-libs/libclc/libclc-16.0.0_rc4.ebuild new file mode 100644 index 000000000000..c424e4a83842 --- /dev/null +++ b/dev-libs/libclc/libclc-16.0.0_rc4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="OpenCL C library" +HOMEPAGE="https://libclc.llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" +SLOT="0" +KEYWORDS="" +IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" + +LLVM_MAX_SLOT=16 +BDEPEND=" + ${PYTHON_DEPS} + || ( + ( + sys-devel/clang:16 + spirv? ( dev-util/spirv-llvm-translator:16 ) + ) + ( + sys-devel/clang:15 + spirv? ( dev-util/spirv-llvm-translator:15 ) + ) + ( + sys-devel/clang:14 + spirv? ( dev-util/spirv-llvm-translator:14 ) + ) + ( + sys-devel/clang:13 + spirv? ( dev-util/spirv-llvm-translator:13 ) + ) + ) +" + +LLVM_COMPONENTS=( libclc ) +llvm.org_set_globals + +llvm_check_deps() { + if use spirv; then + has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || + return 1 + fi + has_version -b "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libclc_targets=() + + use spirv && libclc_targets+=( + "spirv-mesa3d-" + "spirv64-mesa3d-" + ) + use video_cards_nvidia && libclc_targets+=( + "nvptx--" + "nvptx64--" + "nvptx--nvidiacl" + "nvptx64--nvidiacl" + ) + use video_cards_r600 && libclc_targets+=( + "r600--" + ) + use video_cards_radeonsi && libclc_targets+=( + "amdgcn--" + "amdgcn-mesa-mesa3d" + "amdgcn--amdhsa" + ) + [[ ${#libclc_targets[@]} ]] || die "libclc target missing!" + + libclc_targets=${libclc_targets[*]} + local mycmakeargs=( + -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}" + ) + cmake_src_configure +} diff --git a/dev-libs/libmemcached-awesome/Manifest b/dev-libs/libmemcached-awesome/Manifest index 151f978acc10..12cbcff5b7f1 100644 --- a/dev-libs/libmemcached-awesome/Manifest +++ b/dev-libs/libmemcached-awesome/Manifest @@ -1,5 +1,7 @@ DIST libmemcached-awesome-1.1.2.tar.gz 527675 BLAKE2B 436c3dcfed00a66459064a58a4d82e22f6f4a624a1f462949d2d3d8536b1342cbb7f0d5f883a86cce119dbcada4597c664609b7f9334bd321a5f1d314e5906b0 SHA512 3b9b6b1b09b39c845b5169841902d45e470f99af65765c9ae5d405d4eb1b6884e49831ccfb128df67beeda45eeed5e0f41ee475560cabcfa98e8196134182a53 DIST libmemcached-awesome-1.1.3.tar.gz 527880 BLAKE2B b3d91b9eeb335b3fa7b910842b3c31326669aa9634ab6c87a3247bf8279037f5c2470b653fed851bf1708559af1a1edab52707c19eb6ea89ac6cb92424290d4a SHA512 99fb2ad32c05f8af769f5b30983b7c4244cd7ee027ccc8f893a957de4ffb12939959e2461c9acd20a8d21e0af824606e97d54465b7147337f40313c5eddf474b +DIST libmemcached-awesome-1.1.4.tar.gz 530337 BLAKE2B b3309e4e7ab737d06255ce9e8d2b8644e2787dca73c0b09de8bbf9c99b8126cb5eee9ef2f7320c312f35ed8e29c70e1c1042dc80587982d9bcb7200d79bba5b2 SHA512 0a10a2431142ec6e4547f82fdd35b55c018264e5f8c39910a65252c3f53d862fb5945e7a671951915aac076767cc995740b3e499eb584017a38eb2d1e82171fb EBUILD libmemcached-awesome-1.1.2.ebuild 1073 BLAKE2B 25fd46a10be4fd0afc50789cdb4cf7d64b4f63e1f1677be4fd05c9ad5351f6e522c11dba805ce926b0fe5e1496a99c1cecf98327b051436263646abd4796a10d SHA512 72d718ead1fa5337153998f926e6a1c9f7ca544ca45772bb8296a00b1bf318ca755c3dd99ba8808cd04abf4bcf6ecee29133c8317739def5a0b6d2e20aa93d79 EBUILD libmemcached-awesome-1.1.3-r1.ebuild 1106 BLAKE2B eb9896d3a0b5c82ef0ab102a6b8e8874d72fd202779ed6af62cba62cf80cacb16411196137c4dc09d65080cd8070c3dc04c8bc85fb034f977506eab806671c88 SHA512 6aafb33b4c2862208ed6e843b466308ae5c7924d9d0dfee5969f8b8c65ed85204ef226f2b8372556915ad6c6245194030ec7199a9f4a10efa2b0bbf941f89fb0 +EBUILD libmemcached-awesome-1.1.4.ebuild 1106 BLAKE2B eb9896d3a0b5c82ef0ab102a6b8e8874d72fd202779ed6af62cba62cf80cacb16411196137c4dc09d65080cd8070c3dc04c8bc85fb034f977506eab806671c88 SHA512 6aafb33b4c2862208ed6e843b466308ae5c7924d9d0dfee5969f8b8c65ed85204ef226f2b8372556915ad6c6245194030ec7199a9f4a10efa2b0bbf941f89fb0 MISC metadata.xml 632 BLAKE2B abbf2b34829dfd68688dfe74c7a14e788558ecbf1e738fddb9296f986925c4c3cb927fd30b2d4a2a38c54082271eaabf19963d1daf4ab1ea9a3a9d16f1f5b558 SHA512 f4095b8e6c92046ae23a793724237522c99734ab80c3dd71f58d9972e728ba27330d169eafc3294df6e2e0f9b57e7c8f70e8b5a51a3c532250965e8ae7b05e0c diff --git a/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.4.ebuild b/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.4.ebuild new file mode 100644 index 000000000000..f74a0725e90f --- /dev/null +++ b/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.4.ebuild @@ -0,0 +1,47 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="a C/C++ memcached client library" +HOMEPAGE="https://github.com/awesomized/libmemcached" +SRC_URI="https://github.com/awesomized/libmemcached/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/libmemcached-${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+libevent sasl test" +RESTRICT="!test? ( test )" + +RDEPEND="!app-forensics/memdump + !dev-libs/libmemcached + libevent? ( dev-libs/libevent:= ) + sasl? ( dev-libs/cyrus-sasl:2 )" +DEPEND="${RDEPEND} + test? ( net-misc/memcached )" +BDEPEND="sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DENABLE_DTRACE=OFF + -DENABLE_SASL=$(usex sasl) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # memcached_regression_lp583031: needs network, bug #845123 + # bin/memaslap: tries to use Portage HOMEDIR, bug #845123 + -E "(memcached_regression_lp583031|bin/memaslap|memcached_udp)" + ) + + cmake_src_test +} diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest index c4ba32f77a3d..3d8f1333f09d 100644 --- a/dev-libs/libtpms/Manifest +++ b/dev-libs/libtpms/Manifest @@ -2,6 +2,8 @@ AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f AUX libtpms-0.9.5-slibtool.patch 1981 BLAKE2B fa4adf1c063d24a2550f964dcaae1ea2e2d93f7d2704bc00e29ef22ceecaaf214860e82e668e1358854482fcf3ba1af89745422657763b7683a232f7e286ac7e SHA512 4b8eebc895ce6941a3ad5995ee0d5f1b1537861700878fa1ce0a95ec37ee1d51354782da4bb2feeedc1c5871aa62ec248484b409c6109bed95cf73962ff8b206 DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505 DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae72b152b681f1c1fbc9d75b7708238e5c2a161827c7a6e2b9a6ae4786dfbf921ec37b9f0b7c044835c974a111a3 SHA512 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21 +DIST libtpms-0.9.6.tar.gz 1264338 BLAKE2B 7b127ef370a48214814bb9ad0e8461ed0af21f32ab84f243945980c5e36ba5e374b4de7a83bf9c67c29264609063d48eae2dae83832daed70170bb1ed39eafea SHA512 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3 EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1 EBUILD libtpms-0.9.5.ebuild 1358 BLAKE2B 5a0cfeb68ec4e973527fd12c59ee80331c25c58ccada0f25a85aa4c08500ceaf92bd56cec5157b83e8f939470be723390a261a01a921eaed291e68e04353a0ed SHA512 63df6fc9b53e326046515c5a9a6b8fc62128c08612dfebf4f8f3874dc6ad7e403c3ec62f42f75b5b2f7ce29024dc994cff68f3038a649caeddef4e587d378e6c -MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721 +EBUILD libtpms-0.9.6.ebuild 1362 BLAKE2B 9eff8746ba64e0691caeef0dcae0af7048a0ae27eb1452c41addde4e1a35b3bf8ec6f981da85e6919352a950a08f295bf350b30acd498410186447ac13ec9926 SHA512 5d07be2d1f0df9d43d8b02831fee915a32ffeabfec0a52c8ebd422219f6299b88752b2e448d1d0d95d3f07567e36e5e1dc6aa2c3afe84b45ac285af2a0f76e44 +MISC metadata.xml 621 BLAKE2B 5431a08a57b654746f41820560912e2bac4fc0c5cd2eb5f44c77e4eda65c1a160845205c3ae76392c4a6f9aa33562999576c055ee6d1b89579a9e2a49c59e4f6 SHA512 5e9fff7be647a2e9e8eb71dadcc6b8cc8577ade658fd4ab8ba20cfd64f1b5ba129fc7e5f8fcfb52e69a646681741079c0bc85b06a92f9086ce66a28770c1a9da diff --git a/dev-libs/libtpms/libtpms-0.9.6.ebuild b/dev-libs/libtpms/libtpms-0.9.6.ebuild new file mode 100644 index 000000000000..79acc47b57eb --- /dev/null +++ b/dev-libs/libtpms/libtpms-0.9.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library providing software emultion of a TPM" +HOMEPAGE="https://github.com/stefanberger/libtpms" +SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +DEPEND="dev-libs/openssl:=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.0-Remove-WError.patch" + "${FILESDIR}/${PN}-0.9.5-slibtool.patch" # 858671 +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-openssl +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then + elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA" + elog "keys due to a flawed key creation algorithm. Because fixing this would render" + elog "existing sealed data inaccessible, to use the corrected algorithm, the old" + elog "TPM state file must be deleted and a new TPM state file created. Data still" + elog "sealed using the old state file will be permanently inaccessible. For the" + elog "details see https://github.com/stefanberger/libtpms/issues/183" + fi +} diff --git a/dev-libs/libtpms/metadata.xml b/dev-libs/libtpms/metadata.xml index b22f99269a84..655ec184708d 100644 --- a/dev-libs/libtpms/metadata.xml +++ b/dev-libs/libtpms/metadata.xml @@ -13,4 +13,7 @@ <email>virtualization@gentoo.org</email> <name>Gentoo Virtualization Project</name> </maintainer> + <upstream> + <remote-id type="github">stefanberger/libtpms</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 2740c1ecb606..067d97c1c051 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -21,5 +21,5 @@ EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba154 EBUILD openssl-1.1.1t-r1.ebuild 8244 BLAKE2B a0076fd2d5b9e6e98d1dce27221f68a6fa161bc705c10575c1cf7de806861f6a56de2d941ca4a165cde395a1583d9c0717bb93f23969476df145be14b955e4b9 SHA512 bb584d23900992fc799ea243e38f77d52eb5a6d387697f4e854ee874c5b960dd804fa76740879c5fcc10562dae4ff8b6e075927eebfd30c07404e759615cf65b EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47 EBUILD openssl-3.0.7-r4.ebuild 7739 BLAKE2B aabf04d23c68b70693e73b6412b2d8fc80d088b3be0595add8aaa8e61d12c6a39f3d48c82a78cf1b99c34f49129ee429dbacf85d3ee155e5458b73c47200eb58 SHA512 ae15ae5faf181f746d6eabb7cef8e0ac7eb3ce1409e3c3b4671f8da99ac264f7c20be42eff36b0a06aed1c872ffce5a52d4bd90dbb4bf739f0851e66f3481e7a -EBUILD openssl-3.0.8.ebuild 7741 BLAKE2B d451e3fda3a10150b154062ec500f2189e3bdf80ee760c0ffc1dee1aa1b8d11df7e866b2d94ac1870530eb58ff0fe6ae082287b8def3a14489d604964d545680 SHA512 838c5bf2f7e7641f42d806d0f0ef521c447bbdd41cf408d47bcc0a2c9945e7617b51640226590cc198e7e0981b5fd496aafd80dcb213c2b5e1bf79fed0cec965 +EBUILD openssl-3.0.8-r1.ebuild 7900 BLAKE2B ca2a9ef23d88283673b5062229b10b9c1fe28575fb1e5e77f2713c683dce2752a0ef535521f78031c38dd8060389ee52e9dc81172942b1c5e4b178439ef17ded SHA512 6eeeac9f540ccb59d54bde2fc34d7995ae464a7eaddb00a7f169c06cc9e748c55b6b0d073fc3b3fb9966bd14d407b80810d84fc287063b4810f548995d860fe4 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92 diff --git a/dev-libs/openssl/openssl-3.0.8.ebuild b/dev-libs/openssl/openssl-3.0.8-r1.ebuild index a5c46e57fff2..5dce04cf6b4f 100644 --- a/dev-libs/openssl/openssl-3.0.8.ebuild +++ b/dev-libs/openssl/openssl-3.0.8-r1.ebuild @@ -92,13 +92,6 @@ src_unpack() { } src_prepare() { - # Allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.4 gentoo.config || die - chmod a+rx gentoo.config || die - - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - # Make sure we only ever touch Makefile.org and avoid patching a file # that gets blown away anyways by the Configure script in src_configure rm -f Makefile @@ -115,6 +108,11 @@ src_prepare() { einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." rm test/recipes/80-test_ssl_new.t || die fi +} + +src_configure() { + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" # Quiet out unknown driver argument warnings since openssl # doesn't have well-split CFLAGS and we're making it even worse @@ -134,14 +132,6 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) - local sslout=$(./gentoo.config) - einfo "Using configuration: ${sslout:-(openssl knows best)}" - edo perl Configure ${sslout} --test-sanity - - multilib_copy_sources -} - -multilib_src_configure() { # bug #197996 unset APPS # bug #312551 @@ -151,6 +141,10 @@ multilib_src_configure() { tc-export AR CC CXX RANLIB RC + multilib-minimal_src_configure +} + +multilib_src_configure() { use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") @@ -167,7 +161,7 @@ multilib_src_configure() { # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" #fi - local sslout=$(./gentoo.config) + local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") einfo "Using configuration: ${sslout:-(openssl knows best)}" # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features @@ -201,7 +195,7 @@ multilib_src_configure() { threads ) - edo perl Configure "${myeconfargs[@]}" + edo perl "${S}/Configure" "${myeconfargs[@]}" } multilib_src_compile() { @@ -222,6 +216,8 @@ multilib_src_install() { emake DESTDIR="${D}" install_sw if use fips; then emake DESTDIR="${D}" install_fips + # Regen this in pkg_preinst, bug 900625 + rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then @@ -257,6 +253,17 @@ multilib_src_install_all() { keepdir ${SSL_CNF_DIR}/private } +pkg_preinst() { + if use fips; then + # Regen fipsmodule.cnf, bug 900625 + ebegin "Running openssl fipsinstall" + "${ED}/usr/bin/openssl" fipsinstall -quiet \ + -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" + eend $? + fi +} + pkg_postinst() { ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index b9bc130eb45c..c3537d514e03 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -4,6 +4,6 @@ AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921 -EBUILD weston-11.0.1.ebuild 3663 BLAKE2B fb661cbc0874b7c2fdb4ed92b4df7ef9cbfd6c67d63c8702adab10ce4d8613938f0722818a8787ec06b3052834c1f0bbd607aea012bac5c127678160e6cd7b49 SHA512 0861367b189da6eae0e39731f13165d248ee19102e4615b7bf51d2f57c4b366a71ff9fbe7efd14084e072b29a0c4d44ed344e1b2225afc3bbb7d286afa75ae69 -EBUILD weston-9999.ebuild 3602 BLAKE2B 11dc0d883632b406ea7d16af3ab6126b6588981e06a5d0afcff46bbea3f4e9e0378db7290f20e13fc16547c83bf675f650e70aa872ad2f3dd8b3469cdb483598 SHA512 63bce7c02610692bfc15cf1d84aa940f90e0fdd72190b5fc761562141a10d1721766f16c12201ef7d5c0f4cf4aaa83d9bab74ae492defe9f38379b9088dd0d35 +EBUILD weston-11.0.1.ebuild 3664 BLAKE2B 9e19189a0610844ac20b09775458e1934813ae425b4c7ca1cf99f42819cab93d4232b5015273f30a5e5e7036ef8f2fc003237a64d632a97bff774902070fbc44 SHA512 d830031ae8fb246f210e0cf84fd5c317c242c7ef0804529296fc0946586c46af01ed2223a363fc678d8f10ce0b2ab1ee0530f8bb6c3232bddb0c84db487b9798 +EBUILD weston-9999.ebuild 3629 BLAKE2B c1b832b65b4c4a6a87440c844d103fff2a3ae4bb5fcd7fbe2d43c611d00f2455958f611762600ac2481eba0b3aae670b471b65c36dfe64e6f96762894b240086 SHA512 fbdf2fd1b2af8c512ee43d66df8fb2974d3dd27e11cc82129d74c35313a004106f93ef11252049509afc85735a795b94699a76d953ded56d71893ad89f861bed MISC metadata.xml 1608 BLAKE2B 179aa99a3445aca06bee40c9794b2e932a81d5160a375a501631938d855db8d785de876b7c674dacb5295fe33a422a85f1cd8df8da1fc230a6ad5286e5606a3b SHA512 daf7602fb7efa103a79f029d2c40825156dd787694364f5da33e43eea297022da2df070a9b051d3bbb55da5663a1550dca39db31b6c4fd9d38eea465ada909a1 diff --git a/dev-libs/weston/weston-11.0.1.ebuild b/dev-libs/weston/weston-11.0.1.ebuild index d3a06d276c4b..99f5f2cad8fe 100644 --- a/dev-libs/weston/weston-11.0.1.ebuild +++ b/dev-libs/weston/weston-11.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,6 @@ REQUIRED_USE=" RDEPEND=" >=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.20.0 - >=dev-libs/wayland-protocols-1.24 lcms? ( >=media-libs/lcms-2.9:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) @@ -85,7 +84,9 @@ RDEPEND=" x11-libs/libXcursor ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + >=dev-libs/wayland-protocols-1.24 +" BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 3b4017070562..6ad9c5fed5e4 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,6 @@ REQUIRED_USE=" RDEPEND=" >=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.20.0 - >=dev-libs/wayland-protocols-1.24 media-libs/libpng:0= sys-auth/seatd:= >=x11-libs/cairo-1.11.3 @@ -83,9 +82,12 @@ RDEPEND=" x11-libs/libXcursor ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + >=dev-libs/wayland-protocols-1.24 +" BDEPEND=" ${PYTHON_DEPS} + dev-util/wayland-scanner virtual/pkgconfig " |