gentoo resync : 14.07.2018

5 files changed, 10 insertions, 78 deletions

diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index ded0a89862c9..fe40136cd32d 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,10 +1,6 @@
 AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
-DIST flrig-1.3.36.tar.gz 692799 BLAKE2B 5fbe2a38a5b76f850c3ac7760481e2ae0b11e9115b239caf9c6a3fd8a39495baf7e00b615ce340fd60739aba36f3c2bb7fc25a6034f1d73add7c964b5db5a6b9 SHA512 8d8797ed09d9314eb4fa2100056b2f9f84cdb104a516a30b36c6341c05d09c5868cd3b9b256c967bed5514ac3362be28b46aca8f9af871f9261904bc12d6401e
-DIST flrig-1.3.37.tar.gz 700906 BLAKE2B f37e858b23476b9b2cdcc3a07f011889b33118030b3b8a9d8e46c53ee57426554ff8db2a9a9e458eed6ffa2c84193b3aba7a8c5e6db994f5ad291f4e645d9da7 SHA512 a8d611cae7bf23c92689e75b75b8de72bf4ea56a5039e54c97dcfeca186afcdebb13782dffafb507047e1d5574e2af1fb6f88bc8a01452ac8921bfa6295c0c90
-DIST flrig-1.3.38.tar.gz 706694 BLAKE2B bc69731fb1cc386ddafe476743aae3747b9dd0fd27610defc53dd9a21dee222c30d101668aa8a040feecde3baf87f3d76a2b758575c6428e4c644fe5bfcecbcb SHA512 905c32923820cfb11da4b94f69df780c5d62bc1fde1c6d569feca7a6aa3a30665953aeb349823dfa5331c527dc4d494dc126a70929f28da561a621533578ab01
 DIST flrig-1.3.39.tar.gz 711661 BLAKE2B d0db385b04b91648a900e08a76e4e8a7715df72d78b379e14852cc47ea86b550016c655414412cc3bad4a5935039b6e50ca2e63ed2b8fcc4a0b2c552fb8be806 SHA512 8e77aff8d1a16d45e510606edb15623248cc41a979c324bece719acb1fddb6a29c05ef99d5dbe8a8a1247f4a5f6353a240556dcfd51ab7180cdc8b68ce5cc4ee
-EBUILD flrig-1.3.36.ebuild 624 BLAKE2B 35f05d522308aedf4919926975417e6052f44503f533b2496d2bbb594ed74beab0dc1fce65fb3975bf1e69ec4be190c9fabd8679223988b2d09376d16299ae24 SHA512 5d2cae5c29172ee70aa5dcbe65cf449094980b4ae75b1dc6dd23cfd368ac24d396b1154107a0506e6981c089e56626e4abe8e28e15fb12b0e68a84a3d587cae1
-EBUILD flrig-1.3.37.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674fb1555eb29527b3bdd0852ad15094203d4909436a71b65b7afb5ebdaf0320ce27b4145452591b31b43ad4691 SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d
-EBUILD flrig-1.3.38.ebuild 626 BLAKE2B 0b0869afd239a791eb95c904bbccfa11dd332cd06b51873ad1e2449a514600bb83fe7958703758243234ce3e4e8b43956d4c4bc89191fd3d68b3f184c98dfe91 SHA512 c74380b192490fb007d231e5b5b547ae822bdd6e5bcee3e443f232429c7eabdb152cde450dc7015a79b1ba7194092aaaa61a8d16085fa132a03453629a39b34e
-EBUILD flrig-1.3.39.ebuild 625 BLAKE2B e134ec9cd30f2a78a6072139656d0cb00aea42eb28070f550f2789b782a505b245b7008d72516948887d9f56ae72fa7f892d159a9c4558d4ff84f6d40e4fe83a SHA512 3fe335abf499aea713e746af0a0a9c07ca347539b5cdd3c5f79f1e115c152b1d77a7edd0503ea0d57451743ce9d856f2208976f53fa8d5a4bf573cf02654d62f
+DIST flrig-1.3.40.tar.gz 745925 BLAKE2B ef9e3295c7afed5ec14aeeb6c056afb31ad1f9719f2a49091b397e1809b34550cb667914b78f370da1722184a8db6253bf7a377db960deeb50a4833d9beb99d6 SHA512 28ed895a1b87ddcbab152b29c17d14b03ea29c9ae427bfc6eb594f270dc85c0044dc566991be8680d09f19dc46839e0672b250f3c765fb0f76da1624840ae216
+EBUILD flrig-1.3.39.ebuild 624 BLAKE2B 35f05d522308aedf4919926975417e6052f44503f533b2496d2bbb594ed74beab0dc1fce65fb3975bf1e69ec4be190c9fabd8679223988b2d09376d16299ae24 SHA512 5d2cae5c29172ee70aa5dcbe65cf449094980b4ae75b1dc6dd23cfd368ac24d396b1154107a0506e6981c089e56626e4abe8e28e15fb12b0e68a84a3d587cae1
+EBUILD flrig-1.3.40.ebuild 584 BLAKE2B 9c7b89a5702ab9c72b1bd727d6147902f216c803c7594ccf626760c48dcf0cc2f804bb582dde3666796f217de635e3695cd8a962e7d980022ff0fbc1c8018d2f SHA512 778128e835cadeb59882f5b4352036399cc4ee47f84b9ebdfe79edc24111eb8f8a9b807bdeafdc39eadd6ad4012636860a8d4124ac664561271469b82b16ac1f
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.36.ebuild b/media-radio/flrig/flrig-1.3.36.ebuild
deleted file mode 100644
index 8b0982ab2c0d..000000000000
--- a/media-radio/flrig/flrig-1.3.36.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fix-bashism.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.37.ebuild b/media-radio/flrig/flrig-1.3.37.ebuild
deleted file mode 100644
index 55065b05abc0..000000000000
--- a/media-radio/flrig/flrig-1.3.37.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fix-bashism.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.39.ebuild b/media-radio/flrig/flrig-1.3.39.ebuild
index c4cebbc77a77..8b0982ab2c0d 100644
--- a/media-radio/flrig/flrig-1.3.39.ebuild
+++ b/media-radio/flrig/flrig-1.3.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-radio/flrig/flrig-1.3.38.ebuild b/media-radio/flrig/flrig-1.3.40.ebuild
index 19d88bf2c029..3aa457624c82 100644
--- a/media-radio/flrig/flrig-1.3.38.ebuild
+++ b/media-radio/flrig/flrig-1.3.40.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=6
+inherit autotools
 
 DESCRIPTION="Transceiver control program for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
+DOCS=(AUTHORS ChangeLog README)
+
 RDEPEND="x11-libs/libX11
 	x11-libs/fltk:1
 	x11-misc/xdg-utils"
@@ -21,11 +23,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	epatch "${FILESDIR}"/fix-bashism.patch
+	eapply_user
+	eapply "${FILESDIR}"/fix-bashism.patch
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}