From 598af99d8f7f9cc80a58da3c28e0a41df872a886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 21 Dec 2020 09:17:08 +0300 Subject: [PATCH] Remove fdo-mime.eclass --- dev-python/wxpython2/wxpython2-3.0.2.0.ebuild | 13 +++++- eclass/fdo-mime.eclass | 43 ------------------- 2 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 eclass/fdo-mime.eclass diff --git a/dev-python/wxpython2/wxpython2-3.0.2.0.ebuild b/dev-python/wxpython2/wxpython2-3.0.2.0.ebuild index 3a24bdb41..b1288d8f4 100644 --- a/dev-python/wxpython2/wxpython2-3.0.2.0.ebuild +++ b/dev-python/wxpython2/wxpython2-3.0.2.0.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) WX_GTK_VER="3.0" -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets +inherit alternatives distutils-r1 eutils flag-o-matic wxwidgets ORIG_PN="wxpython" MY_PN="wxPython-src" @@ -114,6 +114,16 @@ python_install_all() { rm -r ${D}/usr/share } +fdo-mime_desktop_database_update() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ] + then + einfo "Updating desktop mime database ..." + "${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}usr/share/applications" + fi +} + pkg_postinst() { fdo-mime_desktop_database_update @@ -139,3 +149,4 @@ pkg_postrm() { } python_foreach_impl update_symlinks } + diff --git a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass deleted file mode 100644 index 3aa45919b..000000000 --- a/eclass/fdo-mime.eclass +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @DEAD -# No consumers left. Removal in 30 days. - -# @ECLASS: fdo-mime.eclass -# @MAINTAINER: -# freedesktop-bugs@gentoo.org -# @AUTHOR: -# Original author: foser -# @BLURB: Utility eclass to update the desktop mime info as laid out in the freedesktop specs & implementations -# @DEPRECATED: xdg-utils -# @DESCRIPTION: -# This eclass is DEPRECATED. Please use xdg-utils or xdg instead. - -# @FUNCTION: fdo-mime_desktop_database_update -# @DESCRIPTION: -# Updates the desktop database. -# Generates a list of mimetypes linked to applications that can handle them -fdo-mime_desktop_database_update() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= - has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" - if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ] - then - einfo "Updating desktop mime database ..." - "${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}usr/share/applications" - fi -} - -# @FUNCTION: fdo-mime_mime_database_update -# @DESCRIPTION: -# Update the mime database. -# Creates a general list of mime types from several sources -fdo-mime_mime_database_update() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= - has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" - if [ -x "${EPREFIX}/usr/bin/update-mime-database" ] - then - einfo "Updating shared mime info database ..." - "${EPREFIX}/usr/bin/update-mime-database" "${EROOT}usr/share/mime" - fi -}