Adding metadata

4 files changed, 60 insertions, 137 deletions

diff --git a/dev-util/phpstorm/Manifest b/dev-util/phpstorm/Manifest
index 2490808263fa..3cadb2739a80 100644
--- a/dev-util/phpstorm/Manifest
+++ b/dev-util/phpstorm/Manifest
@@ -1,3 +1,2 @@
-DIST PhpStorm-2020.3.2.tar.gz 467272887 BLAKE2B 48cc3b97d94426330185b39152b0d774b8809ad5fbb91602b364a03ce6bc9e139aba9c7bf430232bd9af11bd310318e99777d5daf4dce5b63f9aec4a3531776f SHA512 66eda6e4a0649644b7634f4192429cfe615764e032596442ac6582943c001ffa60ef3036df2597b9332dc5e39818b4da5ee12a9d883416fa7df55cdedb7bb178
-EBUILD phpstorm-2020.3.2.ebuild 1429 BLAKE2B 438267ff9630661d0c2a8d3527d50cee4daa50de92001c587aa8839522132db96db27c99a502c4a341ddd59e4f7d8ba52cc9b121f88e2ff4daa37898e15ccf92 SHA512 1af726888da46aa631685b8535b5d0dba7ed8f130bb792d1b87c6290bdef024e44f3aafdad172ce90403ca0a3a767692b9e8e096d9f9a3ff8e626bf438483e7a
-EBUILD phpstorm-9999.ebuild 1429 BLAKE2B 438267ff9630661d0c2a8d3527d50cee4daa50de92001c587aa8839522132db96db27c99a502c4a341ddd59e4f7d8ba52cc9b121f88e2ff4daa37898e15ccf92 SHA512 1af726888da46aa631685b8535b5d0dba7ed8f130bb792d1b87c6290bdef024e44f3aafdad172ce90403ca0a3a767692b9e8e096d9f9a3ff8e626bf438483e7a
+DIST PhpStorm-2020.3.3.tar.gz 467769238 BLAKE2B b4f404f14e06f7d0520304775e2398ca39c2948538f2cbaa678e0283d13e44588e791ff108a5cefc1ac3ab87711e6a1b7549c614a07b472f5162899c31f22ae9 SHA512 feac704824a5522424ed6275fc9051e6c1fbd13de68ff81dbbb651f37b61bcd56c6403874f77032ef06c9c01794b66a94b11a432bbead6740ad86f38ad2e27bd
+EBUILD phpstorm-2020.3.3.ebuild 1530 BLAKE2B c269f4ae77d86d02872795674189ef8dbf998c763893d000c58f05f46432ee0ec9359e25373745132a72a2c4c70494ac38a38737ed578c3fa08a631f3a8db099 SHA512 12b40d29189bd839d665234d83f439cfecfa5b5f2db0ed9c0579c584c9063b42ec011b12eb40a56bc70f0eb0a575c5bfaa8da4599b846aaee2a072eb5b4703b8
diff --git a/dev-util/phpstorm/phpstorm-2020.3.2.ebuild b/dev-util/phpstorm/phpstorm-2020.3.2.ebuild
deleted file mode 100644
index 0a96b46aff7b..000000000000
--- a/dev-util/phpstorm/phpstorm-2020.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/webide/PhpStorm-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/PhpStorm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,phpstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/phpstorm.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "PhpStorm" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/phpstorm/phpstorm-2020.3.3.ebuild b/dev-util/phpstorm/phpstorm-2020.3.3.ebuild
new file mode 100644
index 000000000000..2907603ee0d8
--- /dev/null
+++ b/dev-util/phpstorm/phpstorm-2020.3.3.ebuild
@@ -0,0 +1,58 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development."
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/webide/PhpStorm-${PV}.tar.gz"
+
+LICENSE="
+	|| ( jetbrains_business-3.1 jetbrains_individual-4.1 jetbrains_education-3.2 jetbrains_classroom-4.1 jetbrains_open_source-4.1 )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL CDDL-1.1 codehaus CPL-1.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 MPL-2.0 OFL trilead-ssh yFiles yourkit W3C ZLIB
+"
+KEYWORDS="amd64"
+
+SLOT="0"
+
+BDEPEND="
+	app-arch/tar
+"
+
+RDEPEND="
+	virtual/jdk
+"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/PhpStorm* "${S}" || die "Failed to move/rename source dir"
+}
+
+src_prepare() {
+	default
+
+	# Remove any bundled Java
+	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
+}
+
+src_install() {
+
+	insinto "/opt/${PN}"
+	doins -r *
+
+	fperms 755 /opt/${PN}/bin/{format.sh,phpstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+
+	dosym ../../opt/${PN}/bin/phpstorm.sh /usr/bin/${PN}
+
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "PhpStorm" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/phpstorm/phpstorm-9999.ebuild b/dev-util/phpstorm/phpstorm-9999.ebuild
deleted file mode 100644
index 0a96b46aff7b..000000000000
--- a/dev-util/phpstorm/phpstorm-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/webide/PhpStorm-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/PhpStorm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,phpstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/phpstorm.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "PhpStorm" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}