9 files changed, 123 insertions, 128 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9b2b3871faf4..553e1f3d0ef6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index c0b5ceabbadf..74b77bf5cbcf 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -6,9 +6,10 @@ AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f887
 AUX apr-1.7.0-CVE-2021-35940.patch 1749 BLAKE2B 256687934fd6b2af494198456d059f8a6edaaeb8b17f9186d0801bef489443faffefda3724d6c083f05811356c5168db31e5defbe19394699092090f7befdae6 SHA512 a2419817809dfd92a6d3b12e2067a802505d77d400fd47a4b9bb6fd5ae94c4be092e0d3b5894de429c6cc4a82d8133b801636bcab93d0f740c8f06a46516cd72
 AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db9163e45b1bef1fe97082db28efd6f6079d75253e961ca257bd31f53f814bdb11a2c6554fd5d1925d26fe7b42664db42 SHA512 63a56be83f555a78f422f9ce7074e5c3a497a4996d32ead78d9e1a05fba2e0dbdfb135c34143676b8ad16e8276642843d5ed8b17a540be58c6bf7e9662896c2f
 AUX apr-1.7.0-clang-16.patch 4341 BLAKE2B 3d8a7d0e62016c4fd7f1b851d06ef595f8ddbacc4af2e3142cc922c711c6b56b2b99158abdffa611e20407f53f95ef5dc6ffe24cca90457d6d381176e2ce27a0 SHA512 adef5a1bccb6ccd4627c7e8416168aec3e87cb071f3c313ac18f0d246c502d1fc8cc41196e2c49958c1c52d01ffc82758e12ece802cf19bc675813a8064c74f5
+AUX apr-1.7.0-dev-zero.patch 1314 BLAKE2B 22f334d721dccb71bfc3197c3b343d79f9fb33523558c0e46daad37b910aba066fd4b62e62a7875317ffa4db7dcc47004ee8bed245c7ba6fb90a67e18c1b8c6d SHA512 ad95469e7690efab945491156eb923eb95cc767bac1098b0a2ae7779cab5ea33875af23c47962cf49327cef91e02dbc3c8ecee9832978316a5c191dc20a7d07f
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
 EBUILD apr-1.7.0-r5.ebuild 4567 BLAKE2B 4a6d38c41ab104532969f0bf6d19815dbdbf9c84de1bd1c66aade7ae37bdfc3d93018b1aac4dadf1f8c25738ad9a8d61ddff7255b0564059d0da1f3840d35d9d SHA512 009766ba30c28970c67364568e4239cf458b7a437644756ed9b6022db830266834b5233ed60db99ae88b0bae54629c5a563fce7b9d8ebaefb408e597ea87d291
-EBUILD apr-1.7.0-r6.ebuild 4624 BLAKE2B 64b6a74b0d0b88ac92bf4249b440e3b41bc06687efd31970596771532604798a62e25373e4f0f785b74a3472b95427e140a3c2730f0962e5906c0ce858dc6cbe SHA512 37bd853a818154762242877a38264f2e8aef0686915175c394999d10d15f534ed01116538c1634918cea315db1f95ad0c3cea0c35a6bf2be926d6abeb308887c
+EBUILD apr-1.7.0-r6.ebuild 4674 BLAKE2B 467757f5357be50e0743134f4b406d98867dc5e03721375211d6144f924ff3840766a59dc8f45e73a6f30204bcc814546fec25d9c7ecfddc40e85a127d29ad55 SHA512 d013a2ae91053f9493c7f5d38f970735d08d47a4e413e967456d88aa88cbd33df96b452e0436d39fb47f97a5b37ab085ef236e2e39632047ace1788e02f50854
 MISC metadata.xml 511 BLAKE2B 5b4f31f74a9e3fe93b63bb337b5e0b7396c18439c269de0ec6c8308becf69ac8474d72dc921c80c06321bcaf708d49c9e26ec282036e84a9b03c08858c942980 SHA512 82063beddf8ce88d5f151ddeb8b3b69c10124af1c7b727b4c73885b4b14a427e93cd4164ddd4e3dfcdf7175727a8dffa357f1f14c3daee192a255f8995e6b0b5
diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 4ba3505bd8f8..4d8630a847e9 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
 	"${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
 	"${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004
+	"${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833
 )
 
 src_prepare() {
diff --git a/dev-libs/apr/files/apr-1.7.0-dev-zero.patch b/dev-libs/apr/files/apr-1.7.0-dev-zero.patch
new file mode 100644
index 000000000000..be6433dd46bc
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.0-dev-zero.patch
@@ -0,0 +1,34 @@
+APR (ab)uses AC_TRY_RUN to determine if:
+
+* We have /dev/zero
+* We can mmap /dev/zero
+
+The APR ebuild sets ac_cv_file__dev_zero=yes when cross compiling
+to fill in an answer for the first question, but the configure script
+immediately defeats that when answering the second.
+
+AC_TRY_FUN takes four arguments: the test, and what happens on success,
+failure, and cross-compiling. The APR script uses this as a "gate" to
+clear ac_cv_file__dev_zero when /dev/zero exists but it turns out not
+to be useable. They take a pessimistic approach: if you can't "prove"
+it is mmap-able, clear the flag.
+
+This patch changes that to leave the flag alone while cross compiling;
+just assume /dev/zero is mmap-able. It relies on ac_cv_file__dev_zero
+to be correctly set for the target. The fourth parameter is changed to
+[:] and not [] because [] engages autoconf's default cross-compiling
+behavior, which raises an error.
+
+Signed-off-by: Alexandra Parker <alex.iris.parker@gmail.com>
+
+--- a/configure.in	2022-01-09 00:31:05.552582255 -0800
++++ b/configure.in	2022-01-09 00:31:19.824582533 -0800
+@@ -1203,7 +1203,7 @@
+             return 3;
+         }
+         return 0;
+-    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
++    }], [], [ac_cv_file__dev_zero=no], [:])
+ 
+     AC_MSG_RESULT($ac_cv_file__dev_zero)
+ fi
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 40a78c99d048..6cca025bfe98 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,6 +5,7 @@ DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf
 DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
 DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-1fb186198af5f183dde053c1396f899567755d64.tar.gz 170328817 BLAKE2B c79199044e8d636127d1d163ceea856c1bcb1d59c892e9c72869ab788b4feb23f8c28585ac761764b4e29b883c61e43be9341610a523d8b64471200bb3aecfaa SHA512 8b366dc70506ceb70a5584ad051e100fa1cc620388fc757536ef775d102b4baaac016d4f62dbc8b1d9dd00b587622a25d9da735196d336faf35d611145cf5fdc
+DIST llvm-project-f6f1fd443f48f417de9dfe23353055f1b20d87ef.tar.gz 170625743 BLAKE2B 3add45d7e2f26659f9602b5ccc034033610921ebeb2d6d69d6f5a3d1e3af224d3f5fd42e411d1fe0d5f8249c2ad995d41a236a87eba5a72ea9b20c112faa4c2f SHA512 2b57132d156f3d6d96802f617fff3eec0df6a3b5077ddcc4f31c87829e617f3065074d80e9d26c8c1c64322e76a09321fdfc8ae1d7a84f5da9f8606125e3b635
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.3.ebuild 1411 BLAKE2B 22c88236e222cf2e547b25bb19e971fc7df4416cb686dbcff6086a60c023c4b11ea44242bd1f65ce68fc760199ffb985c3635022c74d05df5ef8e25f07f28e2a SHA512 20d96c75fb7916cfd6ab2c9480d0833da81036c4104bfd922eac93e76ef44225b0e27c9fc20aa6bb10c2f7e609a52e8d752b447e41ad1a9ed51715d6e8c9d8eb
 EBUILD libclc-15.0.4-r1.ebuild 1664 BLAKE2B 442e70afd2336bf84f1757208eb3f3cd4aad8d4fbe8fc6e0679aa68fab13892685be093487191579ce11f6498e5dc255af5d5d6f93e2772ead136bebe67e9360 SHA512 8aa5886bffa82f0fc36c91bbc9832210f7db084fbc27ef682d1375b6bc571ce16ce11e3917603a0dc870cb4f84519f368f612962e2958f5e406fb9672d06b3bf
@@ -12,4 +13,5 @@ EBUILD libclc-15.0.4.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8
 EBUILD libclc-15.0.4.ebuild 1371 BLAKE2B ec9f955ea786e7e6a407f250355c0a381b47099f4e159d0ba09d74169b4b0b80de9eef220bf0c5c84924537b21d3c303be4aeaf5c7baa6c060f8ffe2162865db SHA512 25c419bc6e6adb458db738a96fd8e80a29959e093af7989931adc70b02991cf0ad6ac259d89a9085275f6b1a4eb7d50a10bbc638c12d6f270ac0f2a4550fa706
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 EBUILD libclc-16.0.0_pre20221104.ebuild 1736 BLAKE2B b7c83cbea69242b5e143679e119e9cd54e0301a56ad54006f328a885ed3eef45af5b97a8cc307ed998ce5778ace4795f71bca235589e0f8207558549d029072a SHA512 3c403b99371a6e8d59473bcb439bb6095301ab5646a75c108c909aa466cb140fa10c335a1b102a1539e9ed7df6ae6c757b68ffdb525f3b9f2fcd34fe1522f2b0
+EBUILD libclc-16.0.0_pre20221113.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20221113.ebuild b/dev-libs/libclc/libclc-16.0.0_pre20221113.ebuild
new file mode 100644
index 000000000000..64df7867eed3
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.0_pre20221113.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=16
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 3c3fd7f47000..28f810088137 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,6 +1,3 @@
-AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
-DIST link-grammar-5.10.5.tar.gz 4637765 BLAKE2B d280a06492462725c9c62352b6bf4fb0a11a09b2b3049e41d9a078fa2ad37c8ef0f0e99e05039e355e81d127c168024068319a4fcf64caa840c00c165ed22f11 SHA512 09774f7ce01bc7ec9912162297c9b7be176e655b70981a147d53245c015f62581e7f45c005d0590d1a65e870e3c2ac4288517012fd9caa9887e4fd86d8e6aa05
 DIST link-grammar-5.11.0.tar.gz 4672430 BLAKE2B 35892e05805a83ebbd700611d19aaa9ad1ede4ba3baf60c85ef8e5abbc40134fcb71d9cb9f41518f663c60ad11aac7bd0b316c8c95a12631032f5ad79564d686 SHA512 6a24bc8d5c9f0dd63460c092fc46880503018e949aa277148f8f551d6cc9d929d3a981eeaba00afc6e618c1e4505438d0c7e9a57dfe7a8deb7d3a8f183c56636
-EBUILD link-grammar-5.10.5-r1.ebuild 2833 BLAKE2B e5dbcd6c317488e8523045c4874ab5f9b7addf9ae51722803f0dcc79c260d8b92b39d2282382411a5a6c4f4b093a60f6d9c16b33b87b84141586b5b885d26f2d SHA512 dd98a24400a1d92a8fe88af76c3e2d92b44cc707f3881337729406f95526042a12fe0ad34497e39f5e2f2d75190cce0454cd81a5aed3177d673552b59c27c43c
 EBUILD link-grammar-5.11.0.ebuild 2784 BLAKE2B 23746087d6c3ac93ca90cf5061e3d88abb4e4b6eeca01c6db433d69a2eca7258237b11f9acb14fa00b7b40a71252e66e58fa8f253368ffe7bff895a87a800949 SHA512 5e7e44e2bc9856b8df68894eac5f8cd4b3f781b59bf4f1a0a909c20cfb0ca7aec6292c951aa651cf3f0c5d2bab3e6b4a36d02799f1155e7e9abeb4091dc09e03
 MISC metadata.xml 1197 BLAKE2B fac6dd40856d97100ee06cdcd340e660bb2ffe527df31983165beec9d194839336dfddb54be33561560ac2c79d8bad12809eef53abd4059b7c74b7494d728354 SHA512 dcb16b8afa977639e3fe8633762fc7a26d8ab095da15d630bedc6ba65e4c82ec5f0bedbd564b6ad0490790723c0a04065a5cab536aff93cdcf8eab5f1a2d503e
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
deleted file mode 100644
index af48d251046b..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -324,9 +324,7 @@
- 	dnl 1. Abort and notify if no zlib.h. 2. Adapt for non-standard location.
- 	AC_MSG_NOTICE([The minisat2 headers include zlib.h])
- 	dnl The bundled library doesn't actually need -lz
--	AX_CHECK_ZLIB([ZLIB_CPPFLAGS="-isystem $ZLIB_HOME/include"],
--		[AC_MSG_NOTICE([No zlib library found - not building sat solver])
--		enable_sat_solver=no])
-+	PKG_CHECK_MODULES([ZLIB], [zlib], [ZLIB_CPPFLAGS="${ZLIB_CFLAGS}"])
- fi
- 
- # If zlib not found, then don't continue with minisat.
diff --git a/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild b/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild
deleted file mode 100644
index 9de3fa2672c1..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools python-r1 out-of-source
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
-IUSE="aspell +hunspell python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/libpcre2:=
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	python? ( ${PYTHON_DEPS} )
-	!sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig:0
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	local myconf=(
-		--disable-maintainer-mode
-		--disable-editline
-		# java is hopelessly broken, invokes maven at build time (bug #806157)
-		--disable-java-bindings
-		--disable-perl-bindings
-		--enable-sat-solver=bundled
-		--with-regexlib=pcre2
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
-	)
-
-	econf \
-		--disable-python-bindings \
-		"${myconf[@]}"
-
-	if use python; then
-		python_configure() {
-			econf \
-				--enable-python-bindings \
-				"${myconf[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-my_src_compile() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_compile() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
-		}
-		python_foreach_impl run_in_build_dir python_compile
-	fi
-}
-
-my_src_install() {
-	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
-	default
-
-	if use python; then
-		python_install() {
-			emake -C bindings/python \
-				VPATH="${S}:${MAIN_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl run_in_build_dir python_install
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}