From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 298DD158018 for ; Sun, 3 Oct 2021 20:50:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34ADDE0824; Sun, 3 Oct 2021 20:50:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F3C0E0824 for ; Sun, 3 Oct 2021 20:50:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE7FA342F59 for ; Sun, 3 Oct 2021 20:50:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4028EEE for ; Sun, 3 Oct 2021 20:50:37 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1633293581.eed9956e8208611964ff7d3e1bc4a1f0c994f1f3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kdiff3/Manifest kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch kde-misc/kdiff3/kdiff3-1.9.2.ebuild X-VCS-Directories: kde-misc/kdiff3/ kde-misc/kdiff3/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: eed9956e8208611964ff7d3e1bc4a1f0c994f1f3 X-VCS-Branch: master Date: Sun, 3 Oct 2021 20:50:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1c0b6321-46b9-4794-8d13-93163ae1d93b X-Archives-Hash: 9b3d5b6d37ffac385d19e9587870d57a commit: eed9956e8208611964ff7d3e1bc4a1f0c994f1f3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 3 20:39:41 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 3 20:39:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed9956e kde-misc/kdiff3: Drop 1.9.2 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/kdiff3/Manifest | 1 - kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch | 24 -------------- kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 43 -------------------------- 3 files changed, 68 deletions(-) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 0aa8008f32f..a68ab0203c4 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1 @@ -DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511 SHA512 3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8 DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964 SHA512 9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5 diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch deleted file mode 100644 index 581b487503e..00000000000 --- a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= -Date: Tue, 4 May 2021 19:21:46 +0200 -Subject: [PATCH] Explicitly include for compatibility with gcc-11 - ---- - src/TypeUtils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/TypeUtils.h b/src/TypeUtils.h -index c072681..f0ab9c2 100644 ---- a/src/TypeUtils.h -+++ b/src/TypeUtils.h -@@ -9,6 +9,7 @@ - - #include - #include -+#include - - #include - --- -GitLab - diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild deleted file mode 100644 index 82515f73d04..00000000000 --- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -KFMIN=5.74.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - sys-apps/diffutils -" - -PATCHES=( "${FILESDIR}/${PN}-1.9.0-gcc11.patch" ) # bug 788058, git master