gentoo resync : 25.11.2020

4 files changed, 37 insertions, 11 deletions

diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest
index 69a1fb0c4156..4daa5266523b 100644
--- a/media-sound/gqradio/Manifest
+++ b/media-sound/gqradio/Manifest
@@ -1,4 +1,5 @@
-AUX gqradio-1.9.2-underlinking.patch 642 BLAKE2B 67f47fa4b337813b605a06dc1efb32a70575440a0df2760b7576161fa3b07d966ab7ce4fbed131326221eff1764aa1f780d772822183bb9123208d8ef11e3a4d SHA512 596dd4109ec4c1e356af0403e6195d3331102a96a14e6525874ed4044d9cae90e9a70942097fd57b70bccbcc3f3befc81e50324e8389df14bc3a6e6f093f468a
+AUX gqradio-1.9.2-desktop-QA.patch 439 BLAKE2B cb8ce333958dd809a2700e79a4368b13d886488617e540b38aac1e4553096c9605c2a8545ff57e5649d98a1620dd149c4352a7b6575203ac5827324feba6b395 SHA512 1f4430aeba883db95ca26f3b24ad5af2e485384a8c4d7b8b382444aa32e088dbc1a9627f0a5e1e8dbf28d81f54f0826a33e9cfb1a009e35bd65a89412d2ebed9
+AUX gqradio-1.9.2-underlinking.patch 646 BLAKE2B 7bde36350fb9bdc2930dea78116ac340094025234b7b34d58efdc26157a67d2a55a10f880ce029f787c9925aab2b2335c667701c76c2d19f100b0bb64103449d SHA512 75af9b293930da87ad8482ccddfa39ab64421fe6403cf80e060426f75c1b81c8e6c464f3ac29f263daa464b24cbdadf70680ef314a5cb94d68a5771bdfac385d
 DIST gqradio-1.9.2.tar.gz 444114 BLAKE2B 8430a494b85fd7d856aaf3ca7b2678f8ce3f52c6e05feab1fba525bbfa7cee49dacb0887b91a9bb4adebdca91a7d9d0f7cae403eca7a6b40257792fd92cf9993 SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a
-EBUILD gqradio-1.9.2.ebuild 605 BLAKE2B ae6ef9f029909274936e86e70f94fd1945a4e5e20f4826b2722a5b97c0ecc8a6d221d81d11b76307d2338bca171f90153ed914300bb40dc88a70a3f81fcdaeff SHA512 4928f04866f9fc9b2c4ea70dcb63a33f31e237c30112581109e82a7234dcbea9c68cc95accbe0134fa925ebbf3d74d83072abca02486c5bf231d89e86a90ea49
+EBUILD gqradio-1.9.2.ebuild 631 BLAKE2B 30f67ea3ec9aa76bfb35bcac96dd2607b05eca4cab785c5b669fe95239128dea17d269093c93056cee423a06cfbcf98b0e5ea96b3ed8fbe5d4f2c25c019bf938 SHA512 ecfa58aea1541413318618fc23fc701b3ca1a24184754505cc71794daa477343069114f01a3fbb26d441ae7ed52a59196174afd693d83cd14dde9463214f0b30
 MISC metadata.xml 656 BLAKE2B 887c6e754554837b10711e46688dfb0f22dc80a54612cc57a2d11b32c4a6ad80008d2a30df43bd7899f87287211ffe0d20242b8f01fdc539e9ac6d321fad51de SHA512 944ed11ad30e97bc4266d63ff4b4bc17b37ee142e4ed8758cc8959fcfc18fb295afbfaba2eda07ec553b0a741eaa19ded8ac15f5e64316954fe167b9fa854cfd
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch b/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch
new file mode 100644
index 000000000000..b9ec631f59fb
--- /dev/null
+++ b/media-sound/gqradio/files/gqradio-1.9.2-desktop-QA.patch
@@ -0,0 +1,20 @@
+--- a/gqradio.desktop
++++ b/gqradio.desktop
+@@ -3,12 +3,12 @@
+ Comment=Radio tuner
+ Comment[fr]=Tuner radio
+ Exec=gqradio
+-Icon=gqradio.png
+-Info=Radio tuner app.
+-Info[fr]=Application tuner radio
+-Terminal=0
++Icon=gqradio
++X-Info=Radio tuner app.
++X-Info[fr]=Application tuner radio
++Terminal=false
+ Type=Application
+ StartupNotify=false
+ StartupWMClass=gqradio
+ Encoding=UTF-8
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
index bcedc3e40f10..f6e75954607f 100644
--- a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
+++ b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -30,6 +30,16 @@
  AC_DEFINE_UNQUOTED(GQRADIO_SKINDIR, "$prefix/share/gqradio/skins", [Location of skins])
  AC_DEFINE_UNQUOTED(GQRADIO_HELPDIR, "$prefix/share/doc/gqradio-$VERSION", [Location of documentation files])
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
index 7f87210ea6e2..235f711463f2 100644
--- a/media-sound/gqradio/gqradio-1.9.2.ebuild
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An FM radio tuner app from the people who brought you GQmpeg"
 HOMEPAGE="http://gqmpeg.sourceforge.net/radio.html"
@@ -11,16 +12,20 @@ SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog README SKIN-SPECS TODO"
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }