gentoo resync : 02.01.2018

3 files changed, 14 insertions, 60 deletions

diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c2541180f351..462c541ee122 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,5 @@
-DIST DisplayCAL-3.3.3.0.tar.gz 9887918 BLAKE2B a26198a13cc1119ae0e5605409e9bb6fb2e922eaf249c002fcf523d7af68f9a21b993a4f171254bdf6286f9923bd435b252ba0938e3e5a14f690b57eb45eee13 SHA512 2f9ac1ac2ce24629695f70078625ac4dc6e1346a675cd55658efc3631a6a37546cf6dc7b2747ae77b3681e7f7c816527497f53564e6cb51ce71a132d93955534
-DIST DisplayCAL-3.3.4.1.tar.gz 9909570 BLAKE2B ee66c580c72f823cc0ea9f618e0eea84992d375dd17e3e942aeee19a1c8f81d47c2b431de2c36ed7e384cf089efb530853e7a884a1ec2fbdd6d3dab7007c868c SHA512 c596333e298aea9366c808c074e467a49e32fa00b0534ae8ce6ad89d0250cf1f2a013dac0d87444edb911bcdea053a462026e335cfc2aa507a932217f1dcd272
 DIST DisplayCAL-3.3.5.0.tar.gz 9913672 BLAKE2B de95217baf18a3b07b51a9db24e37cd965ecf5ba96392410f7f5af788b696f69260eac5c0188cbd3a2f1b90dfafe781cd711c04a9bd45dd5a2fa59fd547087b2 SHA512 7a24cbc540771fd26b504536ee0c1b9c34f013c19b5b2a4e1ce38015014e9b34e67b48a1f08bf96581cef2968883691206ddb6cefa9ac70d76251a305a5b1c37
-EBUILD displaycal-3.3.3.0.ebuild 1415 BLAKE2B 7b13caeba27093f521ecc6cac620892db8127f4b88bbaff10602b21f7d3efc1fb7961f015a42814204b8e34c7c0bce0f38bb3517d30de31b8c3236e57f67d967 SHA512 c4f94565c12a623dfd1d7e7854655ddc9a1d09a7545fdf89aaa7fca713ece4a4647d0dc996269edbc22f658a850428d277d283c5dfb17d2491a30ced932b21c2
-EBUILD displaycal-3.3.4.1.ebuild 1415 BLAKE2B 7b13caeba27093f521ecc6cac620892db8127f4b88bbaff10602b21f7d3efc1fb7961f015a42814204b8e34c7c0bce0f38bb3517d30de31b8c3236e57f67d967 SHA512 c4f94565c12a623dfd1d7e7854655ddc9a1d09a7545fdf89aaa7fca713ece4a4647d0dc996269edbc22f658a850428d277d283c5dfb17d2491a30ced932b21c2
+DIST DisplayCAL-3.4.0.0.tar.gz 10279645 BLAKE2B cf0b6d841c26d8ee4eec47fa58071e31e1ae4c8f1cd63f08216dbfd33caeb900d767988aa19f1738bdbe3c180954a13be22fdd96187b32edc8b0419b945670be SHA512 a63cda986a70cef844908c5809157af28473b564c97fa4c1b957102401b177b254cd215b1cb7c8192873e6d1b204dca66f5a08862f27e0d2f0c06b6ceeaae25e
 EBUILD displaycal-3.3.5.0.ebuild 1518 BLAKE2B d6774180d9cbd3bb17572e96dfcf95b5d8e7f71efa038764dbf0012ad8f56965efb95c2c67e77a9dbf1a4bd07f7e6229a3f9fe9c35fa12417a0b8aada6fd9a18 SHA512 19671a35a80cbfb99d7f5fc2a36884990e791fc02b563efe00131b776320cac1e3c4307877152e07f972ba8aabde879ea3d7d6a4d498560f4cb96c7640459f58
+EBUILD displaycal-3.4.0.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.3.4.1.ebuild b/media-gfx/displaycal/displaycal-3.3.4.1.ebuild
deleted file mode 100644
index 4beb3e30e0da..000000000000
--- a/media-gfx/displaycal/displaycal-3.3.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 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-proto/xineramaproto-1.2
-	>=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
-}
diff --git a/media-gfx/displaycal/displaycal-3.3.3.0.ebuild b/media-gfx/displaycal/displaycal-3.4.0.0.ebuild
index 4beb3e30e0da..d955f9b1fea5 100644
--- a/media-gfx/displaycal/displaycal-3.3.3.0.ebuild
+++ b/media-gfx/displaycal/displaycal-3.4.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 xdg
+inherit distutils-r1 gnome2-utils xdg
 
 MY_PN="DisplayCAL"
 MY_P="${MY_PN}-${PV}"
@@ -52,3 +52,13 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}