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

[Johannes Huber]

commit:     fb3caa3de5568871c8b40a4bbccbd38dcf2f296e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 20:08:12 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 20:08:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3caa3d

media-gfx/scantailor: Remove 0.9.10

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/scantailor/Manifest                     |   1 -
 media-gfx/scantailor/files/scantailor-gcc46.patch | 121 ----------------------
 media-gfx/scantailor/scantailor-0.9.10.ebuild     |  50 ---------
 3 files changed, 172 deletions(-)

diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest
index 2cae743bb7..a45659523d 100644
--- a/media-gfx/scantailor/Manifest
+++ b/media-gfx/scantailor/Manifest
@@ -1,3 +1,2 @@
-DIST scantailor-0.9.10.tar.gz 1124348 SHA256 0b574eabfb65e4dcf3915d00ad3da31d464060458ffaeb49e4257e97301f93a0 SHA512 e2221a381c7c19ea2f7f5a791fec8ed3fd21e9065418e8cadb6ec34e95f9c9a4ec94effe6543087bb06b483c0cb08d40fd6cce63b065e91d97f756d1afa458b1 WHIRLPOOL 261ea78474fd644a407140dfb535d282d4413fbf79eba1b36ccf032b247f57d55560fc5c3a14db2f6fdbcb7351fba9aad64612950151422a88d77395d9ab03ee
 DIST scantailor-0.9.11.1-boost-join-moc.patch 53044 SHA256 c00772facafdb696bf0e36ba216050cf3ec5b45c15e0099e6ef4935bffa9ba00 SHA512 77c6ee7988834c8694f9c09182fcdf87bdba64f3e69c9cc9b8347c4980a56c484a4368643f1c608ebbaeb469d4d6bc8d1a62f95fce18bc41dfce68137a457a61 WHIRLPOOL 0e5b04a65a5c47deeea6b3ec192549e50b22825df506bda2b87fbc1aa0254993a33c7c7907af1520c7e0ae4264a9a00b9e92d6114b1aee664408c69bb9bdcf00
 DIST scantailor-0.9.11.1.tar.gz 1190198 SHA256 881647a4172c55a067a7b6687965441cf21176d79d93075b22a373ea9accd8d3 SHA512 cec327fd12144f7cee5043adfee3880c75fb147474e4c3b5166385f7a8f47cb5650ed2df930bbe1f4b8ac2c7229a887ecba1ca105b47b1023f5d3d7d7b54bdb4 WHIRLPOOL c064837bd4d5f4c3fbfa260493f3eccecff59910c934005148975f2f00511539ae0e66535d0a57bbf0458022c8ec249faa7f3df40ed8d89b2683530b885e4f6b

diff --git a/media-gfx/scantailor/files/scantailor-gcc46.patch b/media-gfx/scantailor/files/scantailor-gcc46.patch
deleted file mode 100644
index 8965ab478b..0000000000
--- a/media-gfx/scantailor/files/scantailor-gcc46.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a25036fbf37941e241da520fa7fab45e13c9c4a4 Mon Sep 17 00:00:00 2001
-From: Joseph Artsimovich <joseph.artsimovich@×××××.com>
-Date: Sat, 1 Oct 2011 19:37:10 +0100
-Subject: [PATCH] Fix build issues with certain version combinations of boost
- and gcc.
-
----
- ProjectWriter.cpp                      |    1 +
- compat/boost_multi_index_foreach_fix.h |   46 ++++++++++++++++++++++++++++++++
- zones/EditableZoneSet.h                |   18 ++++++++++++-
- 3 files changed, 64 insertions(+), 1 deletions(-)
- create mode 100644 compat/boost_multi_index_foreach_fix.h
-
-diff --git a/ProjectWriter.cpp b/ProjectWriter.cpp
-index e6e519b..44329d7 100644
---- a/ProjectWriter.cpp
-+++ b/ProjectWriter.cpp
-@@ -25,6 +25,7 @@
- #include "ImageMetadata.h"
- #include "AbstractFilter.h"
- #include "FileNameDisambiguator.h"
-+#include "compat/boost_multi_index_foreach_fix.h"
- #include <QtXml>
- #include <QFile>
- #include <QTextStream>
-diff --git a/compat/boost_multi_index_foreach_fix.h b/compat/boost_multi_index_foreach_fix.h
-new file mode 100644
-index 0000000..7800c79
---- /dev/null
-+++ b/compat/boost_multi_index_foreach_fix.h
-@@ -0,0 +1,46 @@
-+/*
-+    Scan Tailor - Interactive post-processing tool for scanned pages.
-+    Copyright (C)  Joseph Artsimovich <joseph.artsimovich@×××××.com>
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef BOOST_MULTI_INDEX_FOREACH_FIX_H_
-+#define BOOST_MULTI_INDEX_FOREACH_FIX_H_
-+
-+#include <boost/foreach.hpp>
-+#include <boost/mpl/bool.hpp>
-+#include <boost/multi_index/sequenced_index.hpp>
-+
-+// BOOST_FOREACH() in boost >= 1.47 has problems with gcc >= 4.6
-+// These problems aren't specific to boost::multi_index,
-+// but the code below only deals with it.
-+// In future versions of boost, they might include equivalent
-+// code in boost::multi_index itself, which will lead to build problems.
-+// If / when this happens, conditional compilation will be necessary.
-+
-+namespace boost 
-+{
-+namespace foreach
-+{
-+
-+template<typename SuperMeta, typename TagList>
-+struct is_noncopyable<boost::multi_index::detail::sequenced_index<SuperMeta, TagList> > : mpl::true_
-+{
-+};
-+
-+} // namespace foreach
-+} // namespace boost
-+
-+#endif
-diff --git a/zones/EditableZoneSet.h b/zones/EditableZoneSet.h
-index 153693d..4ecfd0d 100644
---- a/zones/EditableZoneSet.h
-+++ b/zones/EditableZoneSet.h
-@@ -1,7 +1,7 @@
- /*
- 
- 	Scan Tailor - Interactive post-processing tool for scanned pages.
--	Copyright (C) 2007-2009  Joseph Artsimovich <joseph_a@××××.ru>
-+	Copyright (C)  Joseph Artsimovich <joseph.artsimovich@×××××.com>
- 
- 	This program is free software: you can redistribute it and/or modify
- 	it under the terms of the GNU General Public License as published by
-@@ -24,6 +24,8 @@
- #include "PropertySet.h"
- #include "IntrusivePtr.h"
- #include <QObject>
-+#include <boost/mpl/bool.hpp>
-+#include <boost/foreach.hpp>
- #include <boost/iterator/iterator_facade.hpp>
- #include <map>
- 
-@@ -102,4 +104,18 @@ private:
- 	PropertySet m_defaultProps;
- };
- 
-+namespace boost
-+{
-+namespace foreach
-+{
-+
-+// Make BOOST_FOREACH work with the above class (necessary for boost >= 1.46 with gcc >= 4.6)
-+template<>
-+struct is_noncopyable<EditableZoneSet> : public boost::mpl::true_
-+{
-+};
-+
-+} // namespace foreach
-+} // namespace boost
-+
- #endif
--- 
-1.7.8.rc4
-

diff --git a/media-gfx/scantailor/scantailor-0.9.10.ebuild b/media-gfx/scantailor/scantailor-0.9.10.ebuild
deleted file mode 100644
index 62ff3ecc8c..0000000000
--- a/media-gfx/scantailor/scantailor-0.9.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils eutils virtualx
-
-DESCRIPTION="A interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-RDEPEND=">=media-libs/libpng-1.2.43
-	>=media-libs/tiff-3.9.4
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libXrender
-	dev-qt/qtgui:4
-	opengl? ( dev-qt/qtopengl:4 )"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-environment_flags.patch
-	"${FILESDIR}"/${PN}-gcc46.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable opengl)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	Xemake test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon resources/appicon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Scan Tailor"
-}