gentoo resync : 17.07.2021

3 files changed, 124 insertions, 59 deletions

diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 616b7d080b5c..51177f6b537e 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2021.1.2.tar.gz 466806126 BLAKE2B 403cc5949ccb0e5f7d39d55b91d962889e35342715501466c007a5b3b044cbe33260de99e7d299f35a6e789c6f7e5726bc7106bc206d4e4890f8948eab7a15a2 SHA512 180d813d1162456312eb4482f414443350d784effab56cc53f2f6c2c79931f9af597849ec395089d8fc1ca2b87015722fad3cc43e03bfb4418e2c926b5af0107
-EBUILD pycharm-community-2021.1.2.ebuild 1219 BLAKE2B de6552d1e569adeb315d9c4ee969d0d4623c464c308ed2dd6b5aeb9bdfe634543c30a7876ec053cef63333d8ea3b1148f15faeb5c5552debd7e58743c9c84856 SHA512 e9e2c6e790a66dbc9d382a5f0288c32ce70f746cae1327a60247f5686f553cf1072aa4be991bc97f17534aaaca45ffb78d791b7eac7b68553c58d87e1847a10f
+EBUILD pycharm-community-2021.1.2-r1.ebuild 3198 BLAKE2B 94d0ce4a952f182fcca3d10ab2f405d9fec7dbfa10638e5bf73f870300cb4b172fe6c1717ebf2dbeb3a731900ac981c87ebc327d6108b2917498e1a26f0ba607 SHA512 6fa94b51a29292e428850e99ae95776339a49afa4d8840d2f5b876546e797755c09778e60387fba9442f4a4b19ac6c8caaaca44d94cee59413231e4eb8042db9
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild b/dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild
new file mode 100644
index 000000000000..c9c849340bf5
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	app-arch/brotli
+	app-arch/zstd
+	app-crypt/p11-kit
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/json-c
+	dev-libs/libbsd
+	dev-libs/libdbusmenu
+	dev-libs/nss
+	dev-python/pip
+	media-fonts/dejavu
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2=
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/jpeg:0=
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+RESTRICT="mirror"
+
+QA_PREBUILT="opt/${P}/*"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -vf "${S}"/help/ReferenceCardForMac.pdf || die
+
+	rm -vf "${S}"/bin/fsnotifier || die
+	rm -vf "${S}"/bin/phpstorm.vmoptions || die
+
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.so || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/*.dll || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.dylib || die
+	rm -vrf "${S}"/lib/pty4j-native/linux/{aarch64,mips64el,ppc64le,x86} || die
+	rm -vf "${S}"/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+	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/${PN}"
+	local JRE_DIR="jbr"
+
+	insinto ${DIR}
+	doins -r *
+
+	if ! use bundled-jdk; then
+		rm -r "${JRE_DIR}" || die
+	fi
+
+	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier64,inspect.sh,ltedit.sh,pycharm.sh,printenv.py,restart.py}
+
+	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+	make_wrapper "${PN}" "${DIR}/bin/pycharm.sh"
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /etc/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild b/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
deleted file mode 100644
index 6954ddae2fa5..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-community/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-community/jbr/ || die
-	fi
-
-	local rub
-
-	for rub in aarch64 mips64el ppc64le; do
-		rm -r "${D}"/opt/pycharm-community/lib/pty4j-native/linux/${rub} || die
-	done
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}