5 files changed, 143 insertions, 1 deletions
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 4dd8422c03c4..82150abe966b 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1 +1,2 @@
 DIST CLion-2021.1.2.tar.gz 724314199 BLAKE2B 4e1ecb9023529f6f9b8a638d8d75beca25c97d61eed6c489bdf9062368d47f182e776f58fdf387766e22dc67c5f593ad85a6f5790a65cad51d8e6c217b7ff838 SHA512 f16b57e4af6f4b0feb44f1698e5e3268d3599e8484a06bfc3770268e98025ff6231f0577c08605743bc79800401a66792fde97a864574e656690a61608b93f4e
+DIST CLion-2021.2.tar.gz 750721029 BLAKE2B d967a7fe1f633f06b78a35ff01839e4ab427dd68065882533b8d69cb0daea46988e6742564ba2f2310411f2fc068a6565b01b8a9b57c7042dcd6a1347a19e6a9 SHA512 9742c29f57ecf2ca4b69fa323241d12bb7660cd64b875d953cbf720bc54daaaf7dab14c487ef113368c8ad7cbb6733d34a4740bb0997d9ceb8ca702f1e30da32
diff --git a/dev-util/clion/clion-2021.2.ebuild b/dev-util/clion/clion-2021.2.ebuild
new file mode 100644
index 000000000000..daf59355c8c4
--- /dev/null
+++ b/dev-util/clion/clion-2021.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror splitdebug"
+
+BDEPEND="dev-util/patchelf"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-util/cmake
+	media-libs/alsa-lib
+	media-libs/freetype:2
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-devel/gdb
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/gdb/linux
+		bin/lldb/linux
+		bin/cmake
+		license/CMake*
+		lib/pty4j-native/linux/aarch64
+		lib/pty4j-native/linux/arm
+		lib/pty4j-native/linux/mips64el
+		lib/pty4j-native/linux/ppc64le
+	)
+
+	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64)
+	use x86 || remove_me+=( lib/pty4j-native/linux/x86)
+
+	rm -rv "${remove_me[@]}" || die
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,clang/linux/{clangd,clang-tidy,clazy-standalone}}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/dev-util/git-delta/git-delta-0.8.3.ebuild b/dev-util/git-delta/git-delta-0.8.3.ebuild
index 022dc8536214..f175e1e6da44 100644
--- a/dev-util/git-delta/git-delta-0.8.3.ebuild
+++ b/dev-util/git-delta/git-delta-0.8.3.ebuild
@@ -124,7 +124,7 @@ S="${WORKDIR}/${P/git-/}"
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index db413516194c..33847d59e04d 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,2 +1,3 @@
 DIST rpmdevtools-9.2.tar.xz 95528 BLAKE2B 2485b4a1f27bc07b2c865804829fe2692383d54ce976d32919ee717b52b32aec93c1e50382e8e74cdbb630fda1655d68c840057e61428a45ab40ac31bc5b4ae1 SHA512 fbfe1123421775eb892776362f39144ce0e7c6519bdf23c7d9eb746c867d998d6a0ecce376ceaffec82e786040e41f2494dbec3170af1fa74a204447a4965fff
 DIST rpmdevtools-9.3.tar.xz 96292 BLAKE2B 40a9c53396c1186b1317971b5edca51e3b29e8d35c703434f8da05d07f101c9af266b306efa472a24254af2bfd0daeedc42fcc811f80c195209db2078e380965 SHA512 87dc8fe2885db2760a7520bc2486655f64e778bce0b6b3c2904ba9f3689e13f5b8d186b6fcebd60f24e958333aae66d06c0690fe2db633c2f508068dd4215f9f
+DIST rpmdevtools-9.5.tar.xz 96724 BLAKE2B a406581be0286a6cb4b611289820f5a2db4306b731b0963881091e27b04b213c155243aeb95eadb41a27ab7a481bf1464d27d31fb52c6b10c3cedb23c1b22d21 SHA512 d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
new file mode 100644
index 000000000000..aebde049bb29
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+	$(python_gen_cond_dep 'dev-python/progressbar2[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/requests_download[${PYTHON_USEDEP}]')
+"
+RDEPEND="${DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+BDEPEND="sys-apps/help2man"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{bumpspec,checksig,rmdevelrpms.py,sort,spectool,vercmp}
+}