Replace base inherit by eutils inherit. Update FDO MIME desktop database and GNOME 2 icon list cache. Fixes bug #374402 and bug #374410, proxied commit for Nikoli.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 41 insertions, 7 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index bf89bf09a5b4..1557c7cb7fed 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.63 2014/04/06 15:07:37 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.64 2014/04/06 18:39:18 tomwij Exp $
+
+  06 Apr 2014; Tom Wijsman <TomWij@gentoo.org> mpv-0.3.7.ebuild,
+  mpv-9999.ebuild:
+  Replace base inherit by eutils inherit. Update FDO MIME desktop database and
+  GNOME 2 icon list cache. Fixes bug #374402 and bug #374410, proxied commit for
+  Nikoli.
 
   06 Apr 2014; Tom Wijsman <TomWij@gentoo.org> mpv-0.3.7.ebuild,
   mpv-9999.ebuild:
diff --git a/media-video/mpv/mpv-0.3.7.ebuild b/media-video/mpv/mpv-0.3.7.ebuild
index f479ffff0952..64c05b8d9077 100644
--- a/media-video/mpv/mpv-0.3.7.ebuild
+++ b/media-video/mpv/mpv-0.3.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.7.ebuild,v 1.2 2014/04/06 15:07:37 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.7.ebuild,v 1.3 2014/04/06 18:39:18 tomwij Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 
-inherit base waf-utils pax-utils
+inherit eutils waf-utils pax-utils fdo-mime gnome2-utils
 [[ ${PV} == *9999* ]] && inherit git-r3
 
 WAF_V="1.7.15"
@@ -163,7 +163,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch_user
 }
 
 src_configure() {
@@ -237,3 +237,17 @@ src_install() {
 		pax-mark -m "${ED}"usr/bin/mpv
 	fi
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index d506b7f285b0..d994c741427d 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.41 2014/04/06 15:07:37 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.42 2014/04/06 18:39:18 tomwij Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 
-inherit base waf-utils pax-utils
+inherit eutils waf-utils pax-utils fdo-mime gnome2-utils
 [[ ${PV} == *9999* ]] && inherit git-r3
 
 WAF_V="1.7.15"
@@ -158,7 +158,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch_user
 }
 
 src_configure() {
@@ -232,3 +232,17 @@ src_install() {
 		pax-mark -m "${ED}"usr/bin/mpv
 	fi
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}