gentoo resync : 09.06.2018

6 files changed, 41 insertions, 41 deletions

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 412b295f270f..a769c16b90ac 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,9 +2,9 @@ AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5338 BLAKE2B 6bb26c728d0e3b5f4b2e4e99eb23511047319c5fe2168803388da77d78327ff58ace4985b38cc76954a6042c312cb9d4243355c7910540e7ddc20862c0240b2b SHA512 93a9be9c3b8abc3b9c6b33de2b1fad9b0f4d87461de2497ca4dbd17cb14ef8c3a552ea861e27750e0fed6cb1a4d48afa727c84415f2231bd3e9845be24b540ce
-EBUILD gnuradio-3.7.11-r3.ebuild 7032 BLAKE2B 2ada9c5dddc983c01179d0522026fa4b1576808aabd911de6fa822169bcd7ed1622a03ac38a01c1974007a7b724d9dedace797933006ce6b89b74b8d6c7f27ea SHA512 8728f26aa4f6e5fa7aa1e1b430c26dd53993c58974b6b841966c2afe581382dbe0c02b9b590d2ed6283e9c2422fc2bfefc416c9da774c902c50fdfdf28bded24
-EBUILD gnuradio-3.7.9999.ebuild 7109 BLAKE2B b7cc3f3db94948ae94a64b1e6491bbd54896f9f6ec6d9dd1e4be2d66ed40d77710795198c77cf9acc5d0784d8680e0a10eaeab95d72567e15a92eb5993ed85b3 SHA512 7c3d4128deed42a28478bbef779e29426e18f4b966bb31cc5084d12cb64e6049375d620594287e5c1f889f352ea699a34ce9e7c76c1fa486307cfa253b0bb935
-EBUILD gnuradio-3.8.9999.ebuild 6658 BLAKE2B a0aba22afedcb57ad905602f7dabdb61042b3ae51a0a41ed14ef46e23eafe35add7e335630ad0e284e47b46fda457f5618859bcaa954f68b4d20332d60fba542 SHA512 3b8d514421d415b8a326962839d31a38f519845097ef396a244dd827d5b9bae039ffcea25b995a2a6df9ff28564824118827977b339951e7d7a1fddaf420bb4b
-EBUILD gnuradio-9999.ebuild 7109 BLAKE2B b7cc3f3db94948ae94a64b1e6491bbd54896f9f6ec6d9dd1e4be2d66ed40d77710795198c77cf9acc5d0784d8680e0a10eaeab95d72567e15a92eb5993ed85b3 SHA512 7c3d4128deed42a28478bbef779e29426e18f4b966bb31cc5084d12cb64e6049375d620594287e5c1f889f352ea699a34ce9e7c76c1fa486307cfa253b0bb935
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5334 BLAKE2B c1832d28df13b422a2c2c246d87ad2b73389c7293d99fd20cc13e9d43737d1393de8596140ca981b6dd5d39871fefcb12cc19925941db45f01200969ae5d887e SHA512 9a2975c4be004a7654ac466c15c04381e8f187a2584a0377d866b91f464c0870f8bcc96db8cc968c6b08986810ac1d17374c0e97455aefaf449f77b8650fa786
+EBUILD gnuradio-3.7.11-r3.ebuild 7024 BLAKE2B c29549a5022c6557c3466d6e9a5bb4d3cc2428a4a95a4e7cfb7ee20b639ddd49a7d2b1af9080f4a3b1975d278f0e186cccedce80410bc842c11bc97bb53deb92 SHA512 b7fe2d8931ac3dc94e0aa73b8b3d508cdb96015d62c11a7332282039a98c5a603be171de1efc675c9039e63261242d9d71c2fa9f2f0ff227705d9e2edcec24f0
+EBUILD gnuradio-3.7.9999.ebuild 7100 BLAKE2B a57e16d927a61c6a0ae5aaf77b80725a8e5e7906ffee58db901d2b018f35d2fac835314ff3c4244bc5537914a5e8288d89bbc031c1425c0e8c257a583272217d SHA512 ef3488005de9e5158e68636fffd964c30ecb614d3620d2964e66fb7d13116fadd01030e03b19c7b5d91113fa01b1b5e5755a317a306753a65ec9ac13f9d17141
+EBUILD gnuradio-3.8.9999.ebuild 6649 BLAKE2B be57d7c251d0ed046042da7ad9bef94e4512a5bf3d8301a05de208c1f94a35efc927e4e70606ca6f0d68ec5da74ad59f90cd68cf68da1d9276bccaa68ada9f71 SHA512 bc15231f5329e1ec59259487f38e58ca01babaaeb84551372a6643ca817526c545f7acb54e941835fcc05a1a458dda77325b54ac18c106676b2fd233e9d442ac
+EBUILD gnuradio-9999.ebuild 7100 BLAKE2B a57e16d927a61c6a0ae5aaf77b80725a8e5e7906ffee58db901d2b018f35d2fac835314ff3c4244bc5537914a5e8288d89bbc031c1425c0e8c257a583272217d SHA512 ef3488005de9e5158e68636fffd964c30ecb614d3620d2964e66fb7d13116fadd01030e03b19c7b5d91113fa01b1b5e5755a317a306753a65ec9ac13f9d17141
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
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 2147baf1dabc..dfd9a9881248 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/"
@@ -12,11 +12,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-2
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -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 4eaaf0dca196..209382cc3fe1 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/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -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 9c0cb3a61048..43aaf6e9d946 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/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -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 08671c06752a..ec6405c3f929 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/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -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 9c0cb3a61048..43aaf6e9d946 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/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -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"