gentoo resync : 18.11.2018

5 files changed, 0 insertions, 139 deletions

diff --git a/dev-vcs/qgit/Manifest b/dev-vcs/qgit/Manifest
index 735683605b18..f8f9892f2e3a 100644
--- a/dev-vcs/qgit/Manifest
+++ b/dev-vcs/qgit/Manifest
@@ -1,8 +1,3 @@
-AUX qgit-2.7-highdpi-support.patch 1558 BLAKE2B 0dcf7aedacbb054bbb2868aeb69835c6b091d9a5c54e4937eb49fca5a7cc183fda22a9eb5ac1125ad2831c1ed59d1724090816be16f00b607671c2f1c66d88c2 SHA512 179e58795c6023b3f344ed7a5f03a36d38f0e1e364fe497608a2651f0c71e30cf56de934f48ac437c0cf0794b50e7673ae9199e231e533324c87d65706401817
-AUX qgit-2.7-qt-5.11.patch 590 BLAKE2B 42d45014c3f630d72509a79f598945b4ebc253d0c89f36fd09560b9e4aff5cd71863e68a9915a08dc0ccde98ab50de50a71b1576556d81f0ec276044486e4e8f SHA512 46360172f9d22927910f6f238c0963c6cf9c55909d53944583b2c1316484fce5c21f7f76797bd8a43a0bdb2885239dd1940b71e8a08800666ec9de436a100f48
-DIST qgit-2.7.tar.gz 259624 BLAKE2B 48c5b7bd7da6b037b4be103a7de32375128311200ab98956edb1ac269fd46d6f4ec93049d86ce92fa009999e87bb8df6706f44847f795d993c829ee9d117ce69 SHA512 024fd825aaec64301f0bcbe0ca1d02eb8da0d754d79d09075b1cd87a507d44c97092b824949f2637b37f0e71b36723cad6963cd00dcb2f7597832aba3a5ab842
 DIST qgit-2.8.tar.gz 260236 BLAKE2B eb6dfc83891a8598c31c4711dfcfca1952abfdd8d2e54ce295260674b63bb90ec84fc582f8b045342640e3aed1aab0f000ec89e47a9147e98d1274540a744b2e SHA512 9845064a3f0b2e48b7bb1cbe8f252eaa4e4174cfd2e270ba6c746f0200847ee4d3cdded7f9550849743781669bd7f6f1afe1e83a918b2863a915876b27a3e42a
-EBUILD qgit-2.7-r1.ebuild 605 BLAKE2B af3a5c65f6852b68af8cf99ecd36c49ef33cef461f0e0cd6447bcc68cbbb64857198d80589e1ae2a9576c7fbd4b0a077eff6abcc1da9902608174f90030fdb06 SHA512 6d85689071c4ea8550e7d8308b21ea6ddc449cb3f63628234361312caac0813af0cfefc5f87f4ab0a78e09f9a846f047d11069becc2192cca04d8a8ab63310d5
-EBUILD qgit-2.7.ebuild 514 BLAKE2B a87270e53ba783cf6c30a9d80a34988d15e9fe8f5ac988e31afe7aea94b645dad99e460ca4c97fe4b5e40398d3f226a3801d9c36fccc0eb263b2b5a542018c7a SHA512 333220a77d749fb3ee5f32a845acebf30a69247c7605237e8a5f27d21fc6ea9fe611f5ff5107f44c3585cc9fb540d5ee8d18f4a16b8ca87472a61f00669222a2
 EBUILD qgit-2.8.ebuild 497 BLAKE2B 172e0b528fb09725d91d583d7e448c1190a70c3520616bcdf16c42ed47d527ac6ba910a1457d4fc363245b944ee846abccdd7fe82c0a8f8c56b6a55fab3277c3 SHA512 4690a884bdd5b5abf605c1c76e242437b6477c9323ccfeda5c0c295959832b19dd251f0085027e28b3753b259bd48d8413de50c93b3d115b1ba5b098aa4a5154
 MISC metadata.xml 324 BLAKE2B 1046f76dc321a6155b49edb4972d9d353d47e4103a0356cc83f459faac05985e201daef4197420cadb19f50c37eb528b990c8d9d93537822fbf0698501b3fb5c SHA512 e4e0bbc60b8af9512584b93e60d29ac47a4150691ea46bb3281c6d99acf119d0c6717497286c324a9ccc91624bbd56211a513c1fd675ec89603d431b9b052248
diff --git a/dev-vcs/qgit/files/qgit-2.7-highdpi-support.patch b/dev-vcs/qgit/files/qgit-2.7-highdpi-support.patch
deleted file mode 100644
index 17f940aa23b7..000000000000
--- a/dev-vcs/qgit/files/qgit-2.7-highdpi-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e60ae49271e06384163afa1ebd1e562eb7c520ed Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 15 Feb 2018 17:39:22 +0000
-Subject: [PATCH] Add high DPI support
-
----
- src/listview.cpp | 11 ++++++++++-
- src/qgit.cpp     |  5 ++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/listview.cpp b/src/listview.cpp
-index dd6a8cb..e4f094e 100644
---- a/src/listview.cpp
-+++ b/src/listview.cpp
-@@ -884,7 +884,16 @@ void ListViewDelegate::addTextPixmap(QPixmap** pp, SCRef txt, const QStyleOption
-         int pw = fm.boundingRect(txt).width() + 2 * spacing;
-         int ph = fm.height();
- 
--	QPixmap* newPm = new QPixmap(ofs + pw, ph);
-+    QSize pixmapSize(ofs + pw, ph);
-+
-+#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
-+    qreal dpr = qApp->devicePixelRatio();
-+	QPixmap* newPm = new QPixmap(pixmapSize * dpr);
-+    newPm->setDevicePixelRatio(dpr);
-+#else
-+    QPixmap* newPm = new QPixmap(pixmapSize);
-+#endif
-+
- 	QPainter p;
- 	p.begin(newPm);
- 	if (!pm->isNull()) {
-diff --git a/src/qgit.cpp b/src/qgit.cpp
-index 266a7b8..b01c49e 100644
---- a/src/qgit.cpp
-+++ b/src/qgit.cpp
-@@ -18,7 +18,10 @@ using namespace QGit;
- int main(int argc, char* argv[]) {
- 
- 	QApplication app(argc, argv);
--	QCoreApplication::setOrganizationName(ORG_KEY);
-+#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
-+    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-+#endif
-+    QCoreApplication::setOrganizationName(ORG_KEY);
- 	QCoreApplication::setApplicationName(APP_KEY);
- 
- 	/* On Windows msysgit exec directory is set up
--- 
-2.15.1
-
diff --git a/dev-vcs/qgit/files/qgit-2.7-qt-5.11.patch b/dev-vcs/qgit/files/qgit-2.7-qt-5.11.patch
deleted file mode 100644
index a92e1e50f726..000000000000
--- a/dev-vcs/qgit/files/qgit-2.7-qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 563bc3ab3f928a3ba1c22e5e62ab8cbe15c6bc15 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 13:28:19 +0200
-Subject: [PATCH] Fix build with Qt 5.11 (missing header)
-
----
- src/patchview.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/patchview.cpp b/src/patchview.cpp
-index 5e3765d..afa796e 100644
---- a/src/patchview.cpp
-+++ b/src/patchview.cpp
-@@ -6,6 +6,7 @@
- 	Copyright: See COPYING file that comes with this distribution
- 
- */
-+#include <QButtonGroup>
- #include <QScrollBar>
- #include "common.h"
- #include "git.h"
--- 
-2.17.0
-
diff --git a/dev-vcs/qgit/qgit-2.7-r1.ebuild b/dev-vcs/qgit/qgit-2.7-r1.ebuild
deleted file mode 100644
index b7930738acae..000000000000
--- a/dev-vcs/qgit/qgit-2.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt GUI for git repositories"
-HOMEPAGE="http://libre.tibirna.org/projects/qgit/wiki/QGit"
-SRC_URI="https://github.com/tibirna/qgit/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-	!dev-vcs/qgit:2
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-highdpi-support.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
-)
diff --git a/dev-vcs/qgit/qgit-2.7.ebuild b/dev-vcs/qgit/qgit-2.7.ebuild
deleted file mode 100644
index 9ac66aa17552..000000000000
--- a/dev-vcs/qgit/qgit-2.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt GUI for git repositories"
-HOMEPAGE="http://libre.tibirna.org/projects/qgit/wiki/QGit"
-SRC_URI="https://github.com/tibirna/qgit/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-	!dev-vcs/qgit:2
-"
-
-S=${WORKDIR}/${PN}-${P}