From 4b718beb7d5fd4e0b5d741ff3a4c5c570519195e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 May 2023 05:50:34 +0100 Subject: gentoo auto-resync : 13:05:2023 - 05:50:34 --- dev-libs/Manifest.gz | Bin 97270 -> 97277 bytes dev-libs/libinput/Manifest | 3 - .../libinput/files/libinput-1.22.1-sphinx-6.patch | 28 --- dev-libs/libinput/libinput-1.22.1.ebuild | 94 -------- dev-libs/openssl-compat/Manifest | 3 - .../openssl-compat/openssl-compat-1.1.1s.ebuild | 264 --------------------- dev-libs/wayland/Manifest | 2 - dev-libs/wayland/wayland-1.21.0-r1.ebuild | 66 ------ 8 files changed, 460 deletions(-) delete mode 100644 dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch delete mode 100644 dev-libs/libinput/libinput-1.22.1.ebuild delete mode 100644 dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild delete mode 100644 dev-libs/wayland/wayland-1.21.0-r1.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index d25c74014cef..33595c20de96 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index 79e3469c8bc0..18a9bd54251d 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1,6 +1,3 @@ -AUX libinput-1.22.1-sphinx-6.patch 928 BLAKE2B a4028f31bc5caa22c0beafb48f2d014db24bff8d7019c4a29ea40ea99ebc47fe7115105a92edea13e85fdbd7571d0f006b503a350bab2b3e7a86cf1817e16100 SHA512 2ebeb9f0fd8c63b69c7f6645708e0d091901899a0dbf6fce5c9c4fe1d6238b1cf1cf6946b0f100f7f7cd28c52c1efe52e4a410f01892611bccb23babed12fe2e -DIST libinput-1.22.1.tar.bz2 794829 BLAKE2B 253f840e45ab2293503a0da09ea914b982e643c35928af6762955325a002b5bf20bf8571e705e3a050663cd0e1e26ee0cf4952a6193659f9b27ad1080008e900 SHA512 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e DIST libinput-1.23.0.tar.bz2 803316 BLAKE2B ec251c11d11d557be395bb2be2d2937aa36b41df7d047f7700baa43cf4869d287fd03c260229dc4cb18a587b5fb1957884299f9b0837d456459a049b7b1206a7 SHA512 cb752d8611d70d9ea26d875aba9db8d0e319e60697aedef1b16295e8180761ce4c8c9635b1aaeb3cfc32d8c5fbe4abfd9a5a4fd29c4b964b25c853c90e816a43 -EBUILD libinput-1.22.1.ebuild 2226 BLAKE2B d8cb17088382516122ba142dbe9a1e38381a92e2b9317218fdbe1216c8e1c156837e8051e6f271098e2de614ef0f32fe6af0b772ed8dc22c610f6b457686e7f1 SHA512 388395a43c564a063834fcc37476d03a53104da66824b94d8fb93b62cc63cf58646c78a4a073d1cf065dad377ac04d143926e7e04d0fbf85d5fa61ff7642ab21 EBUILD libinput-1.23.0.ebuild 2119 BLAKE2B 389a67c8c6d0cbdaaf720c351a08b97e521942e6d43751ba390d7a379677d2d49ec42df06d3b1599aa93b29dccc94b06fff7361ba5b3452dbc4f8a25866523fd SHA512 4f6abad1285d5eb5b41f8f46ab9affac173bc7e94a3886e34c5560accf6b89b1b7319c2e9ff0d78417fc276c2fb3032c9c3ac9fc94353ea9f99d575526b0f353 MISC metadata.xml 339 BLAKE2B c649f0ffaad1b1dc76c3d3184d95356b2925f642ff6b96c3eba0c31a1d96c3d9b741c1348f8ec90d02428c30a836872fe4e42e7ab5f5e5197f4a787f9147a1a8 SHA512 e9aeca6cc4451ab5b622f597f8debaecfdc672244e5e0b687ac294c20009ba42fb2ccc45e7016a2427312e1c768259005e0a7ff53026087570382652ec23cb60 diff --git a/dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch b/dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch deleted file mode 100644 index 737ac3965c7a..000000000000 --- a/dev-libs/libinput/files/libinput-1.22.1-sphinx-6.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/891371 -https://bugs.gentoo.org/889908 -https://gitlab.freedesktop.org/libinput/libinput/-/commit/bf2e8a406e6ebfdb62ffa67f00822c17ff9b2c6a - -From bf2e8a406e6ebfdb62ffa67f00822c17ff9b2c6a Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 17 Jan 2023 12:28:58 +1000 -Subject: [PATCH] doc/user: fix sphinx warning - -WARNING: extlinks: Sphinx-6.0 will require a caption string to contain -exactly one '%s' and all other '%' need to be escaped as '%%'. - -Well, let's do that then! - -Signed-off-by: Peter Hutterer ---- a/doc/user/conf.py.in -+++ b/doc/user/conf.py.in -@@ -169,7 +169,7 @@ from recommonmark.parser import CommonMarkParser - - extlinks = { 'commit' : - ('https://gitlab.freedesktop.org/libinput/libinput/commit/%s', -- 'git commit ') -+ 'git commit %s') - } - - # -- git version hack ------------------------------------------------- --- -GitLab diff --git a/dev-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild deleted file mode 100644 index 57d288d0c784..000000000000 --- a/dev-libs/libinput/libinput-1.22.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 2014-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit meson optfeature python-any-r1 udev - -DESCRIPTION="Library to handle input devices in Wayland" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput" -SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0/10" -if [[ $(ver_cut 3) -lt 900 ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi -IUSE="doc input_devices_wacom test" -RESTRICT="!test? ( test )" - -RDEPEND=" - input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) - >=dev-libs/libevdev-1.9.902 - >=sys-libs/mtdev-1.1 - virtual/libudev:= - virtual/udev -" -DEPEND=" - ${RDEPEND} - test? ( >=dev-libs/check-0.9.10 ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - $(python_gen_any_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}] - ') - >=app-doc/doxygen-1.8.3 - >=media-gfx/graphviz-2.38.0 - ) -" -# test? ( dev-util/valgrind ) - -PATCHES=( - "${FILESDIR}"/${P}-sphinx-6.patch -) - -python_check_deps() { - python_has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \ - python_has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \ - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - python_has_version ">=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - default - sed "s@, '-Werror'@@" -i meson.build || die #744250 -} - -src_configure() { - # gui can be built but will not be installed - local emesonargs=( - -Ddebug-gui=false - $(meson_use doc documentation) - $(meson_use input_devices_wacom libwacom) - $(meson_use test tests) - -Dudev-dir="${EPREFIX}$(get_udevdir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - if use doc ; then - docinto html - dodoc -r "${BUILD_DIR}"/Documentation/. - fi -} - -pkg_postinst() { - optfeature "measure and replay tools" dev-python/python-libevdev - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest index 8b650995970f..a850eb8bfb15 100644 --- a/dev-libs/openssl-compat/Manifest +++ b/dev-libs/openssl-compat/Manifest @@ -5,12 +5,9 @@ AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021d DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32 -DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb SHA512 2ef983f166b5e1bf456ca37938e7e39d58d4cd85e9fc4b5174a05f5c37cc5ad89c3a9af97a6919bcaab128a8a92e4bdc8a045e5d9156d90768da8f73ac67c5b9 -DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca SHA512 aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6 DIST openssl-1.1.1t.tar.gz 9881866 BLAKE2B 66d76ea0c05a4afc3104e22602cffc2373e857728625d31ab3244881cafa91c099a817a09def7746bce4133585bfc90b769f43527e77a81ed13e60a8c2fb4d8d SHA512 628676c9c3bc1cf46083d64f61943079f97f0eefd0264042e40a85dbbd988f271bfe01cd1135d22cc3f67a298f1d078041f8f2e97b0da0d93fe172da573da18c DIST openssl-1.1.1t.tar.gz.asc 833 BLAKE2B fc5e7069268e987a20241dfc4f080529c6e95e217c198568b09c833e390e68b25a604a5d3ec29c6a64b9dee9d42199fd3647214e536ba2f7b8b4e57aa4cba680 SHA512 1232a94fce991d62f008ae6d3d9b6fe68cb6378fe07450feb17a58eb2417fb385ffcb7e6b74eb683134be9ff6ccf6efa183f37f4dd521614fd5aeaddf000b90b DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2 -EBUILD openssl-compat-1.1.1s.ebuild 7760 BLAKE2B 6764b4c114772b49fdb24a1102d9ac53f6c6e93ef265d7f251f78a67ab8a8dfebaef9555e9ede3c882ad6f26eef2cc0caba5dd2ad2fd51018f168fff94919091 SHA512 e0cdf8b85b6932ca54c8aeafd7e5f30309fb378a656773badcbc381f9ac43d0df2fe9bc4885566224394a46fdc054b289eefd9f30e4852a8e3bf3831341943fb EBUILD openssl-compat-1.1.1t.ebuild 6624 BLAKE2B 3547964f3d9db7fdf0d509d603acce84675315693c3efd15b074e74051f26748c2fdec3aa7f5dfb29475611fed7b11b3e4a676ad10bf53d1a0f745c9ec2c4fe4 SHA512 017bf5828b7ebc6cf43dd8e1897409fc3a4063bcdd1c2d8ca94a5123c28b3df23e294237f3e7df18d76220afbbf2e9f78ee5a948b630d0df8eaeb1de7817166b MISC metadata.xml 1223 BLAKE2B db6fe704a4a09590821cd011556759cfd60543fd531fef3bd233378f396ac5e67c7d834eee4e544995c3af02dc9f222ac787e0b8a1c48a6cadd06541c81372fb SHA512 3cd0b3d8ba2c2c31d3240a080c0edf61a3b090adb4bb14c3b79c9cd1f0c0ac332a9c9457b218a09fb9192cc82004dba57cd4cac404fdd5ddfe4f0c7780b596cd diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild deleted file mode 100644 index e95f60fc6006..000000000000 --- a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info - -MY_P=openssl-${PV/_/-} -DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="openssl" -SLOT="$(ver_cut 1-3)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -RDEPEND="!=dev-libs/openssl-1.1.1*:0 - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - kernel_linux? ( sys-process/procps ) - ) - verify-sig? ( sec-keys/openpgp-keys-openssl )" - -# Do not install any docs -DOCS=() - -PATCHES=( - # General patches which are suitable to always apply - # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare! - "${FILESDIR}"/${PN/-compat}-1.1.0j-parallel_install_fix.patch # bug #671602 - "${FILESDIR}"/${PN/-compat}-1.1.1i-riscv32.patch -) - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi - - use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER" - linux-info_pkg_setup -} - -src_unpack() { - # Can delete this once test fix patch is dropped - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${P/-compat}.tar.gz{,.asc} - fi - - default -} - -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 - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES}; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # - 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 - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/18225 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # Prefixify Configure shebang (bug #141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -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 - - if use prefix && [[ ${CHOST} == *-solaris* ]] ; then - # use GNU ld full option, not to confuse it on Solaris - sed -i \ - -e 's/-Wl,-M,/-Wl,--version-script=/' \ - -e 's/-Wl,-h,/-Wl,--soname=/' \ - Configurations/10-main.conf || die - - # fix building on Solaris 10 - # https://github.com/openssl/openssl/issues/6333 - sed -i \ - -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \ - Configurations/10-main.conf || 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 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - local ec_nistp_64_gcc_128 - - # Disable it for now though (bug #469976) - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # "disable-deprecated" option breaks too many consumers. - # Don't set it without thorough revdeps testing. - # Make sure user flags don't get added *yet* to avoid duplicated - # flags. - local myeconfargs=( - ${sslout} - - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - ${ec_nistp_64_gcc_128} - enable-idea - enable-mdc2 - enable-rc5 - $(use_ssl sslv3 ssl3) - $(use_ssl sslv3 ssl3-method) - $(use_ssl asm) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl tls-heartbeat heartbeats) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - 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 -} - -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_libs -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - dolib.so lib{crypto,ssl}.so.$(ver_cut 1-2 "${SLOT}") -} diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest index e8f9c672516e..e685ff274d17 100644 --- a/dev-libs/wayland/Manifest +++ b/dev-libs/wayland/Manifest @@ -1,6 +1,4 @@ -DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3 DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12 -EBUILD wayland-1.21.0-r1.ebuild 1668 BLAKE2B f2f70d2c7a580f7fc47078f9ddf260080f5e2a0adc4146c32606ce44ae2e3928163065953f892647db6cdc932ebb94d2d8db1bcc2c227d39c71be9158dd9e020 SHA512 85e4890ff57e01d07b9b004e2c1e2ab279b493940b03ade166a03769e43cfe3f5c069c46b9dfc801a0d26f9b27720d67cf93baf9b2343e3ee90262a3d3e2ed92 EBUILD wayland-1.22.0.ebuild 1668 BLAKE2B f2f70d2c7a580f7fc47078f9ddf260080f5e2a0adc4146c32606ce44ae2e3928163065953f892647db6cdc932ebb94d2d8db1bcc2c227d39c71be9158dd9e020 SHA512 85e4890ff57e01d07b9b004e2c1e2ab279b493940b03ade166a03769e43cfe3f5c069c46b9dfc801a0d26f9b27720d67cf93baf9b2343e3ee90262a3d3e2ed92 EBUILD wayland-9999.ebuild 1675 BLAKE2B b160422ea60c3ca45c6c6b66535c867dc2fc5f8826657e8a1c50f1a247e4637151d7f26cb0b3fa16d36b348ee87db721de2304d853f49175f0d98accca23ba9d SHA512 8717923ed058538e6947d42c4448775bbf201079cb28f3230aef57cdc512db7ebe1f0eddd785fc71e0813df0a1b8521b7166a1704d13f7230d419c32ddd687fa MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8 diff --git a/dev-libs/wayland/wayland-1.21.0-r1.ebuild b/dev-libs/wayland/wayland-1.21.0-r1.ebuild deleted file mode 100644 index 301f299e4f7b..000000000000 --- a/dev-libs/wayland/wayland-1.21.0-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi -inherit meson-multilib - -DESCRIPTION="Wayland protocol libraries" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" - -LICENSE="MIT" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ~dev-util/wayland-scanner-${PV} - virtual/pkgconfig - doc? ( - >=app-doc/doxygen-1.6[dot] - app-text/xmlto - >=media-gfx/graphviz-2.26.0 - ) -" -DEPEND=" - >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool doc documentation) - $(meson_native_true dtd_validation) - -Dlibraries=true - -Dscanner=false - $(meson_use test tests) - ) - meson_src_configure -} - -src_test() { - # We set it on purpose to only a short subdir name, as socket paths are - # created in there, which are 108 byte limited. With this it hopefully - # barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x - export XDG_RUNTIME_DIR="${T}"/x - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - multilib-minimal_src_test -} - -src_install() { - meson-multilib_src_install - - if use doc; then - mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die - rmdir "${ED}"/usr/share/doc/"${PN}" || die - fi -} -- cgit v1.2.3