[gentoo-commits] repo/gentoo:master commit in: x11-misc/bbweather/, x11-misc/bbweather/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/bbweather/, x11-misc/bbweather/files/

[Andreas Sturmlechner]

commit:     237dda550d1310aaeafc27f98d48b618460625a8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jun 22 14:02:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 07:52:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237dda55

x11-misc/bbweather: EAPI7, improve ebuild

 x11-misc/bbweather/bbweather-0.6.3-r2.ebuild      | 46 +++++++++++++++++++++++
 x11-misc/bbweather/files/bbweather-asneeded.patch |  8 ++--
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild
new file mode 100644
index 00000000000..1de14db362e
--- /dev/null
+++ b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="blackbox weather monitor"
+HOMEPAGE="https://www.netmeister.org/apps/bbweather/"
+SRC_URI="https://www.netmeister.org/apps/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	net-misc/wget
+	x11-apps/xmessage
+	!<=x11-plugins/gkrellweather-2.0.7-r1"
+
+PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch )
+
+src_prepare() {
+	default
+	gunzip doc/*.gz || die
+	sed -i \
+		-e "s:man_DATA:man1_MANS:;s:.gz::g;/^mandir/d" \
+		doc/Makefile.am || die
+	sed -i \
+		-e 's|-helvetica-|-*-|g' \
+		resource.cpp data/${PN}.{nobb,style} || die
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	dodoc README AUTHORS ChangeLog NEWS TODO data/README.bbweather
+
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+		"${D}"/usr/share/doc/${PF}/bbtoolsrc.example || die
+}

diff --git a/x11-misc/bbweather/files/bbweather-asneeded.patch b/x11-misc/bbweather/files/bbweather-asneeded.patch
index 593e471641c..001ac112720 100644
--- a/x11-misc/bbweather/files/bbweather-asneeded.patch
+++ b/x11-misc/bbweather/files/bbweather-asneeded.patch
@@ -2,8 +2,8 @@ Fixing build with as-needed
 
 https://bugs.gentoo.org/248556
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -56,15 +56,10 @@
  AC_PATH_X
  AC_PATH_XTRA
@@ -22,8 +22,8 @@ https://bugs.gentoo.org/248556
  
  dnl Checks for header files.
  AC_HEADER_STDC
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,5 +1,4 @@
 -CPPFLAGS =	@CPPFLAGS@ \
 -		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \