gentoo resync : 23.12.2017

4 files changed, 7 insertions, 64 deletions

diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index a044501217e8..14906b1441f1 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2017.2.3.tar.gz 200478376 BLAKE2B ea42444c5596358aaa24f0b2ece1294ff386c83c8f411c328fea540b1250fc225fe5297789da2d9f76c2faa485c151cf20d02e7af890cdd18d9fbfdbb59aa4a8 SHA512 502b056f15367c0aaed2a2b001b218f2f7e48d65b313d7560f3b77a0337a2502628ee502cb730eb2f8c6c853460988760e10601b98d43936603afa80beb1065e
-DIST pycharm-community-2017.2.4.tar.gz 200392450 BLAKE2B 83c03b02923074c0a744e6df749d5eaff2b4f5d31f13d0e1cdda3fc7aced4b13897515260605b6b277193cc84c0de4bb61917227e30879bc8135b47d5712a540 SHA512 4c98c026e36d8dd7ba0bd2ccdcffb1301d0cb79b111d032d85e0875f55d8e8a708cc1d1f319baad93f308169a1ca2aad608b940b71810907e0929bb790af15f9
+DIST pycharm-community-2017.3.1.tar.gz 279798932 BLAKE2B e442ffb2445915a14408a7a7221bfd256a4ca13a654db91dad5f267304fff666238b624c0448ff80b620bb73b2839093d7df678745715feba49941907030024a SHA512 0fe8a80751954e9cd9b6cae63e16b75f22095cddd784f9adfe1073ee62ec1aecf8f60ba2c332a575e70f2c0d312150f8d5129a9d1c539b541ccc6b0b8a37961a
 DIST pycharm-community-2017.3.tar.gz 282451011 BLAKE2B 250265d7cb0cb3ba94733c9404f6bc1c6e4f62207721011e9eec65780f9e4c92148626065051a1e875124d013cff488c8d7ab9861c094bf4a33c0b8596e717e9 SHA512 4e835f671971171966f52a4219f47fda2675b2fcf38f0f91ff90b1aa00508ed3b5445a488750c6e9d82515780e9f190201da918230c0b80d869d6b16ab352cc6
-EBUILD pycharm-community-2017.2.3.ebuild 1094 BLAKE2B 251c4ba36753fc2cf04b36835e99d8f1ad190693377701d673e3ca4189d58802e7781d7d905800964310f0b269d9d63fdd90201c50269e87223af5330cec6b1c SHA512 20468f06fac62a49a9a950276aaed0105ad839d405230d1040f9bea6ec0ce5f68d53eb7b0d291a340bac008d4778be87287c36e270612ef6e42fd2b5e8a43f6f
-EBUILD pycharm-community-2017.2.4.ebuild 1096 BLAKE2B 702a297bb3be407ba448e7ab3f0ddd637a57596b62e9c657f64b15397108d33965265705cd699ab9d3fc496f5253506b3c8ad15ce0a59ddab9d378bdc6dda0a5 SHA512 61770c74f72142cbb8a469b9e0c7f7bd763da071303f78da7fac2b1fe153729b82734cff730d664f41b061747bd72f38a3f2459ea595069df887fada3d25bc15
-EBUILD pycharm-community-2017.3.ebuild 1096 BLAKE2B 702a297bb3be407ba448e7ab3f0ddd637a57596b62e9c657f64b15397108d33965265705cd699ab9d3fc496f5253506b3c8ad15ce0a59ddab9d378bdc6dda0a5 SHA512 61770c74f72142cbb8a469b9e0c7f7bd763da071303f78da7fac2b1fe153729b82734cff730d664f41b061747bd72f38a3f2459ea595069df887fada3d25bc15
+EBUILD pycharm-community-2017.3.1.ebuild 1066 BLAKE2B fd3cedb8558e565838e32d1311b9cc158e52203a498255511b251fdafe08b2648cf5ff7f9f3b24967cea500f80b4361194be63f410989bb6aae5c063be7455e3 SHA512 0ec2532598c20f9bdd3f462bfff2b70b893c62b0979f094c69e8aa1bf124a62e16657f141b3f153486addf009c7ef7c3c80a3d5411a3bdb6539ccc97bbe86c3e
+EBUILD pycharm-community-2017.3.ebuild 1094 BLAKE2B 251c4ba36753fc2cf04b36835e99d8f1ad190693377701d673e3ca4189d58802e7781d7d905800964310f0b269d9d63fdd90201c50269e87223af5330cec6b1c SHA512 20468f06fac62a49a9a950276aaed0105ad839d405230d1040f9bea6ec0ce5f68d53eb7b0d291a340bac008d4778be87287c36e270612ef6e42fd2b5e8a43f6f
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild
deleted file mode 100644
index bcd9bbba0a3f..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils readme.gentoo-r1
-
-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=""
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=""
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	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_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2017.2.4.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.1.ebuild
index 6dfa17b1da1f..98688229a2f2 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.2.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils xdg-utils readme.gentoo-r1
+inherit gnome2-utils readme.gentoo-r1 xdg
 
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
 HOMEPAGE="http://www.jetbrains.com/pycharm/"
@@ -45,11 +45,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 	gnome2_icon_cache_update
 }
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.ebuild
index 6dfa17b1da1f..bcd9bbba0a3f 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8"