diff options
70 files changed, 471 insertions, 1138 deletions
diff --git a/acct-group/adbusers/adbusers-0.ebuild b/acct-group/adbusers/adbusers-0.ebuild deleted file mode 100644 index f8d84ac..0000000 --- a/acct-group/adbusers/adbusers-0.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit acct-group - -DESCRIPTION="Android Debug Bridge user group" -ACCT_GROUP_ID=-1 diff --git a/acct-group/adbusers/metadata.xml b/acct-group/adbusers/metadata.xml deleted file mode 100644 index f453528..0000000 --- a/acct-group/adbusers/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/app-arch/precomp-cpp/metadata.xml b/app-arch/precomp-cpp/metadata.xml index 004555a..50e3faf 100644 --- a/app-arch/precomp-cpp/metadata.xml +++ b/app-arch/precomp-cpp/metadata.xml @@ -5,4 +5,7 @@ <email>alex_y_xu@yahoo.ca</email> <name>Alex Xu (Hello71)</name> </maintainer> + <upstream> + <remote-id type="github">schnaader/precomp-cpp</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest index fe867e8..10f9a96 100644 --- a/app-text/zathura/Manifest +++ b/app-text/zathura/Manifest @@ -1 +1 @@ -DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10 +DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f diff --git a/app-text/zathura/files/zathura-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-disable-seccomp-tests.patch new file mode 100644 index 0000000..f3d88a2 --- /dev/null +++ b/app-text/zathura/files/zathura-disable-seccomp-tests.patch @@ -0,0 +1,22 @@ +diff --git a/tests/meson.build b/tests/meson.build +index ac7edb8..68216f3 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -25,17 +25,6 @@ if check.found() + timeout: 60*60 + ) + +- if seccomp.found() +- sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'], +- dependencies: build_dependencies + test_dependencies, +- include_directories: include_directories, +- c_args: defines + flags +- ) +- test('sandbox', sandbox, +- timeout: 60*60 +- ) +- endif +- + utils = executable('test_utils', ['test_utils.c', 'tests.c'], + dependencies: build_dependencies + test_dependencies, + include_directories: include_directories, diff --git a/app-text/zathura/zathura-0.4.9-r1.ebuild b/app-text/zathura/zathura-0.5.2-r3.ebuild index fdb219d..da82595 100644 --- a/app-text/zathura/zathura-0.4.9-r1.ebuild +++ b/app-text/zathura/zathura-0.5.2-r3.ebuild @@ -18,8 +18,8 @@ else fi LICENSE="ZLIB" -SLOT="0" -IUSE="doc +magic seccomp sqlite synctex test" +SLOT="0/$(ver_cut 1-2)" +IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" @@ -28,27 +28,27 @@ DEPEND=">=dev-libs/girara-0.3.7 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 - magic? ( sys-apps/file ) + sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )" RDEPEND="${DEPEND}" -BDEPEND="doc? ( dev-python/docutils ) +BDEPEND="dev-python/docutils test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig" PATCHES=( + "${FILESDIR}"/zathura-disable-seccomp-tests.patch "${FILESDIR}/zathura-docutils.patch" ) src_configure() { local emesonargs=( -Dconvert-icon=disabled - -Dmagic=$(usex magic enabled disabled) - -Dmanpages=$(usex doc enabled disabled) + -Dmanpages=enabled -Dseccomp=$(usex seccomp enabled disabled) -Dsqlite=$(usex sqlite enabled disabled) -Dsynctex=$(usex synctex enabled disabled) diff --git a/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild index 4d63e4a..55d3c63 100644 --- a/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild +++ b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="" -RDEPEND="!=dev-cpp/tbb-2020.3" +RDEPEND="!=dev-cpp/tbb-2020.3*" S="${WORKDIR}/oneTBB-${MY_PV}" src_prepare() { diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest index 1b6e27a..78805a8 100644 --- a/dev-dotnet/dotnet-runtime-bin/Manifest +++ b/dev-dotnet/dotnet-runtime-bin/Manifest @@ -1,6 +1,15 @@ -DIST dotnet-runtime-3.1.25-linux-arm.tar.gz 31848614 BLAKE2B 2cdd2667f619dc6b8e9c9c0fcaa7011840e077988fa679aaf937ac1e5a9ca6cd0ef3505239a4850e8d893208eb7af3258df910403df7af3494494f945f73a12e SHA512 a0950ef427e07e4de7111411fb12389fda15193a84f22ca04c8a43e16bfe451ba34338def07dcfd3cf530cda0b14b4e69dac83e38da753e8cc708d6090c62dfe -DIST dotnet-runtime-3.1.25-linux-arm64.tar.gz 30295532 BLAKE2B 5228e50adac1b2f52d130756d0c69b0294c62dd8f8d3618bb3049dae62fa3c8a528d70d0b1febde6d4a7774f0fd975d47ec1c70c7967122c2797c1a34d083e50 SHA512 894efe2c65702b6b99812fdea82672ec8534fa3cee66185266ff06c7fc7d6e9bb5ab12c1a9aee7a9f8f0873fe1eef402a22f34da1860d1f9ec068574380cba10 -DIST dotnet-runtime-3.1.25-linux-x64.tar.gz 30459553 BLAKE2B 2843ad2690bcc7d584dadaefe3fbe58136769fc4e7aee2ce8230ed487e4df3910da1353645d5db06ea12edf657559972a699f9ac638fd7a75bc83fa500dfb2b2 SHA512 e5155a0d26837b53bfc9275bfcd69eb7400bd8b2004be69e339f62ce36b6333f1f2da8d391bb98e4cb3630a20b68a0a0f4e6f8d1558a4cb0a53da796a71c214c -DIST dotnet-runtime-6.0.5-linux-arm.tar.gz 28627995 BLAKE2B 95f835311a2cd4969c66dfe5085986369ca73266b5fbd456d2c735bd0a436c5c6e04ac70f861ac5ad87f54c6f4e1a8508c2fa794fb04c9537eeda337b08afd33 SHA512 5180bc076629afa91096ed500ce966d1d62e7b1b6248a6a33d6e758a3bca8fdff382d90793d847f049a330f4a0964dd29b18ac8cbd374492f19d74056a608252 -DIST dotnet-runtime-6.0.5-linux-arm64.tar.gz 28386959 BLAKE2B 03783c433506a098bdd56a8ab4945c6e10d8abb62024e78721799bbdf87cdce5c3ddff9196dcb18ce52b3092639d9fe1e991aee6290fad4be70ac054cdc43fff SHA512 bed49b74ad60d2701ddd638c61c215ad48f5c6eb88df140545d29901df60c6667474ca9d3bed6583dba605282ec64989ff2b431f098f0afc6ed155af59f7126d -DIST dotnet-runtime-6.0.5-linux-x64.tar.gz 30681960 BLAKE2B aa4f1b34860d23e0c3d8eb92aa688cd9a23047031122aec046915cb663cef5ee3a6d7e9036a54b9225bb6722968e54e4d48b95ab6de4e9ecf98c6b8ea03587df SHA512 c228f0ba0ecc4ccda708e97529b248dd6d70f7f747ead6453623be77e8e1529b54db52f5df1b5e00b5b7f92b73389560832f80607fc07e50879d55ce905afcf7 +DIST dotnet-runtime-3.1.32-linux-arm.tar.gz 31846724 BLAKE2B c3515a186492cebe9fc5d094c5d983fe7cc9eb6747d3ef2600fcf5fa628c1e17fc1a05c32cb5679a819702c92250e53bfe29c8e6932cfd1abdd392231363d042 SHA512 eaa5e439e9a70ca72a1de731e4b2b7b97e59c8d60bc694e0a08c8da6246aaecc3498dc14729c83140039a285a8cda8fcd334bdc81e507d97c2f92b9dffcf0140 +DIST dotnet-runtime-3.1.32-linux-arm64.tar.gz 30300088 BLAKE2B c6ff1d6e3b451712df38ebe8694bc9a3b9b3ebc5125b73c274f823c25bc755083b49134e3d10ff4a3a75516cb2f6c72ce1162bd2135749506e6fa56e906d4f08 SHA512 ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422 +DIST dotnet-runtime-3.1.32-linux-x64.tar.gz 30466403 BLAKE2B 0e79d0bc3319529f6ebf00b6b7bb0010b7f62cee89aabab22758e3f9935926415a00351169dc96fb9286c244ca59b55215c8da8e318e6750c7eddb7defe0d5c6 SHA512 a1de9bbc3d2e3a4f5f52b7742c678b182a58a724d36232997511e390027044d60144a7e010a29d6ee016ec91f2911daef28ac5712a827fff8bdde73314b7e002 +DIST dotnet-runtime-6.0.21-linux-arm.tar.gz 28658107 BLAKE2B 48d44a8116c631c8d9c14d81825cf9800631de8cc63c86451f47a3e18aad180ae5f1c5ba5c13cf47737074e003307bd2707a819603545667fcf098fa03fdb9f8 SHA512 a265c05ff50bee5e6d2b46f6117bab812e5348f56914945d09694627a2ea6f309fbd9f5a2656ff90c566fa0208a6119bb87a3fcf26417d64de5549d650c262b6 +DIST dotnet-runtime-6.0.21-linux-arm64.tar.gz 28407878 BLAKE2B 6be0a9643af7c6257b2acef367a231dd7cefde1f8b3589022983e81e0776d6471be481e32783c35ca8cf30c1b8138cb802bd7b88247daef1b729ad589d0cd021 SHA512 f34e1319ded1e1115ceb63eab16a4ac7096e36e3236f8117f61ec9f0e19dd50adb473e1213a1018abfaedc4da57519b85058e7b14187a33e0b91e79af4dabf63 +DIST dotnet-runtime-6.0.21-linux-musl-arm.tar.gz 28680123 BLAKE2B df3c551354009897cbe84236c35e096ff8840d2e881940563407ddeecdf8a0d65fc9e9bde26e1efb8473cfc4d3add761139e7e07cb2fbc3a50abf78f487b173c SHA512 e021f7a2290358ffa130cfb356831ebb06cf6582dccec85a8b1e6004c100972dfb60854e0a2d7f31d09a579ebfa125d4c44e7a150a89e9040f08c06f963624f5 +DIST dotnet-runtime-6.0.21-linux-musl-arm64.tar.gz 28430445 BLAKE2B 437b297e3eacf9c25c71882164fa9dc2f5cc3b17f800132da8b347be16df36956119796e17884934e6c3732948d147ad5341119a430dc21c73e09abfcb1c657f SHA512 827bd3b6117ed674ae290b2b80598551b91e67766533895fbd375b121e813f9d7927797fc91aafe3bf2cac927173703c7dbb4fd18dcc6a2648bf1f973dc86fec +DIST dotnet-runtime-6.0.21-linux-musl-x64.tar.gz 30254930 BLAKE2B 120466ea08604c4c1727b8be3c58a4e7e6042f5fa0a5524e34b93b55955ec6f99657fbc100ae120aa53e8dd5f315c09c8918ecabd34f3c69c874530dc9dc8411 SHA512 f5205bd0703a8c6db5dc4157849a734103bf2495ae10b15dce38cc03f12195b1a615367bc1f87a2ec4a05472753cd99858b8be2b74adfb93c3b558ebe1f045a1 +DIST dotnet-runtime-6.0.21-linux-x64.tar.gz 30707364 BLAKE2B f2492c46341ffbce60d69c0f24effd857d1895f9a92aa4b5d065f4f849edb7317905fbbebe7ae2ca29774c8938803986f9072ebbfbe8d403fa018f19015276ca SHA512 9b1573f7a42d6c918447b226fda4173b7db891a7290b51ce36cf1c1583f05643a3dda8a13780b5996caa2af36719a910377e71149f538a6fa30c624b8926e0cd +DIST dotnet-runtime-7.0.10-linux-arm.tar.gz 29657370 BLAKE2B 7c0550f8bb0e8b61d977f58f8d5d3ac015ef1accfcb1277daea49e5f5b4996f6e90b91ae6f71ac1666e8dc6c796316325d66997118fa6e4577136447312d99bd SHA512 15538acaa6799c37d1caf493bd5d94e567c70e6e17dd0b538f4a7ad795d060960181fa8a82c553466cb0ee58b21f4021246395f2b4a27a6dc6d6fe0dfbf53c74 +DIST dotnet-runtime-7.0.10-linux-arm64.tar.gz 29770350 BLAKE2B 9c6f160d608c5afad2e730975348c578f269017b4804bfd7a4dc57109c5e4dc47a9bd0e863a3f620762fdcce7b83c3ec90e1950d4ffdb2f4272cfdd4a6582337 SHA512 e90b68b272d5db7cf8665bf052fb0300d50a69818d70675442dc891654d140f7f84527b849860589bf152de1d00aa55dc15ee32f5678d46ea0069210fd002b03 +DIST dotnet-runtime-7.0.10-linux-musl-arm.tar.gz 29674697 BLAKE2B 8ecf0dd1cdeb757f764cf25684fc854c2740dace757b537443ac007aea6b50063ee72361615948f5e95e34e538fc374e084e9254536a259829954474ea6838dc SHA512 c2280801d61774ac7243d6507aca9134d6757b49513523bca8f31b0f068793c66b4eed6a352607e63e73d5cc6fff26ac05157ec5d25160ac2269c1ecef6bdad1 +DIST dotnet-runtime-7.0.10-linux-musl-arm64.tar.gz 29768438 BLAKE2B af0fff73973b94b487318019639e56ed261345a2e08a3ec3d25fe9d23179e0b5a6d906afbb8be96382a31c84ba4e5cf2fcf7a91af2e3592d5d73874e15672ddd SHA512 660033371ee3a5ae06d64c366a1e1811c19da22eb8e23d67b5fd1c16dda2e52c9650d8c1c9bab6c289a76f89cc61ae97490c01de2f4e908de9e9b82777e97ef0 +DIST dotnet-runtime-7.0.10-linux-musl-x64.tar.gz 31050507 BLAKE2B d6b884269f84c7219cf4a1b842bc0307df61e96bd6a67109caa5edabe3b072db149cf311ad9a135e7c6920cb3fb49fc0cf4044f79616cc665f58e4b91b3a4de8 SHA512 9d494a4748298c494609112d695439c114a42480f58d5b4cadd78a889ecb1b00ff10898cd7c3455589ac367d5a877bdc03621f74901355f063139778ae044c8b +DIST dotnet-runtime-7.0.10-linux-x64.tar.gz 31493010 BLAKE2B 871559081bfe172dee03796513904c97fae80ee9144c1899479e2f3429229306a1dd988862d52705f11b67ac46111d0fa5dc000b97c2232e438abdff4331522a SHA512 f15b6bf0ef0ce48901880bd89a5fa4b3ae6f6614ab416b23451567844448f2510cf5beeeef6c2ac33400ea013cda7b6d2a4477e7aa0f36461b94741161424c3e diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild index 12d4b2a..fd5ec0d 100644 --- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild +++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild @@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~arm ~arm64" IUSE="dotnet-symlink kerberos lttng" REQUIRED_USE="elibc_glibc" QA_PREBUILT="*" -RESTRICT="splitdebug" +RESTRICT+=" splitdebug" RDEPEND=" kerberos? ( app-crypt/mit-krb5:0/0 ) lttng? ( dev-util/lttng-ust:0 ) sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] - !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin !dev-dotnet/dotnet-runtime[dotnet-symlink(+)] ) " @@ -33,8 +33,7 @@ RDEPEND=" S=${WORKDIR} delete() { - local x - x=$(find . -name "$1" -print -delete) && [ -n "$x" ] + test -n "$(find . -name "$1" -print -delete)" } src_compile() { @@ -47,11 +46,11 @@ src_install() { dodir "${dest%/*}" { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die - dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" if use dotnet-symlink; then dosym "../../${dest}/dotnet" "/usr/bin/dotnet" dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}" + dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" # set an env-variable for 3rd party tools echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild index fb09294..3d47925 100644 --- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild +++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild @@ -7,25 +7,31 @@ DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" HOMEPAGE="https://dotnet.microsoft.com/" LICENSE="MIT" +gen_src_uri() { + echo "$1? ( + elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz ) + elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz ) + )" +} + SRC_URI=" -amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz ) -arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz ) -arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz ) + $(gen_src_uri amd64 x64) + $(gen_src_uri arm) + $(gen_src_uri arm64) " SLOT="$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm ~arm64" -IUSE="+dotnet-symlink kerberos lttng" -REQUIRED_USE="elibc_glibc" +IUSE="dotnet-symlink kerberos lttng" QA_PREBUILT="*" -RESTRICT="splitdebug" +RESTRICT+=" splitdebug" RDEPEND=" kerberos? ( app-crypt/mit-krb5:0/0 ) lttng? ( dev-util/lttng-ust:0 ) sys-libs/zlib:0/1 dotnet-symlink? ( !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] - !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin !dev-dotnet/dotnet-runtime[dotnet-symlink(+)] ) " @@ -33,8 +39,7 @@ RDEPEND=" S=${WORKDIR} delete() { - local x - x=$(find . -name "$1" -print -delete) && [ -n "$x" ] + test -n "$(find . -name "$1" -print -delete)" } src_compile() { diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild new file mode 100644 index 0000000..3d47925 --- /dev/null +++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild @@ -0,0 +1,65 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" +HOMEPAGE="https://dotnet.microsoft.com/" +LICENSE="MIT" + +gen_src_uri() { + echo "$1? ( + elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz ) + elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz ) + )" +} + +SRC_URI=" + $(gen_src_uri amd64 x64) + $(gen_src_uri arm) + $(gen_src_uri arm64) +" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64" +IUSE="dotnet-symlink kerberos lttng" +QA_PREBUILT="*" +RESTRICT+=" splitdebug" +RDEPEND=" + kerberos? ( app-crypt/mit-krb5:0/0 ) + lttng? ( dev-util/lttng-ust:0 ) + sys-libs/zlib:0/1 + dotnet-symlink? ( + !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] + !dev-dotnet/dotnet-sdk-bin + !dev-dotnet/dotnet-runtime[dotnet-symlink(+)] + ) +" + +S=${WORKDIR} + +delete() { + test -n "$(find . -name "$1" -print -delete)" +} + +src_compile() { + use kerberos || delete libSystem.Net.Security.Native.so || die + use lttng || delete libcoreclrtraceptprovider.so || die +} + +src_install() { + local dest="opt/${PN}-${SLOT}" + dodir "${dest%/*}" + + { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die + + if use dotnet-symlink; then + dosym "../../${dest}/dotnet" "/usr/bin/dotnet" + dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}" + dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" + + # set an env-variable for 3rd party tools + echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die + doenvd "${T}/90${PN}-${SLOT}" + fi +} diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index a9be015..b36e1ce 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,18 +1,12 @@ -DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 266165569 SHA256 56c56a608a017213c7691044dc21b301e0ad14cf4836ade0c530ac3a16511318 -DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 278563585 SHA256 d44cadcd0aaf4b43ae2052a5bbfa110086da9b466f0fce08e32c2e938ed741d1 -DIST ibm-semeru-open-debugimage_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 276015436 SHA256 419ad53dea8d29818c923a84f58060dd979beb6231b6ed19f17b1d980d10c235 -DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 334833532 SHA256 76eb77ce53a0241082946b056e191e96f3d090eac391c93569ae1a734aef37ab -DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 349451254 SHA256 d049f1844bac2c17ca708857c02da11e0d8836e18936c0816ca11398325f2217 -DIST ibm-semeru-open-debugimage_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 343357345 SHA256 ed5005276244a06c51f0ab916ae19ce77536ba1eff6ff329424e10c609a1c015 -DIST ibm-semeru-open-debugimage_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 343385445 SHA256 a092faaee2fc7dc98549f1c90adc6e97da059fc8b03eb229c9322497fa4ce14f -DIST ibm-semeru-open-debugimage_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 361884479 SHA256 cfba718579c05ec2ecf43eeff78930d8c4c1feb521187b0519f85ce7a1b6bccd -DIST ibm-semeru-open-debugimage_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 355530873 SHA256 e0a3fa9021b20ca4d64bab1f4e0c123ab50ee4842fd7b34acae9dfdf642ce12b -DIST ibm-semeru-open-jdk_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 199269440 SHA256 1fb196b4eb3e45e2337883e252955ec56a6cdeb3d7200c95ded75ab0e4f3aefa -DIST ibm-semeru-open-jdk_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 203852153 SHA256 693604e48eef24c20d785f3a7e81e538a30e436ed36b7539a5e23e0008b2c405 -DIST ibm-semeru-open-jdk_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 205000099 SHA256 00e46a2b8be005eb03e3e4d939d4cf9b8331f22ee50ed75b84136d3f0ead7498 -DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 204694186 SHA256 b384c25ab6b5ab9787777eff2bceb6c5837765f2d5760055518d9a98810ad93d -DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 210025609 SHA256 3158c8e46be057ddacab25a52c2ded470102f994719025ccfa77c23d1106daa9 -DIST ibm-semeru-open-jdk_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 211212622 SHA256 e111cee65c1487eb3421763f7d0fd69850e0dda34fbe295cae8b15c8219f1647 -DIST ibm-semeru-open-jdk_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 203782113 SHA256 9c5cbca0a171c7e573047744e9a753923c341f6afb38606ae68f29d6209f2c9c -DIST ibm-semeru-open-jdk_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 207765361 SHA256 b46de9cd00af8a0223f4b50deb2627ab91fe515a69383a96fd2c12757cef24fe -DIST ibm-semeru-open-jdk_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 209237550 SHA256 b694d47666035b1f7870bc3749aa7c1903d50976eab3772fd81c32dab2aa8e64 +DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 344573477 SHA256 cbeb1b48be7ebe090d7998ff903cdfc120597f0c291e063f2173786ebc4d1e7a +DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 359634686 SHA256 d8e0a70145f7f160a1c26ad5196f521bf68ad0ecd6a784faf81ab59868ffb81b +DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 357090764 SHA256 39efd2b530b3061c11c490e75ebbb20a4ec72448aec268bdb8449ee00021a138 +DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 372992490 SHA256 093579d76dda1fff44da05f08a9450d4e435e2f6be5d538113b96ccf0d2a559e +DIST ibm-semeru-open-debugimage_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 369014125 SHA256 d2cda3fb77f3cad6870f2c868ad4bb3fc6c86e2a82522426a732733ce0fdb2d6 +DIST ibm-semeru-open-debugimage_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 386149336 SHA256 cf947725632aa736e9bd0e5b7b3f5af9b427f62fdde2b9c16c4aaf3e1231526d +DIST ibm-semeru-open-jdk_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 202866166 SHA256 64f9cc164906b65fb1cb88287d64e40e02371ae1366bce28802d90cbd91df1be +DIST ibm-semeru-open-jdk_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 206857922 SHA256 cfdff21ce44ae6af494cba75c1f323bef83a982f2c11944988bab2125f85b906 +DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 206559764 SHA256 c23d62e5e2c3613357f6904cfc9a8229709bbc12d6aeb814875e0c4c471bb350 +DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 211958174 SHA256 6934275c8045df881db8693caa219ef566d15f4a0d0b0154583f12370b996c5b +DIST ibm-semeru-open-jdk_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 205707724 SHA256 d11ec92737b9f97bdd9bb553c3e476981f4ac38039963a15c2e1ca9ec163a304 +DIST ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 209702777 SHA256 9b945e58f024108a20eb907015cca4a452332b7644e8dd8e051149a3ec62e3a3 diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh index 2e200d9..f4e3c9a 100644 --- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh +++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh @@ -1,7 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK ${DL_PV}" +VERSION="IBM Semeru JDK ${DL_PV}" JAVA_HOME="${EPREFIX}/opt/${P}" JDK_HOME="${EPREFIX}/opt/${P}" JAVAC="\${JAVA_HOME}/bin/javac" diff --git a/dev-java/openj9-openjdk-bin/metadata.xml b/dev-java/openj9-openjdk-bin/metadata.xml index 4c0b1aa..532f0f1 100644 --- a/dev-java/openj9-openjdk-bin/metadata.xml +++ b/dev-java/openj9-openjdk-bin/metadata.xml @@ -8,7 +8,6 @@ </longdescription> <use> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="source">Install JVM sources</flag> </use> </pkgmetadata> diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild index 83b69ab..f41e70a 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.33.1 +DL_PV=${JDK_PV}_openj9-0.41.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild deleted file mode 100644 index 8da6a88..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - debug? ( - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz - ) - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz - )" -} - -JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 -SLOT=$(ver_cut 1) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" -HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - >=sys-apps/baselayout-java-0.1.0-r1 - kernel_linux? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/harfbuzz - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) - elibc_musl? ( sys-libs/musl ) - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${JDK_PV}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_unpack() { - default - if [[ ${A} == *_mac_* ]] ; then - mv -v "${S}/Contents/Home/"* "${S}" || die - rm -Rf "${S}/Contents" # drop macOS executable - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - - # on macOS if they would exist they would be called .dylib, but most - # importantly, there are no different providers, so everything - # that's shipped works. - if [[ ${A} != *_mac_* ]] ; then - # Not sure why they bundle this as it's commonly available and they - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea - # also has an explicit dependency while Oracle seemingly dlopens it. - rm -vf lib/libfreetype.so || die - - # prefer system copy # https://bugs.gentoo.org/776676 - rm -vf lib/libharfbuzz.so || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild index 8da6a88..f41e70a 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.41.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest index 51ce6a8..3c2aca6 100644 --- a/dev-java/openj9-openjdk-jre-bin/Manifest +++ b/dev-java/openj9-openjdk-jre-bin/Manifest @@ -1,9 +1,6 @@ -DIST ibm-semeru-open-jre_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 45395879 SHA256 ab7f01a961559b49ce9b0a76af20191b7c047c6c1b6e5258e38f6c38de8cdc3f -DIST ibm-semeru-open-jre_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 45322621 SHA256 8f934ce1745f52a067bdeb56b3b9e9192f51e674ff2956a1e53b33e44ea5ca42 -DIST ibm-semeru-open-jre_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 45244476 SHA256 cf42a289c53e6098223223326cd21a152d7102859030e23c52287d82d6d9560e -DIST ibm-semeru-open-jre_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 48098550 SHA256 fba1dd9c25b0cce7efe124151b006624eeb2d2b0764284ca892d0e50ee457a41 -DIST ibm-semeru-open-jre_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 48355201 SHA256 d54972fb938f655a3665512c7181c2c5813e3bfe742650d6081e2f480388ef2f -DIST ibm-semeru-open-jre_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 48263242 SHA256 57726d73c644107de26fe6c252a58f477e691b9aa81de0c23251318f87aa621b -DIST ibm-semeru-open-jre_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 47254074 SHA256 b1d31a4165cabcad66771a05acf8ff750f40953558494ba8d88e97fac55af6a9 -DIST ibm-semeru-open-jre_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 47171747 SHA256 759f9c507e0faf53b260ee9f492bab8fdeb8091bdecad904134861714e4d913b -DIST ibm-semeru-open-jre_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 47105731 SHA256 4fb19cedab5967359991b9bcb3be09744fc9ac027d0b773870ee7f7aaf539666 +DIST ibm-semeru-open-jre_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 46724041 SHA256 5eb5d5d6006e1066b5c72d3b000f1c8fda572fa64189af103ef1176235cd3174 +DIST ibm-semeru-open-jre_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 46616927 SHA256 9760aa27a5790a8c20a702ff5f036535f3df51d3fb291bb5254b5ae76e096bad +DIST ibm-semeru-open-jre_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 48848011 SHA256 0495d4d122dfb7ae160d9c76549f62fdd77b9c8ceddc9d4aced882c3c5157ba5 +DIST ibm-semeru-open-jre_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 49098475 SHA256 73b9baab2766191de5da00498f2dcfe9de90fff6c4c457bea4944f103c6dde6e +DIST ibm-semeru-open-jre_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 48023048 SHA256 324f7e8d75490cc76d5cf6a46b43f50ec1206a97d49e1549d1c65f1583fc51d5 +DIST ibm-semeru-open-jre_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 47935029 SHA256 1caf409f33f7738efe37742197525b5ae6244d6383b2017e7b8e925dc0b6a329 diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh index 1ad9132..ba4b8a2 100644 --- a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh +++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh @@ -1,10 +1,5 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK JRE ${DL_PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" +VERSION="IBM Semeru JRE ${DL_PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" @@ -13,4 +8,4 @@ PROVIDES_TYPE="JRE" PROVIDES_VERSION="${SLOT}" BOOTCLASSPATH="" GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openj9-openjdk-jre-bin/metadata.xml b/dev-java/openj9-openjdk-jre-bin/metadata.xml index b21a054..96526d8 100644 --- a/dev-java/openj9-openjdk-jre-bin/metadata.xml +++ b/dev-java/openj9-openjdk-jre-bin/metadata.xml @@ -8,6 +8,5 @@ </longdescription> <use> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> </use> </pkgmetadata> diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild deleted file mode 100644 index 624390d..0000000 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 - -abi_uri() { - echo "${2-$1}? ( - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jre_${1}_linux_${DL_PV/+/_}.tar.gz - )" -} - -JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 -SLOT=$(ver_cut 1) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" -HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >net-libs/libnet-1.1 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${JDK_PV}-jre" - -src_install() { - local dest="/opt/${PN}-${SLOT}" - local ddest="${ED}/${dest#/}" - - # Not sure why they bundle this as it's commonly available and they - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea - # also has an explicit dependency while Oracle seemingly dlopens it. - rm -vf lib/libfreetype.so || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - - rm -v lib/security/cacerts || die - dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild index 624390d..7aa42d8 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.5_p8.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild @@ -12,7 +12,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.41.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild index febf680..7aa42d8 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild @@ -12,7 +12,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.33.1 +DL_PV=${JDK_PV}_openj9-0.41.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index ffc3344..59d3825 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.33.1.tar.gz 17354965 BLAKE2B c5b9c64ea45eefb2a0c67cd414844e52486481b939b8c62c68444f28f9490ebc2bf04913229576e4fff616b63ef6c242e4748a7ad9dea212714e40d9dbb3bd17 SHA512 fdb75916c868473465687c4fc15eafc1abf02ecff4c88b9998bcbc88e6583868ae3012be89f75734c08b636cf41d04946ec3e7bf29afef0575c8b1146616c9a5 -DIST openj9-omr-0.33.1.tar.gz 7932300 BLAKE2B 9fe2d80119dd7a61058d88ea04220db884e95d781f140247a95014acc80da90783849999f6fbe4e0cfb02e95675265875cbf3dfc1309c09e79226bc4d3b5c603 SHA512 b9322aba18bd487407e77f97a751c9e268577e6a03762070bb7c612276ee149891f6177affb2cabfccdacb2eb1e95c500f4a4473095651cc3f30debe10897d10 -DIST openj9-openjdk-jdk11-openj9-0.33.1.tar.gz 109332234 BLAKE2B c289f81a3fdeb4331fe11f0de7e0a6b78f784025048844b3118e5cff12c68623e989b8d776388956c8c5ed056dd91799d06e20410b0036ca7e50ffdba054eb21 SHA512 fb7e4627d1505887aeb67a1feccd3260f2f997190b9081acd5f22fbad395683e3fbefadab4073b119317744bb7afad54befa7bf9f9ceb15db59c806a5d1e4f81 -DIST openj9-openjdk-jdk17-openj9-0.33.1.tar.gz 94013661 BLAKE2B f5f4155fa3b449b09582782ac2c64a69cd37caa10dd731c6fdb0441b87149f1c867a3d622fd04c242e45a5ad9e07f55c824db1c77baa83493ef7314f63c509b9 SHA512 d5a2cefa683b2ec254db0bf636e02f312db4153c25daff41afdd41c8d8aa529aa87f60476edd229dfb5bb5cb9a67030ab67efac44282f355a9b6d5128a169a2e +DIST openj9-0.41.0.tar.gz 18175551 BLAKE2B 691251444980b715b30d2624f6bf9e3964fb848201491f9ac18076ad8d4e354f34ba38affdf55ddf2631ddbd980a5fa4a39a7ac4dab9da8d8cf912711e03009a SHA512 39b5b3d950954183fcfce40398ab7a990a5030e7f403d2e1eb216a914345ec78bcdac14c5c2b24c7ddafcb75a91e267b03c752f88189b537258967f2d191efea +DIST openj9-omr-0.41.0.tar.gz 8058703 BLAKE2B ead5711d9ab0400ddee7798c594585b9bfe73eeb20fc59f191ba062e64005f8c41c4ff8049e58d95cdb5f2175929274ae306c0b4f7938e8c5c8df2f9962d59df SHA512 2429994271f8367204b0e6d75450a7d283dc0fc1166055340a050cf80e06e87d95e3df0607d8d2554fb4adfa712f6ff048fb3d0fb24efed1960e5e3802b7f02d +DIST openj9-openjdk-jdk11-openj9-0.41.0.tar.gz 102514856 BLAKE2B cb1bdc624ae4222ceaac329c5a70ac9f69003bad1dafbd2600fd088538a988b659f368615d5a269c0965caeb14df5b60cf80231d203fbe4a6302ba14a29fccaa SHA512 681a5d636c4672dae489cf71dfd6d9f8879a6ffe795912ecf9fa8f319f2039a16b9db2a75ee69bee9330f2978c411b077d496dc46ff91d9ec4c835f2b32d6142 +DIST openj9-openjdk-jdk17-openj9-0.41.0.tar.gz 95151687 BLAKE2B 4f31f740d3bc568910ec9c0c55b980a51e13272c1fd2d740e019b0fbe1631910e4f961170b26221bcf49d88e47fe0f314ab1182d113581abdecd096f873f71f6 SHA512 5d6e58a317c641b5b73295ee2f3ca63e85d14385640727e949ad06c41dc260fd710eef9f5eac8cb426e1524439359340f2d1ab606c752d77643baeb3201a2d18 diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml index 7148c44..dadf469 100644 --- a/dev-java/openj9-openjdk/metadata.xml +++ b/dev-java/openj9-openjdk/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="ddr">Enable Direct Dump Reader</flag> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag> <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> <flag name="jitserver">OpenJ9 JITServer support</flag> diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild index 11e1f9f..35bc082 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild @@ -18,7 +18,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git" else SRC_URI=" - https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz + https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz " @@ -27,7 +27,7 @@ fi LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -83,14 +83,14 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] + dev-java/openj9-openjdk-bin:${SLOT} + dev-java/openj9-openjdk:${SLOT} + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} ) " -S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" +S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild index 8a7494e..ca64ddd 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild @@ -18,7 +18,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git" else SRC_URI=" - https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz + https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz " @@ -27,7 +27,7 @@ fi LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -90,7 +90,7 @@ DEPEND=" ) " -S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" +S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but @@ -303,7 +303,7 @@ src_install() { # must be done before running itself java-vm_set-pax-markings "${ddest}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter @@ -313,3 +313,7 @@ src_install() { dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest deleted file mode 100644 index daf4475..0000000 --- a/dev-lang/zig/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d diff --git a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch b/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch deleted file mode 100644 index 70f807f..0000000 --- a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 638f39f7e..791477c41 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -787,7 +787,7 @@ else() - set(ZIG1_RELEASE_ARG -OReleaseFast --strip) - endif() - if(ZIG_SINGLE_THREADED) -- set(ZIG1_SINGLE_THREADED_ARG "-fsingle-threaded") -+ set(ZIG1_SINGLE_THREADED_ARG "--single-threaded") - else() - set(ZIG1_SINGLE_THREADED_ARG "") - endif() diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild deleted file mode 100644 index 2227501..0000000 --- a/dev-lang/zig/zig-0.9.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=13 -inherit cmake llvm check-reqs - -DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ziglang/zig.git" - inherit git-r3 -else - SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test +threads" -RESTRICT="!test? ( test )" - -PATCHES=("${FILESDIR}/${P}-fix-single-threaded.patch") - -BUILD_DIR="${S}/build" - -# According to zig's author, zig builds that do not support all targets are not -# supported by the upstream project. -ALL_LLVM_TARGETS=( - AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX - PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore -) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]/%/(-)?}" - -IUSE="test threads ${ALL_LLVM_TARGETS[*]}" - -RDEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT} - >=sys-devel/lld-${LLVM_MAX_SLOT} - <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1)) - sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] -" -DEPEND="${RDEPEND}" - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements -CHECKREQS_MEMORY="10G" - -pkg_setup() { - llvm_pkg_setup - check-reqs_pkg_setup -} - -src_configure() { - local mysedargs=() llvm_target arch - for target in "${ALL_LLVM_TARGETS[@]}"; do - if ! use $target; then - llvm_target=${target#llvm_targets_} - case $llvm_target in - AArch64) arch=(aarch64 aarch64_be aarch64_32);; - AMDGPU) arch=(amdgcn);; - ARM) arch=(thumb thumbeb arm armeb);; - AVR) arch=(avr);; - BPF) arch=(bpfel bpfeb);; - Hexagon) arch=(hexagon);; - Lanai) arch=(lanai);; - Mips) arch=(mips mipsel mips64 mips64el);; - MSP430) arch=(msp430);; - NVPTX) arch=(nvptx nvptx64);; - PowerPC) arch=(powerpc powerpcle powerpc64 powerpc64le);; - RISCV) arch=(riscv32 riscv64);; - Sparc) arch=(sparc sparcv9 sparcel);; - SystemZ) arch=(s390x);; - WebAssembly) arch=(wasm32 wasm64);; - X86) arch=(i386 x86_64);; - XCore) arch=(xcore);; - *) die "unhandled target" - esac - for a in ${arch[@]}; do - mysedargs+=( - -e "/^pub fn targetTriple(/,/^}/s/\.$a => .*/.$a => return error.@\"Zig compiled without LLVM $llvm_target\",/" - ) - done - mysedargs+=( - -e " - /^fn initializeLLVMTarget(/,/^}/ { - /\.$a => {/,/},$/ { - s/=>.*/=> unreachable,/ - /=>/!d - } - } - " - ) - fi - done - sed -i "${mysedargs[@]}" src/codegen/llvm.zig || die - - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_PREFER_CLANG_CPP_DYLIB=ON - -DZIG_SINGLE_THREADED="$(usex threads OFF ON)" - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./zig build test || die -} diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest index e69b4d1..53fb6a2 100644 --- a/dev-libs/libdwarf/Manifest +++ b/dev-libs/libdwarf/Manifest @@ -1 +1 @@ -DIST libdwarf-0.4.2.tar.xz 2419592 BLAKE2B 403b79222c541f65c1e826449228c3184ab6c5e42920512dce46169b32b113f3c3a49644777d0d4d1dfc37639cd551a78bd422a98ab40f96ad693b82b22b0493 SHA512 6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2 +DIST libdwarf-0.9.0.tar.xz 2718492 BLAKE2B fd3d2d94532a009dfceb46869481507bf92d8ad7236bc2240049272f5e9f102d1a53bcc57df83fcdfc0ab37fbdab6e3926312d3619d8b0e669198b47bba1b950 SHA512 282d90dfc9da704eb64a4ba1141f2ae660feeb14bbf1a72377386698e3124928b44a6914d8e88e6141ab08835ce723ad090a853ad57dbcb439dbba57255fb589 diff --git a/dev-libs/libdwarf/libdwarf-0.4.2.ebuild b/dev-libs/libdwarf/libdwarf-0.9.0.ebuild index ee99812..475c379 100644 --- a/dev-libs/libdwarf/libdwarf-0.4.2.ebuild +++ b/dev-libs/libdwarf/libdwarf-0.9.0.ebuild @@ -14,7 +14,6 @@ IUSE="dwarfexample dwarfgen static-libs" DEPEND=" sys-libs/zlib - dwarfgen? ( virtual/libelf ) " RDEPEND="${DEPEND}" @@ -24,7 +23,6 @@ src_configure() { --enable-shared $(use_enable dwarfexample) $(use_enable dwarfgen) - $(use_enable dwarfgen libelf) $(use_enable static-libs static) ) econf "${myeconfargs[@]}" diff --git a/dev-libs/libdwarf/metadata.xml b/dev-libs/libdwarf/metadata.xml index c4a208f..32edad3 100644 --- a/dev-libs/libdwarf/metadata.xml +++ b/dev-libs/libdwarf/metadata.xml @@ -9,4 +9,7 @@ <flag name="dwarfexample">dwarfexample</flag> <flag name="dwarfgen">dwarfgen</flag> </use> + <upstream> + <remote-id type="github">davea42/libdwarf-code</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 14cd35d..a86d270 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,2 +1,2 @@ -DIST openssl-3.0.5.tar.gz 15074407 BLAKE2B 7bf89e042417c003ef02a8bb1278590a52ce4a3d50f66795c66b750f90248840edb0d3352811caaaaff708c7e65b77384142e316916a6c311f1d2b4747f44816 SHA512 782b0df3d0252468aa696bd74a3b661810499819c0df849aa9698ba0e06a845820dc856aac650fced4be234f1271e576d4317ac3ab1406cf0ffe087d695d20fe -DIST openssl-3.0.5.tar.gz.asc 862 BLAKE2B 24f1839227be7acec45eb6b748cea7be0b5e66b5cf745814861f7290670733936bf1af2c1dc9357439b31a2ca28f418880d63726d4be6fa994902ac95b51e401 SHA512 516da9ef291601400576adaba7271854af3caa23dc1d70116004360f580e4c28fe61d51e86477d341e4c5bf0ca5f98db8264581ed6cc2c8df124da83ad3e40be +DIST openssl-3.1.1.tar.gz 15544757 BLAKE2B 094f7e28f16de6528016fcd21df1d7382b0dbdcd80ec469d37add9c37f638c059dda3ffb4415eba890a33d146ddc9016bcc7192df101c73be5e70faf6e3b1097 SHA512 8ba9dd6ab87451e126c19cc106ccd1643ca48667d6c37504d0ab98205fbccf855fd0db54474b4113c4c3a15215a4ef77a039fb897a69f71bcab2054b2effd1d9 +DIST openssl-3.1.1.tar.gz.asc 833 BLAKE2B 5a2a9aeb475b843862e133d53bc5bb3c8e12e8e03b1e2da41d0eaa0eade1ae03c4318ad1f5c490c5e1ed7e6ac6275a6d7c881d99993911722b043b15d1622b25 SHA512 83349020c67e5b956f3ef37604a03a1970ea393f862691f5fd5d85930c01e559e25db17d397d8fd230c3862a8b2fba2d5c7df883d56d7472f4c01dab3a661cb2 diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.4 index 68d7d0a..79f6331 100644 --- a/dev-libs/openssl/files/gentoo.config-1.0.2 +++ b/dev-libs/openssl/files/gentoo.config-1.0.4 @@ -77,7 +77,9 @@ fi # Detect target arch machine="" +submachine="" chost_machine=${CHOST%%-*} +[[ ${CC} == *clang* ]] && submachine="-clang" case ${system} in linux) case ${chost_machine}:${ABI} in @@ -95,17 +97,22 @@ linux) # hppa64*) machine=parisc64;; hppa*) machine="generic32 -DB_ENDIAN";; i[0-9]86*|\ - x86_64*:x86) machine=elf;; + x86_64*:x86) machine=x86${submachine};; ia64*) machine=ia64;; - m68*) machine="generic32 -DB_ENDIAN";; - mips*el*) machine="generic32 -DL_ENDIAN";; - mips*) machine="generic32 -DB_ENDIAN";; + loongarch64*) machine="loongarch64 -DL_ENDIAN" system=linux64;; + m68*) machine="latomic -DB_ENDIAN";; + mips*el*:o32) machine="mips32 -DL_ENDIAN";; + mips*:o32) machine="mips32 -DB_ENDIAN";; + mips*el*:n32) machine="mips64 -DL_ENDIAN";; + mips*:n32) machine="mips64 -DB_ENDIAN";; + mips*el*:n64) machine="mips64 -DL_ENDIAN" system=linux64;; + mips*:n64) machine="mips64 -DB_ENDIAN" system=linux64;; powerpc64*le*)machine=ppc64le;; powerpc64*) machine=ppc64;; powerpc*le*) machine="generic32 -DL_ENDIAN";; powerpc*) machine=ppc;; riscv32*) machine="generic32 -DL_ENDIAN";; - riscv64*) machine="generic64 -DL_ENDIAN";; + riscv64*) machine="riscv64 -DL_ENDIAN" system=linux64;; # sh64*) machine=elf;; sh*b*) machine="generic32 -DB_ENDIAN";; sh*) machine="generic32 -DL_ENDIAN";; @@ -120,7 +127,7 @@ linux) s390x*) machine=s390x system=linux64;; s390*) machine="generic32 -DB_ENDIAN";; x86_64*:x32) machine=x32;; - x86_64*) machine=x86_64;; + x86_64*) machine=x86_64${submachine};; esac ;; BSD) diff --git a/dev-libs/openssl/files/openssl-3.0.5-test-memcmp.patch b/dev-libs/openssl/files/openssl-3.0.5-test-memcmp.patch deleted file mode 100644 index 8fa0387..0000000 --- a/dev-libs/openssl/files/openssl-3.0.5-test-memcmp.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7f58de577c05ae0bbd20eee9b2971cfa1cd062c8 Mon Sep 17 00:00:00 2001 -From: Gregor Jasny <gjasny@googlemail.com> -Date: Tue, 5 Jul 2022 12:57:06 +0200 -Subject: [PATCH] Add missing header for memcmp - -CLA: trivial ---- - test/v3ext.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/v3ext.c b/test/v3ext.c -index 926f3884b138..a8ab64b2714b 100644 ---- a/test/v3ext.c -+++ b/test/v3ext.c -@@ -8,6 +8,7 @@ - */ - - #include <stdio.h> -+#include <string.h> - #include <openssl/x509.h> - #include <openssl/x509v3.h> - #include <openssl/pem.h> diff --git a/dev-libs/openssl/openssl-3.0.5-r1.ebuild b/dev-libs/openssl/openssl-3.1.1.ebuild index 5aa7087..d391173 100644 --- a/dev-libs/openssl/openssl-3.0.5-r1.ebuild +++ b/dev-libs/openssl/openssl-3.1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig @@ -16,20 +16,22 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else - SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" + SRC_URI=" + mirror://openssl/source/${MY_P}.tar.gz + verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc ) + " + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi S="${WORKDIR}"/${MY_P} LICENSE="Apache-2.0" -SLOT="0/3" # .so version of libssl/libcrypto +SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" RESTRICT="!test? ( test )" COMMON_DEPEND=" - >=app-misc/c_rehash-1.7-r1 + !<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) " BDEPEND=" @@ -40,7 +42,7 @@ BDEPEND=" sys-devel/bc sys-process/procps ) - verify-sig? ( sec-keys/openpgp-keys-openssl )" + verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" @@ -50,10 +52,6 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/configuration.h ) -PATCHES=( - "${FILESDIR}"/${P}-test-memcmp.patch -) - pkg_setup() { if use ktls ; then if kernel_is -lt 4 18 ; then @@ -62,6 +60,7 @@ pkg_setup() { CONFIG_CHECK="~TLS ~TLS_DEVICE" ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" linux-info_pkg_setup fi @@ -91,13 +90,6 @@ src_unpack() { } src_prepare() { - # Allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 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,18 +107,13 @@ src_prepare() { rm test/recipes/80-test_ssl_new.t || die fi - # - Make sure the man pages are suffixed (bug #302165) - # - Don't bother building man pages if they're disabled - # - Make DOCDIR Gentoo compliant - sed -i \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ - Configurations/unix-Makefile.tmpl \ - || die + # Test fails depending on kernel configuration, bug #699134 + rm test/recipes/30-test_afalg.t || die +} + +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 @@ -139,32 +126,17 @@ src_prepare() { # it's still relevant: # - https://github.com/llvm/llvm-project/issues/55255 # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 # Don't remove the no strict aliasing bits below! filter-flags -fstrict-aliasing append-flags -fno-strict-aliasing + # The OpenSSL developers don't test with LTO right now, it leads to various + # warnings/errors (which may or may not be false positives), it's considered + # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. + filter-lto append-flags $(test-flags-CC -Wa,--noexecstack) - # Prefixify Configure shebang (bug #141906) - sed \ - -e "1s,/usr/bin/env,${BROOT}&," \ - -i Configure || die - - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { # bug #197996 unset APPS # bug #312551 @@ -174,14 +146,16 @@ 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") - local sslout=$(./gentoo.config) + local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") einfo "Using configuration: ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features local myeconfargs=( @@ -194,7 +168,7 @@ multilib_src_configure() { enable-sm2 enable-srp $(use elibc_musl && echo "no-async") - $(use amd64 && echo "enable-ec_nistp_64_gcc_128") + enable-ec_nistp_64_gcc_128 enable-idea enable-mdc2 $(use fips && echo "enable-fips") @@ -214,36 +188,15 @@ multilib_src_configure() { threads ) - CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile \ - || die + edo perl "${S}/Configure" "${myeconfargs[@]}" } multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend + emake build_sw - emake all + if multilib_is_native_abi; then + emake build_docs + fi } multilib_src_test() { @@ -253,10 +206,17 @@ multilib_src_test() { } multilib_src_install() { - # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130) - dodir /usr + 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 - emake DESTDIR="${D}" install + if multilib_is_native_abi; then + emake DESTDIR="${D}" install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + fi # This is crappy in that the static archives are still built even # when USE=static-libs. But this is due to a failing in the openssl @@ -278,38 +238,6 @@ multilib_src_install_all() { # Create the certs directory keepdir ${SSL_CNF_DIR}/certs - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man || die - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} - d=${d#./} - m=${m##*/} - - [[ ${m} == openssl.1* ]] && continue - - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - - mv ${d}/{,ssl-}${m} || die - - # Fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die - ln -s ssl-${m} ${d}/openssl-${m} || die - - # Locate any symlinks that point to this man page - # We assume that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - - rm -f ${d}/${s} - - # We don't want to "|| die" here - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - # bug #254521 dodir /etc/sandbox.d echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl @@ -318,8 +246,19 @@ 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 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" eend $? } diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest deleted file mode 100644 index 88d6a49..0000000 --- a/dev-qt/qtgui/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f -DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf -DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 diff --git a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch b/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch deleted file mode 100644 index 0d0acdf..0000000 --- a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 97acde2828c8814671f4938e0c4805d945a4d110 Mon Sep 17 00:00:00 2001 -From: Tang Haixiang <tanghaixiang@uniontech.com> -Date: Thu, 25 Feb 2021 18:05:17 +0800 -Subject: [PATCH] xcb: Update _NET_SUPPORTED when the window manager changes it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In some cases, the application may start before the window manager, and in some window managers -_NET_SUPPORTED may be changed. These situations will cause the _NET_SUPPORTED value obtained by Qt -to be inconsistent with the window manager. - -Fixes: QTBUG-91396 -Change-Id: I63c6934ad2538cdb9f05926b3748216bd0dcf04e -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> - - -(cherry picked from commit acb0065cc7e4ee849cc87ce72e46b05a61370c43) ---- - src/plugins/platforms/xcb/qxcbconnection.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp -index 8477e28df1..6aa61e0d34 100644 ---- a/src/plugins/platforms/xcb/qxcbconnection.cpp -+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp -@@ -659,6 +659,8 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) - QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(propertyNotify->window); - if (virtualDesktop) - virtualDesktop->updateWorkArea(); -+ } else if (propertyNotify->atom == atom(QXcbAtom::_NET_SUPPORTED)) { -+ m_wmSupport->updateNetWMAtoms(); - } else { - HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent); - } --- -GitLab - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml deleted file mode 100644 index 6edd18d..0000000 --- a/dev-qt/qtgui/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <use> - <flag name="egl">Enable EGL integration</flag> - <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag> - <flag name="evdev">Enable support for input devices via evdev</flag> - <flag name="ibus">Build the IBus input method plugin</flag> - <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> - <flag name="linuxfb">Enable Linux framebuffer support for embedded devices</flag> - <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> - <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> - <flag name="vulkan">Enable support for Vulkan</flag> - <flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag> - <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> - <slots> - <subslots> - Must only be used by packages that are known to use private parts of the Qt API. - </subslots> - </slots> -</pkgmetadata> diff --git a/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild deleted file mode 100644 index 16eeea1..0000000 --- a/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT5_KDEPATCHSET_REV=2 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -SLOT=5/${QT5_PV} # bug 707658 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg - +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X" -REQUIRED_USE=" - accessibility? ( dbus X ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - X? ( gles2-only? ( egl ) ) -" - -RDEPEND=" - dev-libs/glib:2 - =dev-qt/qtcore-${QT5_PV}*:5= - dev-util/gtk-update-icon-cache - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - sys-libs/zlib:= - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - eglfs? ( - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - jpeg? ( media-libs/libjpeg-turbo:= ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - libinput? ( - dev-libs/libinput:= - x11-libs/libxkbcommon - ) - png? ( media-libs/libpng:= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) - udev? ( virtual/libudev:= ) - vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb:=[xkb] - x11-libs/libxkbcommon[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - linuxfb? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) -" - -QT5_TARGET_SUBDIRS=( - src/tools/qvkgen - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl:egl: - eglfs:eglfs: - eglfs:eglfs_egldevice: - eglfs:eglfs_gbm: - evdev:evdev: - evdev:mtdev: - :fontconfig: - :system-freetype:FREETYPE - !:no-freetype: - !gif:no-gif: - gles2-only::OPENGL_ES - gles2-only:opengles2:OPENGL_ES_2 - !:no-gui: - :system-harfbuzz: - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib:tslib: - udev:libudev: - vulkan:vulkan: - X:xcb: - X:xcb-glx: - X:xcb-plugin: - X:xcb-render: - X:xcb-sm: - X:xcb-xlib: - X:xcb-xinput: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -# https://bugs.kde.org/show_bug.cgi?id=449196 -# https://bugreports.qt.io/browse/QTBUG-91396 -PATCHES=( # kde/5.15 branch - "${FILESDIR}/${P}"-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch -) - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - - # egl_x11 is activated when both egl and X are enabled - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usev dbus -dbus-linked) - $(qt_use egl) - $(qt_use eglfs) - $(usev eglfs '-gbm -kms') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(usev !gif -no-gif) - -gui - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - $(qt_use linuxfb) - -opengl $(usex gles2-only es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use vulkan) - $(qt_use X xcb) - $(usev X '-xcb-xlib') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/gui-apps/gammastep/Manifest b/gui-apps/gammastep/Manifest deleted file mode 100644 index 0616039..0000000 --- a/gui-apps/gammastep/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gammastep-2.0.8.tar.bz2 539944 BLAKE2B 6a572c5eb26339ddd2f597dff1b2f5d9f1f232e6465e1fdd4e4a93df616cf785bfdf75a03c6d9ae8b3606382ed95bd2ad5d12802fca075eae00e2f3e48d6d189 SHA512 9ffc79f1970672f551513ddd4df3c3fe5cdc71883471ebfb1dbe65f2f6ee77248c0b2ef704ab5879d2b183d4b7b6e19ed380b9f3a3c82b9013c52252c3bbfa5e diff --git a/gui-apps/gammastep/gammastep-2.0.8.ebuild b/gui-apps/gammastep/gammastep-2.0.8.ebuild deleted file mode 100644 index cf33697..0000000 --- a/gui-apps/gammastep/gammastep-2.0.8.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) - -inherit systemd autotools gnome2-utils python-r1 - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="https://gitlab.com/chinstrap/gammastep/" -SRC_URI="https://gitlab.com/chinstrap/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="X appindicator drm geoclue gtk nls wayland" - -BDEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50 - nls? ( sys-devel/gettext ) -" -DEPEND=" - X? ( - >=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) - drm? ( x11-libs/libdrm ) - geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) - gtk? ( ${PYTHON_DEPS} ) - wayland? ( >=dev-libs/wayland-1.15.0 )" -RDEPEND="${DEPEND} - gtk? ( dev-python/pygobject[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - dev-python/pyxdg[${PYTHON_USEDEP}] )" -REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${PN}-v${PV}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use gtk && python_setup - - econf \ - $(use_enable nls) \ - $(use_enable drm) \ - $(use_enable X randr) \ - $(use_enable X vidmode) \ - $(use_enable geoclue geoclue2) \ - $(use_enable gtk gui) \ - $(use_enable wayland) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - --enable-apparmor -} - -_impl_specific_src_install() { - emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \ - -C src/gammastep_indicator install -} - -src_install() { - emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install - - if use gtk; then - python_foreach_impl _impl_specific_src_install - python_replicate_script "${D}"/usr/bin/gammastep-indicator - - python_foreach_impl python_optimize - fi -} - -pkg_preinst() { - use gtk && gnome2_icon_savelist -} - -pkg_postinst() { - use gtk && gnome2_icon_cache_update -} - -pkg_postrm() { - use gtk && gnome2_icon_cache_update -} diff --git a/gui-apps/gammastep/metadata.xml b/gui-apps/gammastep/metadata.xml deleted file mode 100644 index 9cbd80b..0000000 --- a/gui-apps/gammastep/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> - <use> - <flag name="drm">Enable drm method.</flag> - <flag name="geoclue">Enable geolocation support.</flag> - </use> -</pkgmetadata> diff --git a/gui-apps/wlsunset/Manifest b/gui-apps/wlsunset/Manifest new file mode 100644 index 0000000..dc36999 --- /dev/null +++ b/gui-apps/wlsunset/Manifest @@ -0,0 +1 @@ +DIST wlsunset-0.3.0.tar.gz 16533 BLAKE2B 930635e82963d14fae9f95e2219574c962adbf32406bd184d35b79848dce2f2edaa526aaaf21c2dfdde9f4d4f9fe04011d592955867c3b01b5de4778ef9915f1 SHA512 0685989ec99d7066d5d1efacfbb4676d2df235d33d64cfe3d41c762ccc2ff5c292e03430414b43d719c35ddc0ad8267b765764c15afd1b3177ed1e0bb6f449c1 diff --git a/dev-lang/zig/metadata.xml b/gui-apps/wlsunset/metadata.xml index 9a74b67..ec5cc1f 100644 --- a/dev-lang/zig/metadata.xml +++ b/gui-apps/wlsunset/metadata.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> <upstream> - <remote-id type="github">ziglang/zig</remote-id> + <remote-id type="sourcehut">~kennylevinsen/wlsunset</remote-id> </upstream> </pkgmetadata> diff --git a/gui-apps/wlsunset/wlsunset-0.3.0.ebuild b/gui-apps/wlsunset/wlsunset-0.3.0.ebuild new file mode 100644 index 0000000..3a80af2 --- /dev/null +++ b/gui-apps/wlsunset/wlsunset-0.3.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/wlsunset" +else + KEYWORDS="~amd64" + SRC_URI="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Day/night gamma adjustments for Wayland" +HOMEPAGE="https://sr.ht/~kennylevinsen/wlsunset/" +LICENSE="MIT" +SLOT="0" + +BDEPEND=" + app-text/scdoc + dev-util/wayland-scanner +" +RDEPEND="dev-libs/wayland" +DEPEND=" + ${RDEPEND} + dev-libs/wayland-protocols +" + +src_configure() { + local emesonargs=( + -Dwerror=false + -Dman-pages=enabled + ) + + meson_src_configure +} diff --git a/gui-apps/wob/Manifest b/gui-apps/wob/Manifest new file mode 100644 index 0000000..aab291a --- /dev/null +++ b/gui-apps/wob/Manifest @@ -0,0 +1 @@ +DIST wob-0.14.2.tar.gz 21848 BLAKE2B 10dffa9a168ae9b17ec3aed651029100c35050d65fc392dcd6775a321d1ced46b085376c8b74b789c6712577f380ec97d7141d44429acf1a2def2443b20ca3b5 SHA512 933d6bb0469f3b446f8998738ebe7045a1d707a814345961848a025e53cd9bd367cf138c8c6deafe8906c887e783bef85f669e9f107c51c51d357f087aaad6b8 diff --git a/gui-apps/wob/metadata.xml b/gui-apps/wob/metadata.xml new file mode 100644 index 0000000..78784e3 --- /dev/null +++ b/gui-apps/wob/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <longdescription lang="en"> + A lightweight overlay volume/backlight/progress/anything bar + for wlroots based Wayland compositors (requrires support for + wlr_layer_shell_unstable_v1). This project is inspired by + xob - X Overlay Bar + </longdescription> + <upstream> + <remote-id type="github">francma/wob</remote-id> + <bugs-to>https://github.com/francma/wob/issues</bugs-to> + </upstream> + <use> + <flag name="man">Install man page</flag> + <flag name="seccomp">Linux kernel syscall filtering</flag> + </use> +</pkgmetadata> diff --git a/gui-apps/wob/wob-0.14.2.ebuild b/gui-apps/wob/wob-0.14.2.ebuild new file mode 100644 index 0000000..bf8f34d --- /dev/null +++ b/gui-apps/wob/wob-0.14.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="Lightweight overlay volume/backlight/progress/anything bar for Wayland" +HOMEPAGE="https://github.com/francma/wob" +SRC_URI="https://github.com/francma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+man +seccomp" + +RDEPEND="dev-libs/wayland" +DEPEND="${RDEPEND} + dev-libs/inih + dev-libs/wayland-protocols + seccomp? ( sys-libs/libseccomp ) +" +BDEPEND=" + dev-util/wayland-scanner + man? ( app-text/scdoc ) +" + +src_configure() { + local emesonargs=( + $(meson_feature man man-pages) + $(meson_feature seccomp) + ) + meson_src_configure +} diff --git a/gui-apps/wshowkeys/Manifest b/gui-apps/wshowkeys/Manifest new file mode 100644 index 0000000..28ec7a2 --- /dev/null +++ b/gui-apps/wshowkeys/Manifest @@ -0,0 +1 @@ +DIST wshowkeys-1.0.tar.gz 26700 BLAKE2B e0898743878fcdcb28a3c132cc312fe0e4696e34ac8c58f52d857ca302a675c6aa10cdd370e2727a72502a5f881adfb4638a765992b4f46b5a85987e15e4e289 SHA512 09f190d9825cb051d61484801ea7d9766c2b3c9fee4171a8926237c905a00fa98327f5d85ff601a9faf845e1cb8d58c7056811ffc7d4904985bd03d750581e6a diff --git a/gui-apps/wshowkeys/wshowkeys-9999.ebuild b/gui-apps/wshowkeys/wshowkeys-1.0.ebuild index 2d5faf6..7254e38 100644 --- a/gui-apps/wshowkeys/wshowkeys-9999.ebuild +++ b/gui-apps/wshowkeys/wshowkeys-1.0.ebuild @@ -3,15 +3,15 @@ EAPI=7 -inherit git-r3 meson +inherit meson DESCRIPTION="Displays keys being pressed on a Wayland session" HOMEPAGE="https://git.sr.ht/~sircmpwn/wshowkeys" -EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/wshowkeys" +SRC_URI="https://git.sr.ht/~sircmpwn/wshowkeys/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" diff --git a/gui-wm/tinywl/Manifest b/gui-wm/tinywl/Manifest deleted file mode 100644 index 9433b60..0000000 --- a/gui-wm/tinywl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677 diff --git a/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch b/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch deleted file mode 100644 index cff1f72..0000000 --- a/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001 -From: Simon Ser <contact@emersion.fr> -Date: Sat, 19 Mar 2022 14:00:43 +0100 -Subject: [PATCH] tinywl: don't crash when there is no keyboard - -Running with WLR_BACKENDS=headless, there is no keyboard device. -Avoid crashes like so: - - ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard' - ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard' - AddressSanitizer:DEADLYSIGNAL - ================================================================= - ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0) - ==331107==The signal is caused by a READ memory access. - ==331107==Hint: address points to the zero page. - #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136 - #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603 - #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29 - #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315 - #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466 - #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523 - #6 0x7f75d5714d49 (/usr/lib/libffi.so.8+0x6d49) - #7 0x7f75d5714266 (/usr/lib/libffi.so.8+0x6266) - #8 0x7f75d68cb322 (/usr/lib/libwayland-server.so.0+0xd322) - #9 0x7f75d68c65cb (/usr/lib/libwayland-server.so.0+0x85cb) - #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9) - #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36) - #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905 - #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f) - #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0) - #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4) ---- - tinywl/tinywl.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c -index dd442aac..8796e9df 100644 ---- a/tinywl/tinywl.c -+++ b/tinywl/tinywl.c -@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) { - * track of this and automatically send key events to the appropriate - * clients without additional work on your part. - */ -- wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, -- keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); -+ if (keyboard != NULL) { -+ wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, -+ keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); -+ } - } - - static void keyboard_handle_modifiers( --- -2.36.1 - diff --git a/gui-wm/tinywl/tinywl-0.15.1.ebuild b/gui-wm/tinywl/tinywl-0.15.1.ebuild deleted file mode 100644 index c8ddb20..0000000 --- a/gui-wm/tinywl/tinywl-0.15.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION='"minimum viable product" Wayland compositor based on wlroots' -HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/tinywl" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PV}/wlroots-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="CC0-1.0" -SLOT="0" -IUSE="" - -DEPEND=" - >=gui-libs/wlroots-${PV}:= - dev-libs/wayland-protocols -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-libs/wayland-protocols - virtual/pkgconfig -" - -S=${WORKDIR}/wlroots-${PV} - -PATCHES=( - "${FILESDIR}/tinywl-don-t-crash-when-there-is-no-keyboard.patch" -) - -S="${WORKDIR}/wlroots-${PV}/tinywl" - -src_prepare() { - cd .. - default -} - -src_install() { - dobin tinywl -} diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest index 4f83c43..3a78c49 100644 --- a/media-fonts/noto-cjk/Manifest +++ b/media-fonts/noto-cjk/Manifest @@ -1,3 +1,3 @@ -DIST NotoSansCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52 -DIST NotoSansMonoCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b -DIST NotoSerifCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 56784876 BLAKE2B 31304b62bc3628a27ae9c1c3703177f2e7b64857e4422ec05d5c03e1959d1795416608d4bb39cc8a5c1e6bf02bc789b2399d1e0abcdfcae4ff1a40373171a0fd SHA512 6808964ecc5b64c492712ca22538ce076ac5df0807ec7cef4fd62258df5a2911dac7652a8c39f35d0f3889e948a532e8111fa7473adbf44f34992f8379035950 +DIST NotoSansCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52 +DIST NotoSansMonoCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b +DIST NotoSerifCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 56909616 BLAKE2B 3c5dd25b60e438dab597beaa620e80a04eb5cf18e5636741296d8b6c8f768dfdb81b54cf1210da01730895bbe0b4ea18410323bb9ac36a99868fe5b1cfee8ae9 SHA512 fa6c1ef94ed9d30b046d20eb360311b630e1f8d727288d3f1d73751f4f6d4731558fdce895d2235fc86bbda1b5e52c9c48a4f5fb604a0dbb3d93a71dde749f50 diff --git a/media-fonts/noto-cjk/metadata.xml b/media-fonts/noto-cjk/metadata.xml index 7c900b1..e969c6a 100644 --- a/media-fonts/noto-cjk/metadata.xml +++ b/media-fonts/noto-cjk/metadata.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <upstream> + <remote-id type="github">googlefonts/noto-cjk</remote-id> + </upstream> </pkgmetadata> diff --git a/media-fonts/noto-cjk/noto-cjk-20211026.ebuild b/media-fonts/noto-cjk/noto-cjk-20220126.ebuild index c5c8988..56298d3 100644 --- a/media-fonts/noto-cjk/noto-cjk-20211026.ebuild +++ b/media-fonts/noto-cjk/noto-cjk-20220126.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 DESCRIPTION="Google's CJK font family" HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-cjk" -COMMIT="9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d" +COMMIT="473da44c32fec739db7e5458c81a833513cb4084" SRC_URI=" https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansCJK-VF.otf.ttc -> NotoSansCJK-VF-${COMMIT}.otf.ttc https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansMonoCJK-VF.otf.ttc -> NotoSansMonoCJK-VF-${COMMIT}.otf.ttc diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest deleted file mode 100644 index 6e22e6a..0000000 --- a/media-fonts/noto-emoji/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Noto_Emoji.zip 4053149 BLAKE2B a2d0259807070742e807f17b283d409ce6b28496d373aea56904b6a111c36c53fafd1374127ab3b6034bb61fa35d034849807bb18076116549bcdef000dc2522 SHA512 ed2092f6e68e7f69b0986d92d4e1ff80fba4de9d1990ee8e2aec42115e2c0dd4d69befe4c74597d3d3b7c64a25b957282a93223ce5128cbb42d8dca96d15b996 diff --git a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild index 8ee3a59..ecdbbf0 100644 --- a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild +++ b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild @@ -6,20 +6,42 @@ EAPI=7 DESCRIPTION="Google Noto Emoji fonts" HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji" -SRC_URI="https://fonts.google.com/download?family=Noto%20Emoji -> Noto_Emoji.zip" - LICENSE="OFL-1.1" SLOT="0" KEYWORDS="~*" IUSE="" +PROPERTIES="live" + BDEPEND=" app-arch/unzip + || ( + net-misc/curl + net-misc/wget + ) " S="${WORKDIR}" +get() { + if hash curl 2>/dev/null; then + curl -Lf --retry 3 --connect-timeout 60 --speed-limit 300 --speed-time 10 "$@" + elif hash wget 2>/dev/null; then + wget -O- "$@" + else + die + fi +} + +src_unpack() { + get https://fonts.google.com/download?family=Noto%20Emoji > Noto_Emoji.zip || die + get https://fonts.google.com/download?family=Noto%20Color%20Emoji > Noto_Color_Emoji.zip || die + unzip Noto_Emoji.zip NotoEmoji-VariableFont_wght.ttf || die + unzip Noto_Color_Emoji.zip NotoColorEmoji-Regular.ttf || die +} + src_install() { insinto /usr/share/fonts/${PN} doins NotoEmoji-VariableFont_wght.ttf + doins NotoColorEmoji-Regular.ttf } diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest index 83388dc..6133dda 100644 --- a/media-fonts/noto/Manifest +++ b/media-fonts/noto/Manifest @@ -1 +1,4 @@ -DIST noto-fonts-29aa92a9a0768be2d58cf4c590adb5c18b8247c6.tar.xz 14477024 BLAKE2B 10952ddeab1a1a1da93b95247ee31aa6587b13fc1e3ead1118ef4d2fb7a33a4d060df0c7a58454eb1bc195e2df5888d75af03a590dca6fc6ceafdf318eec5517 SHA512 43ee8ecadbd1861341be423934c92828ad9ceeeff5f4bf6077ddfc9e4141ffcca6e10e4bb02843c64195c1f14286226232938e913561989d514ff5f42b082c18 +DIST NotoSans%5Bwdth%2Cwght%5D.ttf 2370304 BLAKE2B ddf2e7922a6c3670da55eea3bf65fb20aeed331713017374a3ace2d20df6ec183fe3b71e14c5b98f60b1233e1510e440981431ad0eb95be5b12527692320a28b SHA512 838abbf9158c91a559d04f1d3a471d6e5bc631b46dec04ef54eed5b1f148fc1119e9f154dcd87f48912f320c5903dbef54b74a45ae41ef5cca64d7a93fe547b5 +DIST NotoSans-Italic%5Bwdth%2Cwght%5D.ttf 2541752 BLAKE2B d8335ac4cc70dee748f4d389eec1d6e43cdfe88a2744540e9d7c81b83976e8bc5375643f517888adfb0007c110337dc4e8158973245bbe3f6e3c49f791b6e05e SHA512 31ae013b6175e87c68b1248d92626f66668527b6139c226da96d490f9b99d51002fac646662ea2613d5629d7d9aea67be229afa7f8c071f61ba9acca66e9f742 +DIST NotoSerif%5Bwdth%2Cwght%5D.ttf 2278204 BLAKE2B b7eff19e590956ffef243366d7244c2bec720b21be150f1dac08ffe423243bb2e7c7b45d2dfaa8cc4d849b08979b2e13b17f5bbab099e25bfbcae98dd6a794e8 SHA512 b0b507fbd1108aa62b896b414285a7f615050bb62cd7dd9a3a282016631c1efcfbdd3ed0f762836a7d351e2e0bdd56614eeeee591a2fc0f748cab890b74a3c0f +DIST NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf 2294324 BLAKE2B 599a8796729222381f98101cff9cd723093956fe0ddd653d346f913145b23f420ac9fe590ec5d607583f7caa64a791966183e85428525c23ea2dfd747e27a7cc SHA512 c18908217dde40d78684111562b094fb57f6b15c3753de27f24bb56c1c4ff2f6bbd5b867606dd600d597eacfdc8ecea7b3d24c185353b6c740818a25a5afecd2 diff --git a/media-fonts/noto/noto-20211207.ebuild b/media-fonts/noto/noto-20211207.ebuild deleted file mode 100644 index 86a15b8..0000000 --- a/media-fonts/noto/noto-20211207.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit font - -DESCRIPTION="Google's font family that aims to support all the world's languages" -HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts" - -COMMIT="29aa92a9a0768be2d58cf4c590adb5c18b8247c6" -SRC_URI="https://www.alxu.ca/noto-fonts-${COMMIT}.tar.xz" - -LICENSE="OFL-1.1" -SLOT="0" -KEYWORDS="~*" -IUSE="" - -S="${WORKDIR}/${PN}-fonts-${COMMIT}" - -FONT_SUFFIX="ttf" -FONT_CONF=( - # From ArchLinux - "${FILESDIR}/66-noto-serif.conf" - "${FILESDIR}/66-noto-mono.conf" - "${FILESDIR}/66-noto-sans.conf" -) diff --git a/media-fonts/noto/noto-20230117.ebuild b/media-fonts/noto/noto-20230117.ebuild new file mode 100644 index 0000000..d0503aa --- /dev/null +++ b/media-fonts/noto/noto-20230117.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Google's font family that aims to support all the world's languages" +HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts" + +COMMIT="6bff404f9a23cd603190277422d043a0afd7908e" +SRC_URI=" + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans%5Bwdth%2Cwght%5D.ttf -> NotoSans[wdth,wght]-${COMMIT}.ttf + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSans-Italic[wdth,wght]-${COMMIT}.ttf + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif%5Bwdth%2Cwght%5D.ttf -> NotoSerif[wdth,wght]-${COMMIT}.ttf + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf + " + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~*" +IUSE="" + +S="${DISTDIR}" + +src_install() { + insinto /usr/share/fonts/${PN} + newins "NotoSans[wdth,wght]-${COMMIT}.ttf" "NotoSans[wdth,wght].ttf" + newins "NotoSans-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSans-Italic[wdth,wght].ttf" + newins "NotoSerif[wdth,wght]-${COMMIT}.ttf" "NotoSerif[wdth,wght].ttf" + newins "NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSerif-Italic[wdth,wght].ttf" + insinto /etc/fonts/conf.avail + # From ArchLinux + doins "${FILESDIR}/66-noto-serif.conf" + doins "${FILESDIR}/66-noto-mono.conf" + doins "${FILESDIR}/66-noto-sans.conf" +} diff --git a/gui-wm/tinywl/metadata.xml b/media-sound/pamixer/metadata.xml index f32ad44..c0718b5 100644 --- a/gui-wm/tinywl/metadata.xml +++ b/media-sound/pamixer/metadata.xml @@ -5,4 +5,7 @@ <email>alex_y_xu@yahoo.ca</email> <name>Alex Xu (Hello71)</name> </maintainer> + <upstream> + <remote-id type="github">cdemoulins/pamixer</remote-id> + </upstream> </pkgmetadata> diff --git a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch new file mode 100644 index 0000000..42c1083 --- /dev/null +++ b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/879739 +https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu + +Probe for strcasestr using the C++ compiler + +The C++ compiler may define _GNU_SOURCE, causing <string.h> to +declare strcasestr, while the C compiler does not. As a result, +the probe may fail, resulting in an incompatible declaration +of strcasestr in compat/compat.h. + +Upstream discussion: + + [PATCH] compat/strcasestr: Include correct header file + <https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu> + +--- a/compat/have_strcasestr.c ++++ b/compat/have_strcasestr.c +@@ -1,4 +1,5 @@ + #define _GNU_SOURCE ++#include <string.h> + #include <strings.h> + + int + diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r2.ebuild index 050d50a..f9fd203 100644 --- a/net-mail/notmuch/notmuch-0.37-r1.ebuild +++ b/net-mail/notmuch/notmuch-0.37-r2.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_OPTIONAL=1 -NEED_EMACS="24.1" -PYTHON_COMPAT=( python3_{8..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils @@ -18,14 +17,14 @@ LICENSE="GPL-3" # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is # meant to be binary backward compatible. SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} apidoc? ( doc ) nmbug? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( crypt emacs python valgrind ) + test? ( crypt emacs python ) " -IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" +IUSE="apidoc crypt doc emacs mutt nmbug python test" RESTRICT="!test? ( test )" BDEPEND=" @@ -58,7 +57,9 @@ COMMON_DEPEND=" emacs? ( >=app-editors/emacs-${NEED_EMACS}:* ) python? ( ${PYTHON_DEPS} - virtual/python-cffi[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') ) " @@ -72,7 +73,6 @@ DEPEND="${COMMON_DEPEND} dev-libs/openssl ) ) - valgrind? ( dev-util/valgrind ) " RDEPEND="${COMMON_DEPEND} @@ -95,6 +95,7 @@ SITEFILE="50${PN}-gentoo.el" PATCHES=( "${FILESDIR}/notmuch-assume-modern-gmime.patch" + "${FILESDIR}"/${PN}-0.37-configure-clang16.patch ) pkg_setup() { @@ -239,9 +240,6 @@ src_install() { default if use doc; then - pushd doc/_build/man/man1 > /dev/null || die - ln notmuch.1 notmuch-setup.1 || die - popd > /dev/null || die if use apidoc; then # rename overly generic manpage to avoid clashes mv doc/_build/man/man3/deprecated.3 \ @@ -257,8 +255,8 @@ src_install() { if use nmbug; then # TODO: those guys need proper deps - python_fix_shebang devel/nmbug/{nmbug,notmuch-report} - dobin devel/nmbug/{nmbug,notmuch-report} + python_fix_shebang devel/nmbug/notmuch-report + dobin devel/nmbug/notmuch-report fi if use mutt; then diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r2.ebuild index 69616d4..d44ccf9 100644 --- a/sci-calculators/units/units-2.21-r1.ebuild +++ b/sci-calculators/units/units-2.21-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit python-r1 DESCRIPTION="Unit conversion program" diff --git a/virtual/jdk/jdk-18-r1.ebuild b/virtual/jdk/jdk-18-r1.ebuild deleted file mode 100644 index 2848b43..0000000 --- a/virtual/jdk/jdk-18-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="${PV}" -KEYWORDS="" - -RDEPEND="|| ( - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] -)" diff --git a/virtual/jre/jre-18-r1.ebuild b/virtual/jre/jre-18-r1.ebuild deleted file mode 100644 index abb6f5b..0000000 --- a/virtual/jre/jre-18-r1.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Runtime Environment (JRE)" -SLOT="${PV}" -KEYWORDS="" - -RDEPEND="|| ( - dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)] - virtual/jdk:${SLOT} -)" diff --git a/x11-apps/sx/metadata.xml b/x11-apps/sx/metadata.xml index 004555a..4ac52f4 100644 --- a/x11-apps/sx/metadata.xml +++ b/x11-apps/sx/metadata.xml @@ -5,4 +5,7 @@ <email>alex_y_xu@yahoo.ca</email> <name>Alex Xu (Hello71)</name> </maintainer> + <upstream> + <remote-id type="github">Earnestly/sx</remote-id> + </upstream> </pkgmetadata> |