6 files changed, 157 insertions, 4 deletions
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 5aeb97ce230a..8bf5489257d2 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,2 +1,2 @@
-DIST ideaIC-2.222.3345.118.tar.gz 683048510 BLAKE2B d0504108c6eb099c9591f2a629dfd708577573c1115403562e2ecbbfdbd09748b4e0cb3ef0c86a2e97762c5395435836fde0ca6f99b9a8dec57c5a8ac58d454c SHA512 fdbcd77d78be23e7e3285bb4fd59f7a6363b480a23695e18f5d1392a7a9b0e29b82145ab0194fb2b50bf4d7a1d9b6e205ac8723f0b9d113c2115e10ce7c738bd
+DIST ideaIC-2.1.222.3739.54.tar.gz 683283861 BLAKE2B 00c61adc4518c83197ff5c7fd125824feff2e733359114cb1a39cad6dd9e7102263a4c1a6d0d0f125e47dc86ac4bf4bd45f139718529102b9de33908de86d8b5 SHA512 e87e8b686e9e3bdf2d7f7c93e476a5cbd9460bab61872abc7b8d61139a1580a9f6b0e30e4c302e0adb3b1cd06176bc3bc13fee8ee1fe33f87606756fd8fc677e
 DIST jbr-11_0_13-linux-x64-b1751.21.tar.gz 295860296 BLAKE2B cd6edd69fa34896a388ec929d5f53ebc1f078ceebbed8d4e414a19eb91e004e8f53cbae95c2e3b191c39aa89b307bc8a1854b8a86ca2129eb3997c62705563bf SHA512 7d97e520b67197718951609370e90a1e08ef1daca1433373ff6e34fc9c6f4f005478b142190ef5dab46f14e85440f9daca5c662348bbca5207fc2f8d7892361f
diff --git a/dev-util/idea-community/idea-community-2022.2.222.3345.118.ebuild b/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
index 7d58f6100aaf..f80ddd7b3aae 100644
--- a/dev-util/idea-community/idea-community-2022.2.222.3345.118.ebuild
+++ b/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
@@ -6,14 +6,15 @@ inherit desktop wrapper
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_cut 1-3)"
 
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
 # ( jre 11.0.10 build 1304.4  )
 JRE11_BASE="11_0_13"
 JRE11_VER="1751.21"
-IDEA_VER="2.49836838.1031729952.1658961170-1305167137.1658527855"
+IDEA_VER="2.151348410.2082789468.1660859635-1531039212.1660859635"
+
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
@@ -49,7 +50,7 @@ RDEPEND="${DEPEND}
 
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 3-6)"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index e6bd1e90d8fa..1436e70d5c79 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,3 @@
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
 DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
+DIST meson-0.63.1.tar.gz 2064118 BLAKE2B 2d7bf439ed096cc38d9e676a8837069d10f34299cc5a61773df7a27d9a67fd33ce3b4193f33b35e5d77dc5cc346098e427f70f0dc0eafcebce055940420c785e SHA512 25f96e18bcdbb6346c44d9f8e63035d6cb3d8f781cf43ac5530ddd6f8090f4d16d192f8d331240154602e92b498b410fabb1381dc5f39db1dfb9da05a964d44e
diff --git a/dev-util/meson/meson-0.63.1.ebuild b/dev-util/meson/meson-0.63.1.ebuild
new file mode 100644
index 000000000000..6f94413c18d5
--- /dev/null
+++ b/dev-util/meson/meson-0.63.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+		python3 run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+}
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index 1cb1a3dca95d..3f17193adc61 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,2 +1,3 @@
 DIST uglifyjs-3.16.1.tar.gz 519333 BLAKE2B 6e4978aa776256be575ea91fd6cd584fe8885886300db1b77cc889af5112615175cd40d527ac6356d653e60ab3ed404670355f80e0391da538313b494bb1104b SHA512 e0ef3e2b82cb6f211120b1d66132b5b5b13bc48dd946d7e7bbeddd1bee16330c9a3541d07f51b6eddf9036b0e520a527849ddc3cf6de467331b42f1fba37e66e
 DIST uglifyjs-3.16.3.tar.gz 527549 BLAKE2B 9fa89b62d2b38a543c07d5e02c8e07228eadbf1d577e96491961af1e5bbead5e8268536cf3e2c64b5a6274d7badb22ea926b87e9faddc9ed8b1d83642b69267d SHA512 173eacc7914fd4dba2671018760f0c1fb7c9d695c199003b80cdaa6ef8bda303efe647c0abbc3a7a95156512a6d2b99058340cc70a124758683d5c3829fed3bc
+DIST uglifyjs-3.17.0.tar.gz 531823 BLAKE2B 5163b392a22431a5f622fccfbb2eaa005eb4c42650446bc55c94ddf564b4c629ecad4a62ed6499f7aaab2ebe05b08ab0de7b56a18db74cb284497ea661edcace SHA512 0af47bfa5f10432edb8eb5245ef194ce73db49e3e35db094c8faa8cb7a22bf89e5b9b8933b2f23113a02537f61e4e3dd3a4eeb22bf65602ee50ff78cf28bfdf9
diff --git a/dev-util/uglifyjs/uglifyjs-3.17.0.ebuild b/dev-util/uglifyjs/uglifyjs-3.17.0.ebuild
new file mode 100644
index 000000000000..1a44c1a32320
--- /dev/null
+++ b/dev-util/uglifyjs/uglifyjs-3.17.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="UglifyJS"
+DESCRIPTION="JavaScript parser, minifier, compressor and beautifier toolkit"
+HOMEPAGE="https://lisperator.net/uglifyjs/"
+SRC_URI="https://github.com/mishoo/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="net-libs/nodejs[npm]"
+RDEPEND="net-libs/nodejs"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+NPM_FLAGS=(
+	--audit false
+	--color false
+	--foreground-scripts
+	--global
+	--offline
+	--progress false
+	--save false
+	--verbose
+)
+
+src_compile() {
+	npm "${NPM_FLAGS[@]}" pack || die
+}
+
+src_install() {
+	npm "${NPM_FLAGS[@]}" \
+		--prefix "${ED}"/usr \
+		install \
+		uglify-js-${PV}.tgz || die
+}