gentoo resync : 05.02.2020

5 files changed, 39 insertions, 124 deletions

diff --git a/media-radio/xwxapt/Manifest b/media-radio/xwxapt/Manifest
index 696cc7727c56..6892eb5c585c 100644
--- a/media-radio/xwxapt/Manifest
+++ b/media-radio/xwxapt/Manifest
@@ -1,8 +1,4 @@
-AUX xwxapt-3.3-install.patch 809 BLAKE2B f452c343859afa1199624f2aa231ca1b820b514887ff997bdcd493bb310159101bc195326998ac2e67cf05a5ee6f5a9d89ee4a00951c7659c1a9eccccdd3c9be SHA512 c8ccc5a6c76bbaa0fe600f60f31b538fbb7a50a1a16268eae3629cc6e4c48af695de5bdf7a6eb2963227646f082a21da9ae301910010aa275d6b8e5741b5c737
-DIST xwxapt-3.1.tar.bz2 258794 BLAKE2B 9a78f66a03095da209575096206e440149f329cce7be0e887704da9ef95c593e07c20107703744cfeae801e1afda94e42e312f3be788af6455d44b65c15bccb5 SHA512 68e332ddd50567181d0d8e36d1466adf7baab85670d94a92cbda478c7e61bc1bac547062b8c4ec34cbf2e832919ad76002423360c7c804525a1436ce7acb7ba9
-DIST xwxapt-3.2.tar.bz2 258901 BLAKE2B 4e82c8c21d43f9407c38699b275c690cce80555e5a738b0d22f20e32cf6586f078ba84563c4b92ebdfcc8714b24128e3f142b432e38b62cdb619976234b024fc SHA512 46adcbabaf46d0a91b5284d8171d94777846dabce62cdf36df785d9e6f94fa3df987e3b7cce636d96aed6b3cffb9b5e295dc4d46b7bc3bd209acf896c8c45858
-DIST xwxapt-3.3.tar.bz2 260010 BLAKE2B b26c8a6a05c879f1aa6f3a844f72383fdce1ce3f6efeb36305723fb3aba7f01f05cd4fd244f574e2cd8b759b499f95a5aa54db244ebefc8fb3d91d8179ce0ea5 SHA512 ea9ecc8bc5948005a09ff15e9909387980a873e9770f28efbd828a8475a0161329bd4b00e4dde9c7c50e9e4ffbfd288e25ad09224bec66250acf8eeeba23ced6
-EBUILD xwxapt-3.1.ebuild 1240 BLAKE2B 7ea6309ab0f054725b0ce04c877725594610e422c4eb3486c545995d46279b808792fc4aa309208915123c412c8f8200edb22c92b410d8b4b621651c3d9568f9 SHA512 adafc425ac840837aa18f4a9bb48211406703190f950bc986450a4d2cefb875287832d868e9f6745b9ff9d113e02cfcd7356bed7277dcbb666975e1ca3759c8c
-EBUILD xwxapt-3.2.ebuild 1240 BLAKE2B 7ea6309ab0f054725b0ce04c877725594610e422c4eb3486c545995d46279b808792fc4aa309208915123c412c8f8200edb22c92b410d8b4b621651c3d9568f9 SHA512 adafc425ac840837aa18f4a9bb48211406703190f950bc986450a4d2cefb875287832d868e9f6745b9ff9d113e02cfcd7356bed7277dcbb666975e1ca3759c8c
-EBUILD xwxapt-3.3.ebuild 1285 BLAKE2B 1a62b050cb05595817173da5edf2b0f37cf5a145f15811d593e56eae01b416c5190d543cc092334924a23c39323cd784429e875af7d8d5ff4b4ab5e76100a204 SHA512 2574b243c81b3a5be37192f51b809f3541960e90c696d598616d8e962c8ab6e4fd9b489073355b5ceedaff4e5f354237bc410dc04dd15cf427b206c5e100d84b
+AUX xwxapt-3.4.2-fix-autotools.patch 1339 BLAKE2B 00db95e39bd581b5fb298f88fa1105bfe39e1778e5e308b34f3ba8364771ef4e59d6bd13426549c6a2eb9d08748fd0144e1d6e70f0f5c4a87be3e6e38a50cda0 SHA512 edad4b8db138db59587f35150261f15eeae3b1e02f06cb0f814f7c34fa3e1de1c6eb42768fee5fa90659e81f0288cad3f900f45f7038c59488e7cb78a03e5216
+DIST xwxapt-3.4.2.tar.bz2 262059 BLAKE2B 5e5642523e434dee6d2a35dc1be5bead3449afddb285e367cd99c7d2de14f2b1d7181bd6bc7d91a652faaa38aac3ce1b7d51d80ece665b230667674d9cb52779 SHA512 15969db9869699b09e2ddd1f800bff4956dcdedf91c5070d6747d3fa7ec22f78460adc8533917523821712b4da9f75350a8780df45bfe8741ad88d694dda6210
+EBUILD xwxapt-3.4.2.ebuild 1146 BLAKE2B 7d24849207990238a1dbfbd6626fda63cc6bd38dcea0ffe779d1a34873e5cd4b88338f00f01633bd794c647fb18a026f3c8fc8307877f55af1db9ad4df605206 SHA512 2a69ebe2d3017c734c03e5cb659647a6aa3469cdeeb8320d01b422bdd9a492b5f1edd243b36f67191bc12206f9109535cb036dfe5b819f83a9d647b67939c13b
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xwxapt/files/xwxapt-3.3-install.patch b/media-radio/xwxapt/files/xwxapt-3.4.2-fix-autotools.patch
index eed2464d3706..7f1592e9825d 100644
--- a/media-radio/xwxapt/files/xwxapt-3.3-install.patch
+++ b/media-radio/xwxapt/files/xwxapt-3.4.2-fix-autotools.patch
@@ -1,5 +1,26 @@
---- Makefile.am.orig	2018-01-22 19:40:47.638751354 +0100
-+++ Makefile.am	2018-01-22 19:41:28.830090441 +0100
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,17 +35,16 @@
+ AC_CHECK_LIB([gmodule-2.0], [g_module_open])
+ 
+ # Internationalization tools
++AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.8])
+ GETTEXT_PACKAGE=xwxapt
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package.])
+-AM_GNU_GETTEXT
+ PROGRAMNAME_LOCALEDIR=[${datadir}/locale]
+ AC_SUBST(PROGRAMNAME_LOCALEDIR)
+ 
+ # Add the languages which your application supports here.
+ ALL_LINGUAS=""
+-AM_GNU_GETTEXT
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([libintl.h stdlib.h string.h unistd.h])
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -48,18 +48,5 @@
  	if test -d files/; then \
  	  cp files/$(PACKAGE).desktop $(DESTDIR)/usr/share/applications/; \
diff --git a/media-radio/xwxapt/xwxapt-3.2.ebuild b/media-radio/xwxapt/xwxapt-3.2.ebuild
deleted file mode 100644
index 16d6f5224ef3..000000000000
--- a/media-radio/xwxapt/xwxapt-3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="GTK+ linux weather satellite APT image decoder software"
-HOMEPAGE="http://www.qsl.net/5b4az/pages/apt.html"
-SRC_URI="http://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	net-wireless/rtl-sdr
-	media-libs/alsa-lib
-	dev-libs/glib:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-HTML_DOCS="doc/xwxapt.html"
-
-src_prepare() {
-	eapply_user
-	# suppress -Weverything flag
-	sed -i -e "s/= -Weverything/= /" src/Makefile.am || die
-	# create missing mkinstalldir and prepare package
-	glib-gettextize --force --copy || die "gettextize failed"
-	eautoreconf
-}
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins xwxapt/xwxaptrc
-	doins xwxapt/xwxapt.glade
-	dodir /usr/share/${PN}/images /usr/share/${PN}/records
-}
-
-pkg_postinst() {
-	einfo "You must copy the /usr/share/xwxapt directory into your home directory"
-	einfo "and configure the contained xwxaptrc file before starting the program"
-	ewarn
-	ewarn "If you just upgraded from <=xwxapt-3 do not miss to check"
-	ewarn "for changes there"
-}
diff --git a/media-radio/xwxapt/xwxapt-3.3.ebuild b/media-radio/xwxapt/xwxapt-3.3.ebuild
deleted file mode 100644
index 9e68a17be3dd..000000000000
--- a/media-radio/xwxapt/xwxapt-3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="GTK+ linux weather satellite APT image decoder software"
-HOMEPAGE="http://www.qsl.net/5b4az/pages/apt.html"
-SRC_URI="http://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	net-wireless/rtl-sdr
-	media-libs/alsa-lib
-	dev-libs/glib:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-HTML_DOCS="doc/xwxapt.html"
-
-src_prepare() {
-	eapply_user
-	eapply -p0 "${FILESDIR}"/${P}-install.patch
-	# suppress -Weverything flag
-	sed -i -e "s/= -Weverything/= /" src/Makefile.am || die
-	# create missing mkinstalldir and prepare package
-	glib-gettextize --force --copy || die "gettextize failed"
-	eautoreconf
-}
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins xwxapt/xwxaptrc
-	doins xwxapt/xwxapt.glade
-	dodir /usr/share/${PN}/images /usr/share/${PN}/records
-}
-
-pkg_postinst() {
-	einfo "You must copy the /usr/share/xwxapt directory into your home directory"
-	einfo "and configure the contained xwxaptrc file before starting the program"
-	ewarn
-	ewarn "If you just upgraded from <=xwxapt-3 do not miss to check"
-	ewarn "for changes there"
-}
diff --git a/media-radio/xwxapt/xwxapt-3.1.ebuild b/media-radio/xwxapt/xwxapt-3.4.2.ebuild
index 16d6f5224ef3..3b6927d2f973 100644
--- a/media-radio/xwxapt/xwxapt-3.1.ebuild
+++ b/media-radio/xwxapt/xwxapt-3.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="GTK+ linux weather satellite APT image decoder software"
 HOMEPAGE="http://www.qsl.net/5b4az/pages/apt.html"
@@ -12,30 +12,30 @@ SRC_URI="http://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
-	net-wireless/rtl-sdr
-	media-libs/alsa-lib
 	dev-libs/glib:2
+	media-libs/alsa-lib
+	net-wireless/rtl-sdr
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-HTML_DOCS="doc/xwxapt.html"
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-fix-autotools.patch )
+HTML_DOCS=( doc/xwxapt.html )
 
 src_prepare() {
-	eapply_user
-	# suppress -Weverything flag
-	sed -i -e "s/= -Weverything/= /" src/Makefile.am || die
+	default
+
 	# create missing mkinstalldir and prepare package
-	glib-gettextize --force --copy || die "gettextize failed"
 	eautoreconf
 }
 
 src_install() {
 	default
+
 	insinto /usr/share/${PN}
 	doins xwxapt/xwxaptrc
 	doins xwxapt/xwxapt.glade
@@ -45,6 +45,7 @@ src_install() {
 pkg_postinst() {
 	einfo "You must copy the /usr/share/xwxapt directory into your home directory"
 	einfo "and configure the contained xwxaptrc file before starting the program"
+
 	ewarn
 	ewarn "If you just upgraded from <=xwxapt-3 do not miss to check"
 	ewarn "for changes there"