gentoo resync : 04.08.2018

3 files changed, 2 insertions, 67 deletions

diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index b78ab24aaf96..8c6a2188e97c 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,5 @@
-DIST DisplayCAL-3.5.1.0.tar.gz 10378539 BLAKE2B b10e3f70401b9167728c4fc9b59bf66da7e3a09040fdf0800e9697aa9bc328d7d70e4018d14856fbde1a20028ef3aec2922727282050c291ed5a8c83209178e3 SHA512 7dd0c67c8766478223f1e36a36d386b0e8d284001642e34fd1aa27e196fc36be1fd98340f4af202c4b171aa44da9f9d20a53f8dda11ba5e270a1071351fc7a6a
-DIST DisplayCAL-3.5.2.0.tar.gz 10341417 BLAKE2B 218d73756c57107b17a475101a8969af4213ce0417669b5d18f009320cab970da125ddae68a3288f61f05be99f3e2a621a727c2cf6b4aeae43252c8d257ed3af SHA512 607a63c94fbebf916009327bf473c45e6e785e5dfa57bd0b5868616a57b7af1aa3173a43cd7e371b43a8078ad350ff27178c6c13b46a3e67e28a4397c5586665
 DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3 SHA512 ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c
-EBUILD displaycal-3.5.1.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
-EBUILD displaycal-3.5.2.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+DIST DisplayCAL-3.6.0.0.tar.gz 10565171 BLAKE2B 394a925d28f513ededc1bc40b3ce7b5a2687a0c172006fd14b9081188e3ca80c0cd5f634ac84a9917d6aa301e083bffd05db622e292262f6d41db2a86c23a920 SHA512 6d0cff6344bb0dfcff58e88f93e2d0f7a3cf5f8e32b596f9f5e07b0e80ccb9b4ff429aa9fa63b5941f7622e0a7dcd227d0a1066e82d0843454f01d96dea97993
 EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+EBUILD displaycal-3.6.0.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild
deleted file mode 100644
index 72a722b64356..000000000000
--- a/media-gfx/displaycal/displaycal-3.5.2.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.5.1.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.6.0.0.ebuild
index 72a722b64356..72a722b64356 100644
--- a/media-gfx/displaycal/displaycal-3.5.1.0-r1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.6.0.0.ebuild