gentoo (leap year) resync : 29.02.2020

4 files changed, 208 insertions, 14 deletions

diff --git a/app-misc/brewtarget/Manifest b/app-misc/brewtarget/Manifest
index ebce77bd9185..73341b62455f 100644
--- a/app-misc/brewtarget/Manifest
+++ b/app-misc/brewtarget/Manifest
@@ -1,3 +1,5 @@
+AUX brewtarget-2.3.1-no-compress-docs.patch 907 BLAKE2B a499cb28522e16199e42fa72421f17bb676116d6ae96b26a456f2b3a0f1baa343d782e4a51f88b6b37b50ac8be26909dbdd64ad8243a284d1be65cd8da995be7 SHA512 4c746583fa5e5e37e1a03b657115dd992aa44f8cffcf181e79c1321abd782d557906dbb5f5d2c9fbdee13c823597cf3403ea42e3fb5317922f97c925a0909ccf
+AUX brewtarget-2.3.1-no-qtwebkit.patch 4904 BLAKE2B f3040fa2a08467154a7e664107eb957775b75e3ecfb5c62476c068f95c5f773226ebad9e9afcb9b793066aeb1f98c2511c0c627ac92573896840718bf70cc063 SHA512 eb476d7558f35448e77019dd66e966b652b04f5acca370e45638ed78ba9ff374fd69e498e294cc843d2e8d264469dc891d8f8bac7aeb20792bd0e513542540d4
 DIST brewtarget_2.3.1.orig.tar.xz 9449200 BLAKE2B 00eda709c6665b2353380d013d55a59068d79f70368e843296f43d2f947c741ed526d4f6820f18c4d5e96866274bce76b2235cc50595882f58f397f651858bf3 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086
-EBUILD brewtarget-2.3.1.ebuild 1246 BLAKE2B 401e5003db8a39362ea5206563236c45addadfa5922571dd3d0a74bc7e8ca8b62a48ad74d6b63ae7a8a4f56235e100132c36014ad5f86c7f431fbe1f680852dc SHA512 b6409e126ed6e94d0511f08749c56e5a4e774ddacdc6ccf64ca5ce68c27502a5a8b6eb37118301bec44396664b2754d2e76c072879623d2f675d2cc12e0bcc30
+EBUILD brewtarget-2.3.1-r1.ebuild 1347 BLAKE2B 4af5828ad8d0f8c10dc03ac1ec1dfc9635224b3b1820452f105c97de260d993fbb2c3741337f20745b21e44177bb26be516f1855cd288d0b6353d689965b9d58 SHA512 3f12d16ee2c379b0700ed7a3466d4567446ad6eb7a00fe1b7755a33d3a4c314ba729e5802ea9eb6ab7107c238fc85d0e73ec77bced8f3479c017a1ceb8a9fe3f
 MISC metadata.xml 333 BLAKE2B 610f70294511d47c0df2cbd259fbe558b6f90350f619984e732bc1d3b3977c22fff55ab110da945164baa76ccc4c39bcbf347e29fea175ce3f390c41f4fbc86e SHA512 e51f8f143455d51148898350c95b321226c7bd931a585234bce000cf1b2f2762b465f2af764288cc4ddde13abf825f8571e4a6ed7f9e73fbb315030d51cb45aa
diff --git a/app-misc/brewtarget/brewtarget-2.3.1.ebuild b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
index 320d5b9daa7c..03780974f84b 100644
--- a/app-misc/brewtarget/brewtarget-2.3.1.ebuild
+++ b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
+EAPI=7
 
-inherit cmake-utils l10n
+PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
+inherit cmake l10n
 
 DESCRIPTION="Application to create and manage beer recipes"
 HOMEPAGE="http://www.brewtarget.org/"
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
@@ -24,33 +27,36 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-qtwebkit.patch"
+	"${FILESDIR}/${P}-no-compress-docs.patch"
+)
 
 remove_locale() {
 	sed -i -e "/bt_${1}\.ts/d" CMakeLists.txt || die
 }
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/translations" bt_ .ts
+	cmake_src_prepare
+
+	l10n_find_plocales_changes translations bt_ .ts
 	l10n_for_each_disabled_locale_do remove_locale
 
 	# Tests are bogus, don't build them
 	sed -i -e '/Qt5Test/d' CMakeLists.txt || die
 	sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
 		-DDO_RELEASE_BUILD=ON
 		-DNO_MESSING_WITH_FLAGS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
new file mode 100644
index 000000000000..f437a72e5917
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2020-02-17 02:07:48.201051509 +0100
++++ b/CMakeLists.txt	2020-02-17 02:10:26.790061722 +0100
+@@ -176,18 +176,7 @@
+ ENDIF()
+ 
+ #=========================Changelog custom target==============================
+-FIND_PROGRAM( GZIP_CMD gzip )
+-IF( GZIP_CMD )
+-   SET( CHANGELOG_UNCOMPRESSED "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
+-   SET( CHANGELOG "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
+-   ADD_CUSTOM_COMMAND(
+-      OUTPUT ${CHANGELOG}
+-      COMMAND ${GZIP_CMD} -9 -n -c ${CHANGELOG_UNCOMPRESSED} > ${CHANGELOG}
+-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-      MAIN_DEPENDENCY ${CHANGELOG_UNCOMPRESSED}
+-   )
+-   ADD_CUSTOM_TARGET(changelog ALL DEPENDS ${CHANGELOG})
+-ENDIF()
++SET( CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
+ 
+ #=========================Detect Debian======================================== 
+ IF( EXISTS "/etc/debian_version" )
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
new file mode 100644
index 000000000000..ec149c8f4108
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
@@ -0,0 +1,164 @@
+From 761bb3882c4c243a49279b67e53c87e5e5d2928f Mon Sep 17 00:00:00 2001
+From: Mik Firestone <mikfire@gmail.com>
+Date: Sat, 19 Mar 2016 23:01:54 -0400
+Subject: [PATCH 1/2] Closes #127 - TravisCI can't find webkit
+
+Qt 5.6 did away with the web kit, but none of our build environment have the
+replacement yet. This patch replaces all the WebDocs with TextBrowser, which
+seems to work and should compile.
+
+I removed the webkit requirement from the CMakeLists file, but I wasn't sure
+if the webkitwidgets needed axed as well. Although writing it out makes the
+answer somewhat obvious.
+---
+ src/BrewDayScrollWidget.cpp | 2 +-
+ src/BrewDayScrollWidget.h   | 4 ++--
+ src/BrewDayWidget.cpp       | 4 ++--
+ src/BrewDayWidget.h         | 4 ++--
+ src/CMakeLists.txt          | 2 --
+ src/RecipeFormatter.cpp     | 2 +-
+ src/RecipeFormatter.h       | 4 ++--
+ 7 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp
+index 760d2dc5..0846d791 100644
+--- a/src/BrewDayScrollWidget.cpp
++++ b/src/BrewDayScrollWidget.cpp
+@@ -35,7 +35,7 @@
+ #include "mash.h"
+ 
+ BrewDayScrollWidget::BrewDayScrollWidget(QWidget* parent)
+-   : QWidget(parent), doc(new QWebView())
++   : QWidget(parent), doc(new QTextBrowser())
+ {
+    setupUi(this);
+    setObjectName("BrewDayScrollWidget");
+--- a/src/BrewDayScrollWidget.h
++++ b/src/BrewDayScrollWidget.h
+@@ -27,7 +27,7 @@ class BrewDayScrollWidget;
+ #include "ui_brewDayScrollWidget.h"
+ #include <QWidget>
+ #include <QSize>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QPrinter>
+ #include <QPrintDialog>
+ #include <QFile>
+@@ -90,7 +90,7 @@ private slots:
+    
+    Recipe* recObs;
+    QPrinter* printer;
+-   QWebView* doc;
++   QTextBrowser* doc;
+    //! Internal list of recipe instructions, always sorted by instruction number.
+    QList<Instruction*> recIns;
+ 
+--- a/src/BrewDayWidget.cpp
++++ b/src/BrewDayWidget.cpp
+@@ -37,7 +37,7 @@
+ 
+ // NOTE: QPrinter has no parent? Will it get destroyed properly?
+ BrewDayWidget::BrewDayWidget(QWidget* parent) :
+-   QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QWebView(this))
++   QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QTextBrowser(this))
+ {
+    setupUi(this);
+ 
+@@ -291,7 +291,7 @@ void BrewDayWidget::pushInstructionPrint()
+    QString pDoc;
+    QPrintDialog *dialog = new QPrintDialog(printer, this);
+ 
+-   /* Instantiate the Webview and then connect its signal */
++   /* Instantiate the TextBrowser and then connect its signal */
+    connect( doc, SIGNAL(loadFinished(bool)), this, SLOT(loadComplete(bool)) );
+ 
+    dialog->setWindowTitle(tr("Print Document"));
+--- a/src/BrewDayWidget.h
++++ b/src/BrewDayWidget.h
+@@ -27,7 +27,7 @@ class BrewDayWidget;
+ #include "ui_brewDayWidget.h"
+ #include <QWidget>
+ #include <QSize>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QMetaProperty>
+ #include <QVariant>
+ 
+@@ -70,7 +70,7 @@ public slots:
+    
+    Recipe* recObs;
+    QPrinter* printer;
+-   QWebView* doc;
++   QTextBrowser* doc;
+ 
+    QString cssName;
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -424,7 +424,5 @@ SET( QT5_USE_MODULES_LIST
+    Sql
+    Svg
+    Xml
+-   WebKit
+-   WebKitWidgets
+    )
+ 
+diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp
+index bb6a9295..f8a1ab4c 100644
+--- a/src/RecipeFormatter.cpp
++++ b/src/RecipeFormatter.cpp
+@@ -52,7 +52,7 @@ RecipeFormatter::RecipeFormatter(QObject* parent)
+    docDialog->setWindowTitle("Print Preview");
+    if( docDialog->layout() == 0 )
+       docDialog->setLayout(new QVBoxLayout(docDialog));
+-   doc = new QWebView(docDialog);
++   doc = new QTextBrowser(docDialog);
+    docDialog->layout()->addWidget(doc);
+    /*
+    // Add a print button at the bottom.
+--- a/src/RecipeFormatter.h
++++ b/src/RecipeFormatter.h
+@@ -28,7 +28,7 @@ class RecipeFormatter;
+ #include <QObject>
+ #include <QPrinter>
+ #include <QPrintDialog>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QDialog>
+ #include <QFile>
+ #include "recipe.h"
+@@ -114,7 +114,7 @@ public slots:
+    Recipe* rec;
+ 
+    QPrinter* printer;
+-   QWebView* doc;
++   QTextBrowser* doc;
+    QDialog* docDialog;
+    QString cssName;
+ 
+
+From 3e0223a3b95c0e1169115cd14d0ede7f17c4f30f Mon Sep 17 00:00:00 2001
+From: Mik Firestone <mikfire@gmail.com>
+Date: Sat, 19 Mar 2016 23:09:41 -0400
+Subject: [PATCH 2/2] Missed a few edits.
+
+Missed some entries in the CMakeList files.
+---
+ CMakeLists.txt     | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,12 +153,6 @@ INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
+ FIND_PACKAGE(Qt5Svg REQUIRED)
+ INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS})
+ 
+-FIND_PACKAGE(Qt5WebKit REQUIRED)
+-INCLUDE_DIRECTORIES(${Qt5WebKit_INCLUDE_DIRS})
+-
+-FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
+-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
+-
+ FIND_PACKAGE(Qt5Xml REQUIRED)
+ INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
+