commit:     0d6d2c4835d825001952af07c5f7ab293ab46a7a
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Jun  8 03:59:31 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 14:35:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6d2c48

net-wireless/gnuradio: fdo-mime->xdg-utils

All ebuilds tested with ebuild gnuradio-*.ebuild clean install merge.
Exception is gnuradio-3.6.5.1-r2, which fails in src_configure for a
reason I've not yet investigated; possibly too new of cmake.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild | 10 +++++-----
 net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild  | 10 +++++-----
 net-wireless/gnuradio/gnuradio-3.7.9999.ebuild   | 10 +++++-----
 net-wireless/gnuradio/gnuradio-3.8.9999.ebuild   | 10 +++++-----
 net-wireless/gnuradio/gnuradio-9999.ebuild       | 10 +++++-----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild 
b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index 8cf324114b5..4c84e78c0a0 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils fdo-mime python-single-r1
+inherit cmake-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="http://gnuradio.org/";
@@ -158,8 +158,8 @@ pkg_postinst()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource install --noupdate --context 
mimetypes --size ${size} \
                                
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -177,8 +177,8 @@ pkg_postrm()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource uninstall --noupdate --context 
mimetypes --size ${size} \
                                application-gnuradio-grc || ewarn "icon 
uninstall failed"

diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild 
b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
index 4eaaf0dca19..49a295ab37f 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="http://gnuradio.org/";
@@ -214,8 +214,8 @@ pkg_postinst()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource install --noupdate --context 
mimetypes --size ${size} \
                                
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -233,8 +233,8 @@ pkg_postrm()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource uninstall --noupdate --context 
mimetypes --size ${size} \
                                application-gnuradio-grc || ewarn "icon 
uninstall failed"

diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild 
b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 9c0cb3a6104..26671b12730 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="http://gnuradio.org/";
@@ -221,8 +221,8 @@ pkg_postinst()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource install --noupdate --context 
mimetypes --size ${size} \
                                
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,8 +240,8 @@ pkg_postrm()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource uninstall --noupdate --context 
mimetypes --size ${size} \
                                application-gnuradio-grc || ewarn "icon 
uninstall failed"

diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild 
b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 08671c06752..c598bb61412 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils 
python-utils-r1
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 
xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="http://gnuradio.org/";
@@ -207,8 +207,8 @@ pkg_postinst()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource install --noupdate --context 
mimetypes --size ${size} \
                                
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -226,8 +226,8 @@ pkg_postrm()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource uninstall --noupdate --context 
mimetypes --size ${size} \
                                application-gnuradio-grc || ewarn "icon 
uninstall failed"

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 9c0cb3a6104..26671b12730 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="http://gnuradio.org/";
@@ -221,8 +221,8 @@ pkg_postinst()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource install --noupdate --context 
mimetypes --size ${size} \
                                
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,8 +240,8 @@ pkg_postrm()
        local GRC_ICON_SIZES="32 48 64 128 256"
 
        if use grc ; then
-               fdo-mime_desktop_database_update
-               fdo-mime_mime_database_update
+               xdg_desktop_database_update
+               xdg_mime_database_update
                for size in ${GRC_ICON_SIZES} ; do
                        xdg-icon-resource uninstall --noupdate --context 
mimetypes --size ${size} \
                                application-gnuradio-grc || ewarn "icon 
uninstall failed"

Reply via email to