From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1149459-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BB733138350
for <garchives@archives.gentoo.org>; Mon, 2 Mar 2020 13:05:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E6EF3E0891;
Mon, 2 Mar 2020 13:05:25 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B9274E0891
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Mar 2020 13:05:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 69CE834F3AF
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Mar 2020 13:05:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BE649157
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Mar 2020 13:05:21 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1583154291.4ef3cc03d4e89dd8485970548ebf05924d7b995d.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/kdevelop-pg-qt/Manifest dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
X-VCS-Directories: dev-util/kdevelop-pg-qt/ dev-util/kdevelop-pg-qt/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 4ef3cc03d4e89dd8485970548ebf05924d7b995d
X-VCS-Branch: master
Date: Mon, 2 Mar 2020 13:05:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dc45f640-e5bc-46e3-bc52-74739fb6d37d
X-Archives-Hash: dbd1b5d72fec3e061b3256a24dd0634c
commit: 4ef3cc03d4e89dd8485970548ebf05924d7b995d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 2 13:04:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 2 13:04:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef3cc03
dev-util/kdevelop-pg-qt: Drop 2.2.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/kdevelop-pg-qt/Manifest | 1 -
.../files/kdevelop-pg-qt-2.2.0-qt-5.14.patch | 60 ----------------------
.../kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild | 26 ----------
3 files changed, 87 deletions(-)
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 15735a52751..204afab54f4 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4
DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch
deleted file mode 100644
index 5a4dec36d88..00000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d05d0b19e9d6f47fee3e11d837c2c21125589763 Mon Sep 17 00:00:00 2001
-From: Alexey Min <alexey.min@gmail.com>
-Date: Thu, 24 Oct 2019 14:34:45 +0300
-Subject: Fix build with Qt 5.14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Summary:
-Trying to build kdevelop-pg-qt with Qt 5.14 results in an error:
-```
-.../kdev-pg/kdev-pg-regexp.cpp:44:23: error: redefinition of ‘struct std::hash<QBitArray>’
- template<> struct hash< type > \
- ^~~~~~~~~~~~
-.../kdev-pg/kdev-pg-regexp.cpp:53:1: note: in expansion of macro ‘q_Hash_to_tr1_hash’
- q_Hash_to_tr1_hash(QBitArray)
- ^~~~~~~~~~~~~~~~~~
-In file included from .../prefix514/include/QtCore/qvector.h:47:0,
- from .../prefix514/include/QtCore/QVector:1,
- from .../kdevelop-pg-qt/include/kdev-pg-char-sets.h:36,
- from .../kdevelop-pg-qt/kdev-pg/kdev-pg-regexp.cpp:20:
-.../prefix514/include/QtCore/qhashfunctions.h:209:1: note: previous definition of ‘struct std::hash<QBitArray>’
- QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray)
- ^
-```
-
-std::hash<QBitArray> is already specialized in Qt 5.14, so avoid redefinition with conditional compilation
-
-Test Plan: try to build with Qt 5.14
-
-Reviewers: apol
-
-Reviewed By: apol
-
-Subscribers: kdevelop-devel
-
-Tags: #kdevelop
-
-Differential Revision: https://phabricator.kde.org/D24914
----
- kdev-pg/kdev-pg-regexp.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp
-index 8cc0b95..9fee81c 100644
---- a/kdev-pg/kdev-pg-regexp.cpp
-+++ b/kdev-pg/kdev-pg-regexp.cpp
-@@ -50,7 +50,10 @@ namespace std \
- }; \
- }
-
-+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-+// Qt >= 5.14 already has std::hash for QBitArray
- q_Hash_to_tr1_hash(QBitArray)
-+#endif
-
- namespace KDevPG
- {
---
-cgit v1.1
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
deleted file mode 100644
index 7aea0fc71f7..00000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="5"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
-"