gentoo resync : 23.12.2017

4 files changed, 7 insertions, 68 deletions

diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 8227e4bba926..42191e721fee 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2017.2.3.tar.gz 273776254 BLAKE2B 55adb23328112ff8d7e0f1f7ebb42d39b5528feaff9eee10526979bd8f22c17432e72c22b40e0c234bb0497cd6143dda680ed544a750e43e31bde265f30e125d SHA512 1233b4b272017856e90125e3439f1057f22852749d101532e1b57d51c382d017fa15442307120d49a77a150c863e33fa53e799f2c77ff6d56312381a82fd51fd
-DIST pycharm-professional-2017.2.4.tar.gz 273678656 BLAKE2B e46a91b81a87d84064674aaded9e71fbdb069b14bca74f47c8569302c84318542ed70923ed38d5890314b562159af55b26854fcfea7061cc80294f0b57069dce SHA512 60693e48a3c28bc7108e84b9beeba073ae2ebad53dc5bf792bf42abb474ebeb4d6b7fd73211cb3152a7afdc632384903900a041df6b3dc8f73a8ba623415fb8d
+DIST pycharm-professional-2017.3.1.tar.gz 355985604 BLAKE2B 9a1739972ce6d7a68f6f49554f62f20be3804fab24ceb7b0561ff0c4882f943e8373d38c3245030841ec3345b13dbf22a5fade66a07fae382a4dd5c29597c3cf SHA512 23d4a85714cca1763a987780eb20f5519a07ef1997e85c09b8ea57674bf6666f3ccedcd8c4d558813c44de397a4d8331e2fa9a357e056d4f3eea6b2b32195a62
 DIST pycharm-professional-2017.3.tar.gz 358504339 BLAKE2B 4ac1eb3feed289326a0122e3e4f869d7be740db1fd8d1c5f5c80400a8d8aa2daa444d4fa279c33865aecec4af4a28999e10b100714a44aa1d772d7f598ac05f4 SHA512 b7a085eda5d3e4ca8a918009f80cd7d90a281f2e522718211b4813f199a9c3a8f38f9742600336c09db479691c789d852ddc1d99e9ee2b11876e85728ae51b44
-EBUILD pycharm-professional-2017.2.3.ebuild 1255 BLAKE2B 562fb3468298c372f2fd5d5492a8a882315d7159c7e743de76219b1e7f45989f186807495e07370c5b5d7e35f6c200eac5e73d567f5db754bab448c4dc57bd6f SHA512 908869fbce14f4d7c1b4dc44fc39f1c82eb11663d8a3164e684a2fff659c9eb15b87eb6e5e62befc5af73dc1a65f3fc0f5ea4a5baabfc5bf740f3fba91ad67ea
-EBUILD pycharm-professional-2017.2.4.ebuild 1257 BLAKE2B 4763b835ac1e71fb8dc916d1bb4a696a791d49d580b7776d12092650dcc6b3fca555d43b38338ed84236c942de6910d84fc7b741ca1191dce8ab559b32cde6bb SHA512 76a9a8c436b9fa7bf5dccde9d70130f86e4e451ddfd1ad1e4eba5cd2d98022ae2e6f4370eba72028f7433eed0fda9be26f6dc22951f79c0c6013e63a71ea231f
-EBUILD pycharm-professional-2017.3.ebuild 1257 BLAKE2B 4763b835ac1e71fb8dc916d1bb4a696a791d49d580b7776d12092650dcc6b3fca555d43b38338ed84236c942de6910d84fc7b741ca1191dce8ab559b32cde6bb SHA512 76a9a8c436b9fa7bf5dccde9d70130f86e4e451ddfd1ad1e4eba5cd2d98022ae2e6f4370eba72028f7433eed0fda9be26f6dc22951f79c0c6013e63a71ea231f
+EBUILD pycharm-professional-2017.3.1.ebuild 1227 BLAKE2B 9d8c803c956dd600e5504da8557ca4bcdf7dd8ed0cdee18e118b38defc06b94363a422d759c6814758b319c9654b9eb86108ce52e8a97783870c0ba6b7e56ee0 SHA512 3600bff6ac964bc1735f4304cac2b4c31cf6a705d1e6df1625a4d0fa50298f57687c7619da56c1556be4a80e3a20f5a35df546a4c040867d2acb9477d457fc7e
+EBUILD pycharm-professional-2017.3.ebuild 1255 BLAKE2B 562fb3468298c372f2fd5d5492a8a882315d7159c7e743de76219b1e7f45989f186807495e07370c5b5d7e35f6c200eac5e73d567f5db754bab448c4dc57bd6f SHA512 908869fbce14f4d7c1b4dc44fc39f1c82eb11663d8a3164e684a2fff659c9eb15b87eb6e5e62befc5af73dc1a65f3fc0f5ea4a5baabfc5bf740f3fba91ad67ea
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild
deleted file mode 100644
index a52a5ee20aa2..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild
+++ /dev/null
@@ -1,59 +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="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-DEPEND=""
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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-professional/pycharm-professional-2017.2.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.1.ebuild
index 5d0519372d5e..af3e5884742a 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2017.2.4.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-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/"
@@ -49,11 +49,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-professional/pycharm-professional-2017.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.ebuild
index 5d0519372d5e..a52a5ee20aa2 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2017.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8