[gentoo-commits] proj/qt:qtbase59 commit in: app-emulation/q4wine/

[gentoo-commits] proj/qt:qtbase59 commit in: app-emulation/q4wine/

[Michael Palimaka]

commit:     be3eadce92ef9bd198bc1c1f57e8945a2c2931ba
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 05:49:54 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 05:49:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=be3eadce

app-emulation/q4wine: sync with main tree

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-emulation/q4wine/q4wine-9999.ebuild | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild
index 71633d1c..689118dc 100644
--- a/app-emulation/q4wine/q4wine-9999.ebuild
+++ b/app-emulation/q4wine/q4wine-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils fdo-mime gnome2-utils git-r3
+inherit cmake-utils gnome2-utils xdg-utils git-r3
 
 # Upstream names the package PV-rX. We change that to
 # PV_pX so we can use portage revisions.
@@ -27,6 +27,7 @@ CDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dbus? ( dev-qt/qtdbus:5 )
+	ico? ( >=media-gfx/icoutils-0.26.0 )
 "
 DEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5
@@ -34,7 +35,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	app-admin/sudo
 	>=sys-apps/which-2.19
-	ico? ( >=media-gfx/icoutils-0.26.0 )
 	iso? ( sys-fs/fuseiso )
 "
 
@@ -56,16 +56,12 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }

[gentoo-commits] proj/qt:master commit in: app-emulation/q4wine/

[Michael Palimaka]

commit:     be3eadce92ef9bd198bc1c1f57e8945a2c2931ba
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 05:49:54 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 05:49:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=be3eadce

app-emulation/q4wine: sync with main tree

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-emulation/q4wine/q4wine-9999.ebuild | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild
index 71633d1c..689118dc 100644
--- a/app-emulation/q4wine/q4wine-9999.ebuild
+++ b/app-emulation/q4wine/q4wine-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils fdo-mime gnome2-utils git-r3
+inherit cmake-utils gnome2-utils xdg-utils git-r3
 
 # Upstream names the package PV-rX. We change that to
 # PV_pX so we can use portage revisions.
@@ -27,6 +27,7 @@ CDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dbus? ( dev-qt/qtdbus:5 )
+	ico? ( >=media-gfx/icoutils-0.26.0 )
 "
 DEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5
@@ -34,7 +35,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	app-admin/sudo
 	>=sys-apps/which-2.19
-	ico? ( >=media-gfx/icoutils-0.26.0 )
 	iso? ( sys-fs/fuseiso )
 "
 
@@ -56,16 +56,12 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }