gentoo resync : 14.07.2018

4 files changed, 56 insertions, 9 deletions

diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
index ec5e8da43c0d..ffee4150fa7a 100644
--- a/x11-misc/bbweather/Manifest
+++ b/x11-misc/bbweather/Manifest
@@ -1,4 +1,5 @@
-AUX bbweather-asneeded.patch 1099 BLAKE2B 491bce274c38df908a2737ee4cf0507ea7060ebdae748e8fde759ad9e8a29cc70157ddaf7c62eddf2dc70e6b6b7d220eebd691b381d4de62ee4139a06768afa4 SHA512 3e96d0210053de4a321a28064824dbd69635e6fffa72c2c335c8b1f66c8c0de9e2700f183e74803011036c285fcc43ff8b01ed156d21f36c0165874fc8f96287
+AUX bbweather-asneeded.patch 1107 BLAKE2B ce0f6ec1dc6cb740c37b200dbb92af8e5c9f0219010d7c2b0da1f189089e9e2cd250aeb0bc86b2cecdc7dd386366f0f978f926de3cb3d5a5ff27b2d61e8b01cb SHA512 872b6bfe7020ecef20eb9180535561f3ac6d2d8f1db67cd3ff82bbf3e1a4abbb27ed864dd88af88fa32ec73850a7d0a599ed29e3cf430499c5924288936efc8c
 DIST bbweather-0.6.3.tar.bz2 80631 BLAKE2B e95913c0a95043ca9620beb470d2684540bac95f010e6f75256a1f8758bdd359f303a1117680cd256a25fdac06b24bb4d47707568c4f19a67b3cc9f3c0a5ef7e SHA512 e5bd4febf119c0f81a64fb5ff4cf3b526a84e8fd26005ff04c6297f9b50963d2d710227469f9a1cf2d1c51f3524a2bce544a07c70ca4e5beff64c954768468a6
-EBUILD bbweather-0.6.3-r1.ebuild 1098 BLAKE2B aadecf6847d0b5c40c48e2c3446fdd5cf06c03f19fdd90b5214c2acf0d202ab4dec5171beec3ca1cd48944e1c45d59c23d0a24d1ea68851c7f76944be71dc93a SHA512 27287cbca8b2fe676e2c3f7449de243d8a6644971652baa632c90142f2b7362e3aa598e144d8794f19a17c97eba7d568e53038d5c9aa5fb550ab6ff8e37e3e30
+EBUILD bbweather-0.6.3-r1.ebuild 1100 BLAKE2B e92f93ed982542ab3a3b34760d969cd965290f878602334ce4d179842f63ecd844fc5f009a85df8474867f8ef1060740e60bd3fb10bb517b3ca5c2e72131461e SHA512 e59d69eaa41dd263a9a68810ad53667af88fc2cb7e3af1d8d4c773714dd72d3ea9800bcd79787bc55f1a3ef72eb6cc4c7ad271e192f7bd5bde162f84c6acb890
+EBUILD bbweather-0.6.3-r2.ebuild 1101 BLAKE2B 4096210f8c61c383c4ed6d095a52a3276391cc450ad2c13681edcd31b6526afceedf255a03b65977b4c69ea19a2c662cec0f63afb8f85d22b28d8d7ac8ba6929 SHA512 aac8d1e99158a61414bc63597e4f9f6c720c3b2cde5440eee8715954a8e36a42477b4c2320087d5d371e0ef123f8cf920b292c58d2c09e4f7e2fbae4f3394401
 MISC metadata.xml 235 BLAKE2B 98da1c6c200d6499159312f849450787965bb58e754b40a6ab0d91ad58b03962d995be60011407372bf089ffa12a8c79c753e62b07680bb52a0ab3868f0d0498 SHA512 f520eb76104c5ac22c816c755cc7772547ba7030326fef24077090c8d01f602839df77838373247f5f8ce5f94b6043c2a5f6a629991f265d802db39352765063
diff --git a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
index bf4468aec901..9bca5ba8d11f 100644
--- a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
+++ b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -6,8 +6,8 @@ EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="blackbox weather monitor"
-HOMEPAGE="http://www.netmeister.org/apps/bbweather/"
-SRC_URI="http://www.netmeister.org/apps/${P}.tar.bz2"
+HOMEPAGE="https://www.netmeister.org/apps/bbweather/"
+SRC_URI="https://www.netmeister.org/apps/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
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 000000000000..1de14db362e4
--- /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 593e471641c8..001ac112720f 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\" \