[gentoo-commits] repo/gentoo:master commit in: media-gfx/scantailor-advanced/, media-gfx/scantailor-advanced/files/

[Andreas Sturmlechner]

commit:     62258a84ab78a668a3b5d6f96af4e77957fc8032
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 23:23:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 30 23:45:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62258a84

media-gfx/scantailor-advanced: Drop 1.0.14 and 1.0.16 (r0)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/scantailor-advanced/Manifest             |   1 -
 .../files/scantailor-advanced-1.0.14-qt-5.11.patch | 182 ---------------------
 .../scantailor-advanced-1.0.14.ebuild              |  48 ------
 .../scantailor-advanced-1.0.16.ebuild              |  48 ------
 4 files changed, 279 deletions(-)

diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest
index 7637dbe5e66..d232d4b589e 100644
--- a/media-gfx/scantailor-advanced/Manifest
+++ b/media-gfx/scantailor-advanced/Manifest
@@ -1,2 +1 @@
-DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7
 DIST scantailor-advanced-1.0.16.tar.gz 2792788 BLAKE2B d695f9e62bc83569a320f81d2aee5f77064b791f8d59208ca55b0f4a5f25350552a673adce23ab03b92d893bd57815eb6990c91a33c12cd3652c54998d15e29c SHA512 76f103afa44f5fa03f218d237dfe4565abe1d84937ec2ea5e64662c62d073e93d7b25f1e4f66dcfe13ad36bb08abd081b5d52c092f2f54f12f0bc6cdb4340e85

diff --git a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
deleted file mode 100644
index 6443809c102..00000000000
--- a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 64a151a3795013f58880d2a5f4ce4688ecb88838 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-Date: Tue, 10 Apr 2018 11:58:00 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- DefaultParamsDialog.h                  | 9 ++++++---
- ErrorWidget.cpp                        | 3 +++
- filters/deskew/ApplyDialog.h           | 3 +++
- filters/fix_orientation/ApplyDialog.h  | 3 +++
- filters/output/ApplyColorsDialog.h     | 3 +++
- filters/output/ChangeDewarpingDialog.h | 3 +++
- filters/output/ChangeDpiDialog.h       | 3 +++
- filters/page_layout/ApplyDialog.h      | 3 +++
- filters/page_split/SplitModeDialog.h   | 3 +++
- filters/select_content/ApplyDialog.h   | 3 +++
- 10 files changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/DefaultParamsDialog.h b/DefaultParamsDialog.h
-index d9ec86e..043446c 100644
---- a/DefaultParamsDialog.h
-+++ b/DefaultParamsDialog.h
-@@ -2,14 +2,17 @@
- #ifndef SCANTAILOR_DEFAULTPARAMSDIALOG_H
- #define SCANTAILOR_DEFAULTPARAMSDIALOG_H
- 
--#include <QtWidgets/QWidget>
--#include <unordered_map>
--#include <set>
- #include "ui_DefaultParamsDialog.h"
- #include "OrthogonalRotation.h"
- #include "DefaultParamsProfileManager.h"
- #include "DefaultParams.h"
- 
-+#include <QButtonGroup>
-+#include <QWidget>
-+
-+#include <unordered_map>
-+#include <set>
-+
- class DefaultParamsDialog : public QDialog, private Ui::DefaultParamsDialog {
-     Q_OBJECT
- private:
-diff --git a/ErrorWidget.cpp b/ErrorWidget.cpp
-index fb76cc4..6fb4c68 100644
---- a/ErrorWidget.cpp
-+++ b/ErrorWidget.cpp
-@@ -18,6 +18,9 @@
- 
- #include "ErrorWidget.h"
- 
-+#include <QIcon>
-+#include <QStyle>
-+
- ErrorWidget::ErrorWidget(const QString& text, Qt::TextFormat fmt) {
-     setupUi(this);
-     textLabel->setTextFormat(fmt);
-diff --git a/filters/deskew/ApplyDialog.h b/filters/deskew/ApplyDialog.h
-index bf1a055..69f18e1 100644
---- a/filters/deskew/ApplyDialog.h
-+++ b/filters/deskew/ApplyDialog.h
-@@ -22,7 +22,10 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class QButtonGroup;
-diff --git a/filters/fix_orientation/ApplyDialog.h b/filters/fix_orientation/ApplyDialog.h
-index dcd25d5..e46d30d 100644
---- a/filters/fix_orientation/ApplyDialog.h
-+++ b/filters/fix_orientation/ApplyDialog.h
-@@ -24,7 +24,10 @@
- #include "PageRange.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <vector>
- #include <set>
- 
-diff --git a/filters/output/ApplyColorsDialog.h b/filters/output/ApplyColorsDialog.h
-index 4c525c7..81f4177 100644
---- a/filters/output/ApplyColorsDialog.h
-+++ b/filters/output/ApplyColorsDialog.h
-@@ -23,7 +23,10 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/output/ChangeDewarpingDialog.h b/filters/output/ChangeDewarpingDialog.h
-index de4f2c3..31ee19d 100644
---- a/filters/output/ChangeDewarpingDialog.h
-+++ b/filters/output/ChangeDewarpingDialog.h
-@@ -24,8 +24,11 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
- #include <QString>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/output/ChangeDpiDialog.h b/filters/output/ChangeDpiDialog.h
-index 7ce6f58..1b86ac7 100644
---- a/filters/output/ChangeDpiDialog.h
-+++ b/filters/output/ChangeDpiDialog.h
-@@ -23,8 +23,11 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
- #include <QString>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/page_layout/ApplyDialog.h b/filters/page_layout/ApplyDialog.h
-index ba25154..07f83c3 100644
---- a/filters/page_layout/ApplyDialog.h
-+++ b/filters/page_layout/ApplyDialog.h
-@@ -24,7 +24,10 @@
- #include "PageRange.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class PageSelectionAccessor;
-diff --git a/filters/page_split/SplitModeDialog.h b/filters/page_split/SplitModeDialog.h
-index 2cf9e91..351f1e2 100644
---- a/filters/page_split/SplitModeDialog.h
-+++ b/filters/page_split/SplitModeDialog.h
-@@ -25,7 +25,10 @@
- #include "PageId.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <set>
- 
- class ProjectPages;
-diff --git a/filters/select_content/ApplyDialog.h b/filters/select_content/ApplyDialog.h
-index f0f7041..a7ff19e 100644
---- a/filters/select_content/ApplyDialog.h
-+++ b/filters/select_content/ApplyDialog.h
-@@ -24,7 +24,10 @@
- #include "PageRange.h"
- #include "PageSequence.h"
- #include "intrusive_ptr.h"
-+
-+#include <QButtonGroup>
- #include <QDialog>
-+
- #include <vector>
- #include <set>
- 
--- 
-2.17.0
-

diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
deleted file mode 100644
index 902fbb1a391..00000000000
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop virtualx
-
-DESCRIPTION="Interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
-SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libXrender
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-qt/linguist-tools:5
-	!media-gfx/scantailor
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon resources/appicon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Scan Tailor Advanced"
-}

diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
deleted file mode 100644
index be247dca96b..00000000000
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop virtualx
-
-DESCRIPTION="Interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
-SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libXrender
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-qt/linguist-tools:5
-	!media-gfx/scantailor
-"
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon resources/appicon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Scan Tailor Advanced"
-}