From 399fa07bfac673a8846466b16c76549e329b55b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 May 2023 10:17:50 +0100 Subject: gentoo auto-resync : 20:05:2023 - 10:17:50 --- dev-libs/Manifest.gz | Bin 97229 -> 97215 bytes dev-libs/distorm3/Manifest | 1 - dev-libs/distorm3/distorm3-3.5.2.ebuild | 45 ----- dev-libs/libxml2/Manifest | 5 - dev-libs/libxml2/libxml2-2.11.2-r1.ebuild | 206 --------------------- dev-libs/libxml2/libxml2-2.11.2.ebuild | 195 ------------------- dev-libs/libxml2/libxml2-2.11.3.ebuild | 195 ------------------- dev-libs/plasma-wayland-protocols/Manifest | 2 +- .../plasma-wayland-protocols-1.10.0.ebuild | 2 +- dev-libs/pocl/Manifest | 5 - dev-libs/pocl/files/pocl-3.0-cuda.patch | 48 ----- dev-libs/pocl/files/pocl-3.0-fix-version.patch | 11 -- dev-libs/pocl/files/pocl-3.0-icd.patch | 127 ------------- dev-libs/pocl/pocl-3.0.ebuild | 144 -------------- 14 files changed, 2 insertions(+), 984 deletions(-) delete mode 100644 dev-libs/distorm3/distorm3-3.5.2.ebuild delete mode 100644 dev-libs/libxml2/libxml2-2.11.2-r1.ebuild delete mode 100644 dev-libs/libxml2/libxml2-2.11.2.ebuild delete mode 100644 dev-libs/libxml2/libxml2-2.11.3.ebuild delete mode 100644 dev-libs/pocl/files/pocl-3.0-cuda.patch delete mode 100644 dev-libs/pocl/files/pocl-3.0-fix-version.patch delete mode 100644 dev-libs/pocl/files/pocl-3.0-icd.patch delete mode 100644 dev-libs/pocl/pocl-3.0.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index b092f07906df..aef8f6e05c3d 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/distorm3/Manifest b/dev-libs/distorm3/Manifest index bcd4dff6206b..9006adc58344 100644 --- a/dev-libs/distorm3/Manifest +++ b/dev-libs/distorm3/Manifest @@ -1,5 +1,4 @@ AUX distorm3-3.5.2-under.patch 216 BLAKE2B 771f718b28623bd41d9ae967dc2f5d17fd575502e250b0b4f24a5b07aa5acbdf9d9b75ea630df57c087eb10a3aa60743f28cb09e5f1a92accdffb1d9df8af555 SHA512 577f7cea69ce350087095821c602f46db9061e0c3b4440fe8f6fa103bd1f42b7ac5a5b118b0493301b877cd91c0a203c4b6a0299529822552b0bd7bca5779f53 DIST distorm3-3.5.2.tar.gz 138371 BLAKE2B 76cc9c987d53a5c7336632ee96878df62865a862bba9b3d07fa95cd585aff428a0187033b78e0731f14a24cc37d7d19f290b2ca06a5a3dd6ee8116a0e68678c8 SHA512 bc08a12f87e6bf22ff9bbba8a34b88b0988b80ddec405c669ba5cd863545128f8b3df4b122a69f4849af3d08818c836b368332e6546871bdfee99e611b3f8d19 EBUILD distorm3-3.5.2-r1.ebuild 871 BLAKE2B 7a7b586df488c0bfc87593f555faa930b5e496850314139f1bab5956bf0b0b2421b8b5c76cb481f25dafc0af38d5ee31cf2f3580ab38c6561ca010fb6161e68e SHA512 033ab0ecc8a95d46aaf7f7e1421be64b1d0fa1cf54556088a7a792b3c534670b17b868dd75e019a094a14a058319957315f105a319fed5e9970df48810d8dc68 -EBUILD distorm3-3.5.2.ebuild 965 BLAKE2B 90f2855fc1c8b451064be67ca5d29a28dc9b675e79878162aac5a9e7b682e31ffc05ceb91854dde0e83c54e056e4e4ba09d7d5f368ac45f80df1f5a25bbf591c SHA512 efa10e6651fd7305e66d1c686ad65dbe367b0dd581e7435bbe3127a33687a1b76742cd7b24bdfcb84448dec4f6ac33dd63254c68035f8812419edb5d15b26159 MISC metadata.xml 374 BLAKE2B 8ccd11c172642a07d880758f17cc7ee1fcb5f8ff38d7cd2c16e17663255ccb1e4b2d039d0f1dd0f7b9f3bb879eedfaf09a576b3062216a3eb47006fa4dd24d77 SHA512 a59b515665e478043ff6f620001fabd118a2c5eee29828f0261278f2b6a83703399b3a8143916f0ec681bd2b1d8ea02fc69ae21ec4ce1d4131ecc9eb1f482deb diff --git a/dev-libs/distorm3/distorm3-3.5.2.ebuild b/dev-libs/distorm3/distorm3-3.5.2.ebuild deleted file mode 100644 index 50ac20c5ac09..000000000000 --- a/dev-libs/distorm3/distorm3-3.5.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9,10} ) - -inherit distutils-r1 - -DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)" -HOMEPAGE="http://www.ragestorm.net/distorm/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="" -RDEPEND="" -BDEPEND="test? ( dev-lang/yasm )" - -distutils_enable_tests pytest - -PATCHES=("${FILESDIR}"/${P}-under.patch) - -python_install() { - distutils-r1_python_install - - # don't know why it does not happen by default - python_optimize -} - -python_test() { - local exclude=( - # outdated tests? API udage mismatch - # https://github.com/gdabah/distorm/issues/173 - python/test_distorm3.py::Test::test_dummy - python/test_distorm3.py::InstBin::test_dummy - python/test_distorm3.py::Inst::test_dummy - ) - epytest ${exclude[@]/#/--deselect } -} diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 2e4c77951f25..3bde072d7546 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -5,16 +5,11 @@ AUX libxml2-2.11.2-0003-no-xpath.patch 5488 BLAKE2B 5420a76322cd450feb147ddf265e AUX libxml2-2.11.2-0004-huge-push.patch 913 BLAKE2B 85e4b129ba5a0917a1c038b8d90bd6bb8e09f787758db175bc05a237551a342176d9dc5691cc19ec5eaf82513d3dc535938b8ddd99a9033c4db4caa8cdb70ba7 SHA512 60f4bb5da76225b062f71239264ed3ccdb4bd18444dd073934a43123837c90b173f97de6ab17e2c77a1778f630b6c6bd4faf1d876d61b99cee9fca2f6ea763f0 AUX libxml2-2.11.2-0005-icu-detection.patch 680 BLAKE2B 0c2945a395a9f5430c3726b86aa9cb2b0578ca6307c412d00895261fc44f566eebc4f26ef86187933a352b704cee312bc8bd8c1e6338d6f17e84c6f6b791e040 SHA512 0abc52272b99ad6d6427515ac38d4c59d97e477889702b00dbe3035fd9a4fe7bed6ee9339e9a84836f3f068c2e03793c5c1bc9f36fea5b8493554f42c9d7904c DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e5458de642ef89db77768c8d1383532614254e0e3f1d9471e2274c6b81a04a0a3afcb602707ce79550c2bd8e9028d9 SHA512 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094 -DIST libxml2-2.11.2.tar.xz 2627884 BLAKE2B 2785354724af03274f9796b10a5f6918a956a7b08ada2032c644cf7829a67d8628363b74d134dd2677f42d0df7f79a6f105e46e5f073416349f5bb36f6180859 SHA512 9b49522d816d7e5682bb863e7706c8e9ddc629d9148fbe6753e82aef4859c11ba6a4b6e801de967b5c3da517d44d0be2dc6b47553b0efee6f04f4cbf1d7285d5 -DIST libxml2-2.11.3.tar.xz 2628068 BLAKE2B ac1b78d92549da21acd6578cebe2ac44fc874592ce7217c2a4dc45aeebe76eaae7e5276a7a71d744721301f931f03de114201074177129862f79b7fbea0dae31 SHA512 d05b7972a5f1dcec31a2f9a53901242f95f440a9a7be8f0feaa1eeb664f34e66d37883373f4d37dc344ce4d0e9d48534060916921e25b3e2d6b8c1b80828a589 DIST libxml2-2.11.4.tar.xz 2626756 BLAKE2B 5d7e6388291a8473195131f5cb22aee9a4182f28fd8eed468c449b762d363cfb1713a7466c1f98e96cf819ed8f78e13a6ba930c2fadd8d63869b6efe8e8be8a8 SHA512 c1df7441c729430bdd2de52e9da69b171afc4b776e4a2eb43acbc71ada7a3814a465247fb5fca4c83ecf1c281f7745069ec3d051a7964cb7cc119a3d983f93ba DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe EBUILD libxml2-2.10.4.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3 -EBUILD libxml2-2.11.2-r1.ebuild 5609 BLAKE2B ece4b5c952cc7eff5fa8d7fea0c98df81a35300d3a79a9074ed918b74eb8c2b4615642ddb6efee13b3e02acba2a673911191be5484c1e57c7642308b659fd00e SHA512 46565eb8d8bf3a8d21efab776ce296c61df18ab9d35328d60051e37e03d49fb766a684f0f54a17a60f9babd28a592669cce787899bcf414d37d2f7f6fe91a4ad -EBUILD libxml2-2.11.2.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866 -EBUILD libxml2-2.11.3.ebuild 5306 BLAKE2B 398754f32fac1cf18d98532d0111d4d5d057efaa89897f51e1595d0a40abc3bae2ed8238771ce7eb6524abb7384d1c3ed0675913f4775ce24e82274e08f2126d SHA512 53263f4b11b72a0c6789125aaf6b7f0782dee3ddc181c1c0e646c250184642845d7b4266cbbc17070ab69b3cb515f441831f4bafafcc38efbb8198e5b02e02bc EBUILD libxml2-2.11.4.ebuild 5306 BLAKE2B 398754f32fac1cf18d98532d0111d4d5d057efaa89897f51e1595d0a40abc3bae2ed8238771ce7eb6524abb7384d1c3ed0675913f4775ce24e82274e08f2126d SHA512 53263f4b11b72a0c6789125aaf6b7f0782dee3ddc181c1c0e646c250184642845d7b4266cbbc17070ab69b3cb515f441831f4bafafcc38efbb8198e5b02e02bc EBUILD libxml2-9999.ebuild 5306 BLAKE2B 398754f32fac1cf18d98532d0111d4d5d057efaa89897f51e1595d0a40abc3bae2ed8238771ce7eb6524abb7384d1c3ed0675913f4775ce24e82274e08f2126d SHA512 53263f4b11b72a0c6789125aaf6b7f0782dee3ddc181c1c0e646c250184642845d7b4266cbbc17070ab69b3cb515f441831f4bafafcc38efbb8198e5b02e02bc MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11 diff --git a/dev-libs/libxml2/libxml2-2.11.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.11.2-r1.ebuild deleted file mode 100644 index 005ddba984c7..000000000000 --- a/dev-libs/libxml2/libxml2-2.11.2-r1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: Please bump in sync with dev-libs/libxslt - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" - -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" - inherit autotools git-r3 -else - inherit autotools gnome.org libtool - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -SRC_URI+=" - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) -" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="debug examples +ftp icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -PATCHES=( - "${FILESDIR}"/${P}-0001-iconv.patch - "${FILESDIR}"/${P}-0002-crash-old-libxslt.patch - "${FILESDIR}"/${P}-0003-no-xpath.patch - "${FILESDIR}"/${P}-0004-huge-push.patch - "${FILESDIR}"/${P}-0005-icu-detection.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2 - fi - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - #elibtoolize - - # TODO: remove me >2.11.2, just here for backports - eautoreconf - fi -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (bug #26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ipv6 \ - $(use_with ftp) \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - # Build python bindings separately - libxml2_configure --without-python - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_configure --with-python -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}"/python >/dev/null || die - - emake top_builddir="${NATIVE_BUILD_DIR}" "$@" - - popd >/dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxml2_py_emake all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install - - # Hack until automake release is made for the optimise fix - # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 - multilib_is_native_abi && use python && python_foreach_impl python_optimize -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/dev-libs/libxml2/libxml2-2.11.2.ebuild b/dev-libs/libxml2/libxml2-2.11.2.ebuild deleted file mode 100644 index b31269fea30e..000000000000 --- a/dev-libs/libxml2/libxml2-2.11.2.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: Please bump in sync with dev-libs/libxslt - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" - -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" - inherit autotools git-r3 -else - inherit gnome.org libtool - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -SRC_URI+=" - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) -" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="debug examples +ftp icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2 - fi - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize - fi -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (bug #26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ipv6 \ - $(use_with ftp) \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - # Build python bindings separately - libxml2_configure --without-python - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_configure --with-python -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}"/python >/dev/null || die - - emake top_builddir="${NATIVE_BUILD_DIR}" "$@" - - popd >/dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxml2_py_emake all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install - - # Hack until automake release is made for the optimise fix - # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 - multilib_is_native_abi && use python && python_foreach_impl python_optimize -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/dev-libs/libxml2/libxml2-2.11.3.ebuild b/dev-libs/libxml2/libxml2-2.11.3.ebuild deleted file mode 100644 index c04a7cb51a53..000000000000 --- a/dev-libs/libxml2/libxml2-2.11.3.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: Please bump in sync with dev-libs/libxslt - -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" - -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" - inherit autotools git-r3 -else - inherit gnome.org libtool - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -SRC_URI+=" - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) -" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="debug examples +ftp icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2 - fi - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize - fi -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (bug #26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ipv6 \ - $(use_with ftp) \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - # Build python bindings separately - libxml2_configure --without-python - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_configure --with-python -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}"/python >/dev/null || die - - emake top_builddir="${NATIVE_BUILD_DIR}" "$@" - - popd >/dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxml2_py_emake all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install - - # Hack until automake release is made for the optimise fix - # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 - multilib_is_native_abi && use python && python_foreach_impl python_optimize -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest index 05220b56f6b1..f586e607318a 100644 --- a/dev-libs/plasma-wayland-protocols/Manifest +++ b/dev-libs/plasma-wayland-protocols/Manifest @@ -1,3 +1,3 @@ DIST plasma-wayland-protocols-1.10.0.tar.xz 43268 BLAKE2B 1f0bc6fcd822ed8f010a1e9144b4e423e44de04c429e39a465e2ef5e59553d22db08fc379b84cc93624fa5dd64ca00ddc7d0e788251809036bfd09c8fe6ae0b7 SHA512 ddb09de9b3320f8e10d21c5d201ffe43d7e1f2f6c0d0c1b33aced28d8c324c9439800b4bd1516e7a34e45b1ac94e252c825216378d52b5cd6d671d73baa24c03 -EBUILD plasma-wayland-protocols-1.10.0.ebuild 462 BLAKE2B 9b73961e8ac835b28cd5643a2e4d9933cee77d367d0375d3e2cd4e4f7f6d655fc5ac57fe5aea706d24b0176bbc26121e20f4e42effd35229105f421702c3ed11 SHA512 e1408636b51f477b42eb2fbc70250ea4268e1887be6d525a724e86f88df80a72f0c2af7f5842b72e51e6e8d1aac05f833a0f4427ee32eaa5f8fc596a724635d2 +EBUILD plasma-wayland-protocols-1.10.0.ebuild 461 BLAKE2B f67a8b67dccd8b63570fcf6c3b9c2b179de7668876b13502b223fb2557eca7efff877db4e87ec5e01428dd7db7a6ee23e38638d09ef4b79aadaf1322b6e50d5e SHA512 c0397312ed0584f5372730a7e966420f2a130d2a4bd3bb50ffef94ed75dc2ddcfb184e80fb12545f59020cd8bc8052cfc9eb77bad95e5965754adfe52c97b9b8 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.10.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.10.0.ebuild index 6bc4ebb52ebf..427da74f07a3 100644 --- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.10.0.ebuild +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.10.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi LICENSE="LGPL-2.1" diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest index 2b48b648da50..7f0a9ce0edbb 100644 --- a/dev-libs/pocl/Manifest +++ b/dev-libs/pocl/Manifest @@ -1,10 +1,5 @@ -AUX pocl-3.0-cuda.patch 1611 BLAKE2B 6baaac79d0182ac91210c0be40239f7d955b57cb2ae26bd70569d952e4f063a5949ecc88a4b1e6ef2a51fa14a62365e627d5e37b35be5d4b46442beff468243e SHA512 95326a202962cec2d3f53bf7dfdcbe1b47abdd25544444f164e1cd2aa5706766342e062045f645c3e1e0e917ca305563df414304c7161e303c3bd55cb313eb03 -AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4 -AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7 AUX pocl-3.1-c++11.patch 861 BLAKE2B eca3f649a1ec22735712354cebfe580b740b7c93e851a806b638e6ea23fe5873824d9032771a59d00546b3e99c765ab9490643c446b6af2c7e068d921f82b741 SHA512 e2caac47e8a8fd5d744be1760dc5256d47b1ebcd7119b287a161ce67be262720ef05ed3a49fa39bd1822f79d2f2f82d57c3bf2261cba6459a11695bcc62b73fd AUX pocl-3.1-nodebug.patch 1257 BLAKE2B f7f678d2bfc2190b03a40c1ee4c4f2441455081c9097e85249424e27873452a5bcb5b07ce4bc9b0143841c67c7fac2339ea7b3ba76b237f30290a1b82d30b8e4 SHA512 853e583fe0e8bbda6a69e1ce7d49be064a874efc5d9b2ef554df0e11adc485bca2cb6b3376c08989a111935c428a468594a5fe6a1723aa3ffbf92bcb90c5e2f1 -DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c -EBUILD pocl-3.0.ebuild 3696 BLAKE2B 98c59a9b97da018288012f627dff1888cce6afd86a0270cdd239df582c3f2a9903d6914b25c8016494c0fc03664cda267a3143c6dfaa0012be9e5ca335738116 SHA512 2128a4e61904b885a5bb805f9a3f60e5bafe403aaf72042e7b69f5eb0659e63f000ab130493f7f744a412e54ec8297b8a85836dbe63354bf9abfa7b8d917caab EBUILD pocl-3.1.ebuild 3202 BLAKE2B 9b010b6c6b90fcf99091643d725da9836b673e46cf5c90795d8e3569154ea5c3cb7187f45605eefc995902dff010cd188dc71a71d16a3334acd61c0e9322c797 SHA512 bf167ef520049b54b645c1bc934a7b0b43725c99211829827896be984c19d96cd1aab5cca469dc77079b5ab01305d6ace052cd70330821466e4e05142ffc1719 MISC metadata.xml 1191 BLAKE2B 62b985abe8c99532cc20302846fe9e05c77bbc993ef38863d44bd754df2bc388e5d094917ad11d1b117e9dfda355e35f5592fc2ede5a3bc8e91939c9e6aef9e3 SHA512 a9cdbff5f2b2e2141c6299137baed08d1e8482f3b976ef494b595f58092761aab66f33e539d236d8b7f1c564d5fa2aac4855447b54bc189f1dd81faf25fc32ec diff --git a/dev-libs/pocl/files/pocl-3.0-cuda.patch b/dev-libs/pocl/files/pocl-3.0-cuda.patch deleted file mode 100644 index d6729b0fedce..000000000000 --- a/dev-libs/pocl/files/pocl-3.0-cuda.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://github.com/pocl/pocl/pull/1146 - -From 978afab0ba9f90fbdb39ed4ffc52f8ca46d2bfa9 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 5 Dec 2022 04:17:05 +0000 -Subject: [PATCH] pocl-cuda: fix build with -DPOCL_DEBUG_MESSAGES=OFF -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build failure: -``` -/var/tmp/portage2/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/cuda/pocl-cuda.c: In function ‘load_or_generate_kernel’: -/var/tmp/portage2/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/cuda/pocl-cuda.c:981:9: error: ‘pocl_debug_messages_filter’ undeclared (first use in this function) - 981 | if (!(pocl_debug_messages_filter & POCL_DEBUG_FLAG_CUDA)) - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ -``` - -Bug: https://bugs.gentoo.org/862633 ---- a/lib/CL/devices/cuda/pocl-cuda.c -+++ b/lib/CL/devices/cuda/pocl-cuda.c -@@ -1093,6 +1093,7 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device, - /* TODO: When can we unload the module? */ - CUmodule module; - -+#ifdef POCL_DEBUG_MESSAGES - if (!(pocl_debug_messages_filter & POCL_DEBUG_FLAG_CUDA)) - { - result = cuModuleLoad (&module, ptx_filename); -@@ -1100,6 +1101,7 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device, - } - else - { -+#endif - struct stat st; - stat (ptx_filename, &st); - -@@ -1132,7 +1134,9 @@ load_or_generate_kernel (cl_kernel kernel, cl_device_id device, - - free (log); - free (buffer); -+#ifdef POCL_DEBUG_MESSAGES - } -+#endif - - /* Get kernel function */ - CUfunction function; - diff --git a/dev-libs/pocl/files/pocl-3.0-fix-version.patch b/dev-libs/pocl/files/pocl-3.0-fix-version.patch deleted file mode 100644 index 8ae428036340..000000000000 --- a/dev-libs/pocl/files/pocl-3.0-fix-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ endif() - - set(MAJOR_VERSION 3) - set(MINOR_VERSION 0) --set(VERSION_SUFFIX_FIXED_TEXT "-rc2") -+set(VERSION_SUFFIX_FIXED_TEXT "") - set(VERSION_SUFFIX "${VERSION_SUFFIX_FIXED_TEXT}") - set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX}) - set(POCL_VERSION_BASE ${VERSION_STRING}) diff --git a/dev-libs/pocl/files/pocl-3.0-icd.patch b/dev-libs/pocl/files/pocl-3.0-icd.patch deleted file mode 100644 index f64e633e2f53..000000000000 --- a/dev-libs/pocl/files/pocl-3.0-icd.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 408fe60850977ab9c68d174a42ae4a5f3455cab1 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Wed, 20 Jul 2022 04:59:11 +0000 -Subject: [PATCH] CMake: fix build without ocl-icd - -If not using ocl-icd (in this case, I was using dev-libs/opencl-icd-loader), -OCL_ICD_INCLUDE_DIRS and friends won't be defined and CMake bails out -with an error: -``` --- Configuring done -CMake Error: The following variables are used in this project, but they are set to NOTFOUND. -Please set them or make sure they are set and tested correctly in the CMake files: -/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/OCL_ICD_INCLUDE_DIRS - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL -/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/OCL_ICD_INCLUDE_DIRS - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices -/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic/OCL_ICD_INCLUDE_DIRS - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic -/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread/OCL_ICD_INCLUDE_DIRS - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread -/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology/OCL_ICD_INCLUDE_DIRS - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology -/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl/OCL_ICD_INCLUDE_DIRS - used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl -``` - -This broke in 3ecda3b294d70e4f915ad141d669f4bc1298f606. - -To fix, just check if the value is truthy before using (this is enough -for checking if it's NOTFOUND). ---- a/lib/CL/CMakeLists.txt -+++ b/lib/CL/CMakeLists.txt -@@ -179,7 +179,9 @@ endif() - add_library("pocl_cache" OBJECT "pocl_cache.c") - harden("pocl_cache") - --target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+endif() - - - if (ENABLE_LLVM) -@@ -190,7 +192,9 @@ if (ENABLE_LLVM) - add_library("lib_cl_llvm" OBJECT ${LLVM_API_SOURCES}) - harden("lib_cl_llvm") - -- target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+ if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+ endif() - - list(APPEND LIBPOCL_OBJS "$") - list(APPEND LIBPOCL_OBJS "$") -@@ -200,7 +204,9 @@ if (ENABLE_LLVM) - endif() - - if(ENABLE_ICD) -- add_compile_options(${OCL_ICD_CFLAGS}) -+ if(${OCL_ICD_CFLAGS}) -+ add_compile_options(${OCL_ICD_CFLAGS}) -+ endif() - endif() - - if(HAVE_LTTNG_UST) ---- a/lib/CL/devices/CMakeLists.txt -+++ b/lib/CL/devices/CMakeLists.txt -@@ -28,7 +28,9 @@ if(ENABLE_LOADABLE_DRIVERS) - function(add_pocl_device_library name) - add_library(${name} SHARED ${ARGN}) - harden("${name}") -- target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+ if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+ endif() - target_link_libraries(${name} PUBLIC ${POCL_PUBLIC_LINK_LIST} PRIVATE ${POCL_LIBRARY_NAME} ${POCL_PRIVATE_LINK_LIST}) - set_target_properties(${name} PROPERTIES PREFIX "lib" SUFFIX ".so") - install(TARGETS ${name} LIBRARY DESTINATION "${POCL_INSTALL_PRIVATE_LIBDIR}" COMPONENT "lib") -@@ -38,7 +40,9 @@ else() - - function(add_pocl_device_library name) - add_library(${name} OBJECT ${ARGN}) -- target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+ if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+ endif() - endfunction() - - endif() -@@ -143,7 +147,9 @@ if(MSVC) - set_source_files_properties( ${POCL_DEVICES_SOURCES} PROPERTIES LANGUAGE CXX ) - endif(MSVC) - add_library("pocl-devices" OBJECT ${POCL_DEVICES_SOURCES}) --target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+endif() - set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}" - "$") - harden("pocl-devices") ---- a/lib/CL/devices/topology/CMakeLists.txt -+++ b/lib/CL/devices/topology/CMakeLists.txt -@@ -30,7 +30,9 @@ endif(MSVC) - add_library("pocl-devices-topology" OBJECT pocl_topology.c pocl_topology.h) - harden("pocl-devices-topology") - --target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+endif() - - if(Hwloc_FOUND) - target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${Hwloc_INCLUDE_DIRS}) ---- a/lib/llvmopencl/CMakeLists.txt -+++ b/lib/llvmopencl/CMakeLists.txt -@@ -101,7 +101,9 @@ endif(MSVC) - add_library("llvmpasses" OBJECT ${LLVMPASSES_SOURCES}) - harden("llvmpasses") - --target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+if(${OCL_ICD_INCLUDE_DIRS}) -+ target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) -+endif() - - option(ENABLE_LIBLLVMOPENCL "Build separate libllvmopencl.so for use with 'opt'" OFF) - if(ENABLE_LIBLLVMOPENCL) diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild deleted file mode 100644 index c928fcdac263..000000000000 --- a/dev-libs/pocl/pocl-3.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_AUTODOC=0 -DOCS_BUILDER="sphinx" -DOCS_DIR="doc/sphinx/source" -PYTHON_COMPAT=( python3_{9..10} pypy3 ) -LLVM_MAX_SLOT=14 - -inherit cmake llvm python-any-r1 docs - -DESCRIPTION="Portable Computing Language (an implementation of OpenCL)" -HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl" -SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc64" -# TODO: hsa tce -IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test" -# Tests not yet passing, fragile in Portage environment(?) -RESTRICT="!test? ( test ) test" - -# TODO: add dependencies for cuda -# Note: No := on LLVM because it pulls in Clang -# see llvm.eclass for why -CLANG_DEPS="!cuda? (