| 1 |
commit: 31fa4f3c77944ef11f19ded4d5e9ed6962e05cd2 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 21 10:46:51 2015 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 24 21:56:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31fa4f3c |
| 7 |
|
| 8 |
gnome2.eclass: use xdg.eclass phase functions |
| 9 |
|
| 10 |
eclass/gnome2.eclass | 11 ++++++----- |
| 11 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 14 |
index d48b5a6..4bbe009 100644 |
| 15 |
--- a/eclass/gnome2.eclass |
| 16 |
+++ b/eclass/gnome2.eclass |
| 17 |
@@ -10,7 +10,7 @@ |
| 18 |
# Exports portage base functions used by ebuilds written for packages using the |
| 19 |
# GNOME framework. For additional functions, see gnome2-utils.eclass. |
| 20 |
|
| 21 |
-inherit eutils fdo-mime libtool gnome.org gnome2-utils |
| 22 |
+inherit eutils libtool gnome.org gnome2-utils xdg |
| 23 |
|
| 24 |
case "${EAPI:-0}" in |
| 25 |
4|5) |
| 26 |
@@ -74,6 +74,8 @@ gnome2_src_unpack() { |
| 27 |
# Prepare environment for build, fix build of scrollkeeper documentation, |
| 28 |
# run elibtoolize. |
| 29 |
gnome2_src_prepare() { |
| 30 |
+ xdg_src_prepare |
| 31 |
+ |
| 32 |
# Prevent assorted access violations and test failures |
| 33 |
gnome2_environment_reset |
| 34 |
|
| 35 |
@@ -225,6 +227,7 @@ gnome2_src_install() { |
| 36 |
# @DESCRIPTION: |
| 37 |
# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst |
| 38 |
gnome2_pkg_preinst() { |
| 39 |
+ xdg_pkg_preinst |
| 40 |
gnome2_gconf_savelist |
| 41 |
gnome2_icon_savelist |
| 42 |
gnome2_schemas_savelist |
| 43 |
@@ -237,9 +240,8 @@ gnome2_pkg_preinst() { |
| 44 |
# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime |
| 45 |
# database updates. |
| 46 |
gnome2_pkg_postinst() { |
| 47 |
+ xdg_pkg_postinst |
| 48 |
gnome2_gconf_install |
| 49 |
- fdo-mime_desktop_database_update |
| 50 |
- fdo-mime_mime_database_update |
| 51 |
gnome2_icon_cache_update |
| 52 |
gnome2_schemas_update |
| 53 |
gnome2_scrollkeeper_update |
| 54 |
@@ -255,8 +257,7 @@ gnome2_pkg_postinst() { |
| 55 |
# @DESCRIPTION: |
| 56 |
# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates. |
| 57 |
gnome2_pkg_postrm() { |
| 58 |
- fdo-mime_desktop_database_update |
| 59 |
- fdo-mime_mime_database_update |
| 60 |
+ xdg_pkg_postrm |
| 61 |
gnome2_icon_cache_update |
| 62 |
gnome2_schemas_update |
| 63 |
gnome2_scrollkeeper_update |
Archives