gentoo resync : 10.02.2019

3 files changed, 3 insertions, 68 deletions

diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 5b2a1a5123d4..00bb77e43470 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,9 +1,7 @@
-DIST DisplayCAL-3.6.2.0.tar.gz 10437261 BLAKE2B c476c7834e2c723c48fb9ad9d2ea7f4919c2636814078d8f1a83a6af0e91586e0762ea3787c90f8625cba672ac72ef5e1d2dd6906fd3fd7f3b67637a180b81e3 SHA512 e66a20edf46d460caf5d2f7ddbc93cfe7c37937cd4933d2a2b7d141676696c6f22aadc07d229fbaefe0ced62066fc99d3290352c3e8fc9db4b95a8d0541f0be7
-DIST DisplayCAL-3.7.1.1.tar.gz 10472440 BLAKE2B 2e53537a7570c37120a462102269b5c042299df3de0926b0221bef8b5c29d75e7983b359d9ad162e2d9df2819c624d5f0c00c65fa181cce3fa831f1791d7a1fd SHA512 d5d18b25dd4ce6a2b328db6adb55c43ffcb3e3a495be38004d9e6a6e5c8d576b9477dc895668f82210ce955e7854a578218cb8c9ca2c206f58c47a011ad99c09
 DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
 DIST DisplayCAL-3.7.1.3.tar.gz 10474328 BLAKE2B 9c305809a9f46f3ad76eec728026b2abbd1dec3bee46db92bfe9fe4e7c31f24d61eafaca0bda12f510002d3c5d51bfba4c6d4b1bae5e1ce105a8b75d84672ef8 SHA512 9718f589ee1842f6247ea110c4c6defaf767313fb2fd9ce9fb1b35775141774ce9084c2cbf00d9c432162e8b32c8d789e5a52ca385976c4772bf644738257926
-EBUILD displaycal-3.6.2.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
-EBUILD displaycal-3.7.1.1.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
+DIST DisplayCAL-3.7.1.4.tar.gz 10478572 BLAKE2B 9f646caea40a22804877f168c2a88a2b3069b8d0e4688c9676bd4d6d873a3528797dd3aadde26da40a4945e224504b2f8673f0c176ced687747ef23d8ca20044 SHA512 d60a240714cf32f1f8084caf74cbccc613263612b7192ad766216ec8253c5682079f32d9cf501e91bf7795ddcce4d9f2f0b023117719d0cc05f203d51dc3ef42
 EBUILD displaycal-3.7.1.2.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 EBUILD displaycal-3.7.1.3.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
+EBUILD displaycal-3.7.1.4.ebuild 1518 BLAKE2B 665a66c4563a6f6ec0516841e063eb0f79278e8b11a82b6d9598305a0fbdaa577f77c18dce7b81a6ed6deb257591e241b1ba308ee1c0d0c5d51a17600a9f8ee9 SHA512 c2e00107271a3a724a07ae901343800da4dfa4d33fc96651149cf9c99cc301be744da73f445641dfd129e9848f07009d95c04055d146fdc84bd2c79aaa71ef87
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.6.2.0.ebuild b/media-gfx/displaycal/displaycal-3.6.2.0.ebuild
deleted file mode 100644
index 72a722b64356..000000000000
--- a/media-gfx/displaycal/displaycal-3.6.2.0.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.7.1.1.ebuild b/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
index 02f4e0b4a7e5..d6063154f815 100644
--- a/media-gfx/displaycal/displaycal-3.7.1.1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6