[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 785f19b11e580bd63c908142e241c03fee15673e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 20 21:02:48 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 20 21:03:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785f19b1

kde-misc/kdiff3: add 1.11.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.11.1.ebuild | 47 
 2 files changed, 48 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index afc177001b3a..4e4d72b1f0e6 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.10.7.tar.xz 1131116 BLAKE2B 
5aff7d24d3440b367e0d124e7db444fb1164e1e23a39cc808b83d9f872e11c78442f73e5b95199ed00ace30cf5e4d15adbba0c9d46fe79bc2f5eae693e0aa93d
 SHA512 
ab7ce8312014de200bcc613be1a28b384289f96be08d7f2e1e640b202cede3bbfeffa7b3e53b605f8edf9be2368d2aa6c6b5ee4501577ed8560ca1c4704802db
+DIST kdiff3-1.11.1.tar.xz 1140680 BLAKE2B 
4a3e2f3300a4d8ebe390e3e7ad6392b26cdac919bfa80d2b24e145536a763cca924c8a811826972a92215da7c297662b805c60ce0ee5a57816a3549c059a8353
 SHA512 
5f481a3cd67e80db939eb795618a635bda2c08875eb826c3a1b6487b631374c48ab9b8a546d9b9504c1bcbc0ed9072f16452d6ef9fe181ce6850f741ced710ce

diff --git a/kde-misc/kdiff3/kdiff3-1.11.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.11.1.ebuild
new file mode 100644
index ..bd4a4224533a
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.11.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+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/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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   # TODO: -DENABLE_GDBINDEX?
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: 3ba93a07841a54d8b2b9a0258aefae83bfc3c8c0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 08:17:48 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 08:17:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba93a07

kde-misc/kdiff3: Stabilize 1.10.7 x86, #921832

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.7.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
index a2afa7d7ac2b..ac3ba233ccfb 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: 8f0e01e1e5b4d337f3bd8c5d2ce2c1957c6cb4c5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 08:17:47 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 08:17:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0e01e1

kde-misc/kdiff3: Stabilize 1.10.7 amd64, #921832

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.7.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
index 4c421ae349ce..a2afa7d7ac2b 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: c5235916464d4044cb237b550f0582f8266fdf17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 12 12:12:05 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 12 12:12:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5235916

kde-misc/kdiff3: add 1.10.7

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.7.ebuild | 47 
 2 files changed, 48 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 82a1a1941217..2631a0c6c484 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.10.6.tar.xz 1122552 BLAKE2B 
381f9a579247d5b3b630a16a633beb99ce9d33d3a2ecca90d072654ab3705ac5911d207187dfc73a901ca78ce3d53d30573f7c7b411fe17c29e3272d96a48abc
 SHA512 
86b6274acddd58ff80d6d1c83aa884987af05df1b820732394d52197c43adfb13258336de38ffa87203ed8700dd1b9725c96a8be67c48e1189ea776216152e7f
+DIST kdiff3-1.10.7.tar.xz 1131116 BLAKE2B 
5aff7d24d3440b367e0d124e7db444fb1164e1e23a39cc808b83d9f872e11c78442f73e5b95199ed00ace30cf5e4d15adbba0c9d46fe79bc2f5eae693e0aa93d
 SHA512 
ab7ce8312014de200bcc613be1a28b384289f96be08d7f2e1e640b202cede3bbfeffa7b3e53b605f8edf9be2368d2aa6c6b5ee4501577ed8560ca1c4704802db

diff --git a/kde-misc/kdiff3/kdiff3-1.10.7.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
new file mode 100644
index ..4c421ae349ce
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 8699582f664cb1dd707309fd2e884b3267088362
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 15 10:14:49 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 15 10:15:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8699582f

kde-misc/kdiff3: drop 1.10.5

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 -
 kde-misc/kdiff3/kdiff3-1.10.5.ebuild | 47 
 2 files changed, 48 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 532bb7b9c48e..82a1a1941217 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B 
ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223
 SHA512 
567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2
 DIST kdiff3-1.10.6.tar.xz 1122552 BLAKE2B 
381f9a579247d5b3b630a16a633beb99ce9d33d3a2ecca90d072654ab3705ac5911d207187dfc73a901ca78ce3d53d30573f7c7b411fe17c29e3272d96a48abc
 SHA512 
86b6274acddd58ff80d6d1c83aa884987af05df1b820732394d52197c43adfb13258336de38ffa87203ed8700dd1b9725c96a8be67c48e1189ea776216152e7f

diff --git a/kde-misc/kdiff3/kdiff3-1.10.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.5.ebuild
deleted file mode 100644
index e97907512672..
--- a/kde-misc/kdiff3/kdiff3-1.10.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_QT6=OFF
-   )
-   ecm_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Sam James]

commit: 3c6c62a3e883fd649f3ac9a2f05b232f6d91de19
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 09:14:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 09:14:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6c62a3

kde-misc/kdiff3: Stabilize 1.10.6 amd64, #915013

Signed-off-by: Sam James  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
index 1a9b8895472c..e97907512672 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: 1a32b6a7a2055b37d0ac27bff9986166cd859719
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Oct 14 16:50:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Oct 14 16:50:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a32b6a7

kde-misc/kdiff3: Stabilize 1.10.6 x86, #915013

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
index 4c421ae349ce..1a9b8895472c 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 7297794355121718d8ae03c9834680c3488769fa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  1 06:58:40 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  1 10:46:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72977943

kde-misc/kdiff3: drop 1.10.6_pre0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest  |  1 -
 kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild | 48 ---
 2 files changed, 49 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 76ccf1319cb8..532bb7b9c48e 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B 
ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223
 SHA512 
567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2
-DIST kdiff3-1.10.6.tar.bz2 1330356 BLAKE2B 
5953183ed599346ccc09b0ab112114fa18dbf7ec5d09e2492d850bdc0fba2e38eef6e3ffc399213931aefd6e4ed0ab54053ff96bebf9c5109dbdc487b18298f8
 SHA512 
104ff95d84e4fb81a4b8fcdb407030cb2123d466795e6c778d6645aba7ea2d9ffa4db286ad05966119e4fd64859ce12b38c351719e5a16dae06011ac9afdb966
 DIST kdiff3-1.10.6.tar.xz 1122552 BLAKE2B 
381f9a579247d5b3b630a16a633beb99ce9d33d3a2ecca90d072654ab3705ac5911d207187dfc73a901ca78ce3d53d30573f7c7b411fe17c29e3272d96a48abc
 SHA512 
86b6274acddd58ff80d6d1c83aa884987af05df1b820732394d52197c43adfb13258336de38ffa87203ed8700dd1b9725c96a8be67c48e1189ea776216152e7f

diff --git a/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild
deleted file mode 100644
index 4dba975a3847..
--- a/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="https://invent.kde.org/sdk/${PN}/-/archive/${PV/_pre0/}/${P/_pre0/}.tar.bz2;
-S="${WORKDIR}/${P/_pre0/}"
-
-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
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_QT6=OFF
-   )
-   ecm_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 69bb8d23e895c3ae482a78349998bccdb3ff3ec4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  1 06:58:11 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  1 10:46:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69bb8d23

kde-misc/kdiff3: add 1.10.6

Bug: https://bugs.gentoo.org/912878
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.6.ebuild | 47 
 2 files changed, 48 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ac9255f770a3..76ccf1319cb8 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B 
ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223
 SHA512 
567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2
 DIST kdiff3-1.10.6.tar.bz2 1330356 BLAKE2B 
5953183ed599346ccc09b0ab112114fa18dbf7ec5d09e2492d850bdc0fba2e38eef6e3ffc399213931aefd6e4ed0ab54053ff96bebf9c5109dbdc487b18298f8
 SHA512 
104ff95d84e4fb81a4b8fcdb407030cb2123d466795e6c778d6645aba7ea2d9ffa4db286ad05966119e4fd64859ce12b38c351719e5a16dae06011ac9afdb966
+DIST kdiff3-1.10.6.tar.xz 1122552 BLAKE2B 
381f9a579247d5b3b630a16a633beb99ce9d33d3a2ecca90d072654ab3705ac5911d207187dfc73a901ca78ce3d53d30573f7c7b411fe17c29e3272d96a48abc
 SHA512 
86b6274acddd58ff80d6d1c83aa884987af05df1b820732394d52197c43adfb13258336de38ffa87203ed8700dd1b9725c96a8be67c48e1189ea776216152e7f

diff --git a/kde-misc/kdiff3/kdiff3-1.10.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
new file mode 100644
index ..4c421ae349ce
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: e3603ddd304d2a081b073cc95765c1730de8787b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 26 17:58:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 26 18:03:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3603ddd

kde-misc/kdiff3: add 1.10.6_pre0

Bug: https://bugs.gentoo.org/912878
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest  |  1 +
 kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild | 48 +++
 2 files changed, 49 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index dd5c8e6ccc59..ac9255f770a3 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B 
ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223
 SHA512 
567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2
+DIST kdiff3-1.10.6.tar.bz2 1330356 BLAKE2B 
5953183ed599346ccc09b0ab112114fa18dbf7ec5d09e2492d850bdc0fba2e38eef6e3ffc399213931aefd6e4ed0ab54053ff96bebf9c5109dbdc487b18298f8
 SHA512 
104ff95d84e4fb81a4b8fcdb407030cb2123d466795e6c778d6645aba7ea2d9ffa4db286ad05966119e4fd64859ce12b38c351719e5a16dae06011ac9afdb966

diff --git a/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild
new file mode 100644
index ..4dba975a3847
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+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="https://invent.kde.org/sdk/${PN}/-/archive/${PV/_pre0/}/${P/_pre0/}.tar.bz2;
+S="${WORKDIR}/${P/_pre0/}"
+
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: fc7c3f666bad5f4771a744ea3ca428783b07b0a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  3 17:10:18 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  3 17:11:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7c3f66

kde-misc/kdiff3: drop 1.10.4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 -
 kde-misc/kdiff3/kdiff3-1.10.4.ebuild | 48 
 2 files changed, 49 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 0cd91f1ab8fd..dd5c8e6ccc59 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.10.4.tar.xz 1112620 BLAKE2B 
c9bc254fecdfed2df4e75c4b1668083ac59eec43ffc4b17e5b16042e469041a4ce7fb1b1cb12e6283645ff8a89532c68d5fa0d6025dbe9781834be4a1cc2d893
 SHA512 
42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c
 DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B 
ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223
 SHA512 
567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2

diff --git a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
deleted file mode 100644
index 6bc8f5f2178b..
--- a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-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
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_QT6=OFF
-   )
-   ecm_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 88f5502975fbc84d1e0b5cd99daba0b640f2ff17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 11 19:14:14 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 11 19:21:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f55029

kde-misc/kdiff3: add 1.10.5

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.5.ebuild | 47 
 2 files changed, 48 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 574415e6f807..0cd91f1ab8fd 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.10.4.tar.xz 1112620 BLAKE2B 
c9bc254fecdfed2df4e75c4b1668083ac59eec43ffc4b17e5b16042e469041a4ce7fb1b1cb12e6283645ff8a89532c68d5fa0d6025dbe9781834be4a1cc2d893
 SHA512 
42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c
+DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B 
ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223
 SHA512 
567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2

diff --git a/kde-misc/kdiff3/kdiff3-1.10.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.5.ebuild
new file mode 100644
index ..4c421ae349ce
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: cc5e427f88da6f84d1e5f25f8cf795ebc6e3497c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 28 18:43:33 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 28 18:44:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5e427f

kde-misc/kdiff3: drop 1.10.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 -
 kde-misc/kdiff3/kdiff3-1.10.0.ebuild | 48 
 2 files changed, 49 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index c047245323fc..574415e6f807 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.10.4.tar.xz 1112620 BLAKE2B 
c9bc254fecdfed2df4e75c4b1668083ac59eec43ffc4b17e5b16042e469041a4ce7fb1b1cb12e6283645ff8a89532c68d5fa0d6025dbe9781834be4a1cc2d893
 SHA512 
42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c

diff --git a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
deleted file mode 100644
index 6bc8f5f2178b..
--- a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-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
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_QT6=OFF
-   )
-   ecm_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: da85b55d1e5636bb5c0002642635b1087a47f2e1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May 23 18:55:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May 23 18:55:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da85b55d

kde-misc/kdiff3: Stabilize 1.10.4 amd64, #906674

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
index 3ea8c7d3396d..6bc8f5f2178b 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: 1e30fe7fb0ef99299dbfea2854aa963f2956175b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May 23 18:40:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May 23 18:40:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e30fe7f

kde-misc/kdiff3: Stabilize 1.10.4 x86, #906674

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
index 1d6faa6f4ef7..3ea8c7d3396d 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: faa6434d65e8336e473bb7b7f54637ecd446a454
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 18 11:27:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 18 11:29:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa6434d

kde-misc/kdiff3: add 1.10.4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.4.ebuild | 48 
 2 files changed, 49 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e7c83e162364..235cb888653a 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,4 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.10.2.tar.xz 1112600 BLAKE2B 
095bf797c076ee52b65dbf67b948b7767252c793024a1cf45a522dc98393265d912a30c1a167ffdce3c575bdbbe878fe71d15f4c634fd07bc3bfefd227f2396b
 SHA512 
cbf63eae296370174c97a52213f436e326c1c1c576506d83ebca0a4c443b95aa4d69593df0e6688e13d5f187d60c81bfeb198f3681c2df8a4cfd6279bbd9cd7d
 DIST kdiff3-1.10.3.tar.xz 1112224 BLAKE2B 
0ec1b1d749fdc3b9669c508793efe12d7fac0f4efe36e39a7a7425f5b9ddaf2ff14152963f29b2a823d8e05518f151e6106d08a372b25fcab5a36222163ce9db
 SHA512 
368621b7576d75973fba30ed2089cb249e3e695198996c4ffd1440ca0caffabc7540504dce559d9d2647609bbfe1645dc67198cd8b1d1c592a0d2a4332818f69
+DIST kdiff3-1.10.4.tar.xz 1112620 BLAKE2B 
c9bc254fecdfed2df4e75c4b1668083ac59eec43ffc4b17e5b16042e469041a4ce7fb1b1cb12e6283645ff8a89532c68d5fa0d6025dbe9781834be4a1cc2d893
 SHA512 
42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c

diff --git a/kde-misc/kdiff3/kdiff3-1.10.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
new file mode 100644
index ..1d6faa6f4ef7
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 4f7e628e3e5f95b2724cddc04cea4b0aa8ea94bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 18 11:28:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 18 11:29:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7e628e

kde-misc/kdiff3: drop 1.10.2, 1.10.3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  2 --
 kde-misc/kdiff3/kdiff3-1.10.2.ebuild | 48 
 kde-misc/kdiff3/kdiff3-1.10.3.ebuild | 48 
 3 files changed, 98 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 235cb888653a..c047245323fc 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,2 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
-DIST kdiff3-1.10.2.tar.xz 1112600 BLAKE2B 
095bf797c076ee52b65dbf67b948b7767252c793024a1cf45a522dc98393265d912a30c1a167ffdce3c575bdbbe878fe71d15f4c634fd07bc3bfefd227f2396b
 SHA512 
cbf63eae296370174c97a52213f436e326c1c1c576506d83ebca0a4c443b95aa4d69593df0e6688e13d5f187d60c81bfeb198f3681c2df8a4cfd6279bbd9cd7d
-DIST kdiff3-1.10.3.tar.xz 1112224 BLAKE2B 
0ec1b1d749fdc3b9669c508793efe12d7fac0f4efe36e39a7a7425f5b9ddaf2ff14152963f29b2a823d8e05518f151e6106d08a372b25fcab5a36222163ce9db
 SHA512 
368621b7576d75973fba30ed2089cb249e3e695198996c4ffd1440ca0caffabc7540504dce559d9d2647609bbfe1645dc67198cd8b1d1c592a0d2a4332818f69
 DIST kdiff3-1.10.4.tar.xz 1112620 BLAKE2B 
c9bc254fecdfed2df4e75c4b1668083ac59eec43ffc4b17e5b16042e469041a4ce7fb1b1cb12e6283645ff8a89532c68d5fa0d6025dbe9781834be4a1cc2d893
 SHA512 
42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c

diff --git a/kde-misc/kdiff3/kdiff3-1.10.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.2.ebuild
deleted file mode 100644
index 1d6faa6f4ef7..
--- a/kde-misc/kdiff3/kdiff3-1.10.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-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
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_QT6=OFF
-   )
-   ecm_src_configure
-}

diff --git a/kde-misc/kdiff3/kdiff3-1.10.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.3.ebuild
deleted file mode 100644
index 1d6faa6f4ef7..
--- a/kde-misc/kdiff3/kdiff3-1.10.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-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
-"
-

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 2c5fd1c67437786db9b0240a59b696a2f9eac18a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 16 19:16:20 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 16 19:16:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5fd1c6

kde-misc/kdiff3: add 1.10.3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.3.ebuild | 48 
 2 files changed, 49 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index b451409f090b..e7c83e162364 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.10.2.tar.xz 1112600 BLAKE2B 
095bf797c076ee52b65dbf67b948b7767252c793024a1cf45a522dc98393265d912a30c1a167ffdce3c575bdbbe878fe71d15f4c634fd07bc3bfefd227f2396b
 SHA512 
cbf63eae296370174c97a52213f436e326c1c1c576506d83ebca0a4c443b95aa4d69593df0e6688e13d5f187d60c81bfeb198f3681c2df8a4cfd6279bbd9cd7d
+DIST kdiff3-1.10.3.tar.xz 1112224 BLAKE2B 
0ec1b1d749fdc3b9669c508793efe12d7fac0f4efe36e39a7a7425f5b9ddaf2ff14152963f29b2a823d8e05518f151e6106d08a372b25fcab5a36222163ce9db
 SHA512 
368621b7576d75973fba30ed2089cb249e3e695198996c4ffd1440ca0caffabc7540504dce559d9d2647609bbfe1645dc67198cd8b1d1c592a0d2a4332818f69

diff --git a/kde-misc/kdiff3/kdiff3-1.10.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.3.ebuild
new file mode 100644
index ..1d6faa6f4ef7
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: d51a0c0178f7de756c42e5928dfb80709272843e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May  3 09:31:42 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May  3 11:30:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51a0c01

kde-misc/kdiff3: add 1.10.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.2.ebuild | 48 
 2 files changed, 49 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index d5ef8f33fff6..b0a875241d59 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.10.1.tar.xz 276 BLAKE2B 
7a5d73d839471bb407c3fec7f67375a25128d04ffe9d75d367b7794d204a670bfb80d118e9b179f785b9d37010911c1588684c7b8fce125a7f2dc86aa56f53f3
 SHA512 
d1a92bb86c6ba77bda9a33c5ab6da7456775bf5281e4ce0dc391c5671de71b3e34669e9fdcce1af8090c91b4f84cf954b6ae73497924aaf7ca181eff5e594b15
+DIST kdiff3-1.10.2.tar.xz 1112600 BLAKE2B 
095bf797c076ee52b65dbf67b948b7767252c793024a1cf45a522dc98393265d912a30c1a167ffdce3c575bdbbe878fe71d15f4c634fd07bc3bfefd227f2396b
 SHA512 
cbf63eae296370174c97a52213f436e326c1c1c576506d83ebca0a4c443b95aa4d69593df0e6688e13d5f187d60c81bfeb198f3681c2df8a4cfd6279bbd9cd7d

diff --git a/kde-misc/kdiff3/kdiff3-1.10.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.2.ebuild
new file mode 100644
index ..1d6faa6f4ef7
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 4af638f18373cebfbddbb49f4ab1fcf6767e251d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May  3 09:32:32 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May  3 11:30:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af638f1

kde-misc/kdiff3: drop 1.10.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 -
 kde-misc/kdiff3/kdiff3-1.10.1.ebuild | 48 
 2 files changed, 49 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index b0a875241d59..b451409f090b 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
-DIST kdiff3-1.10.1.tar.xz 276 BLAKE2B 
7a5d73d839471bb407c3fec7f67375a25128d04ffe9d75d367b7794d204a670bfb80d118e9b179f785b9d37010911c1588684c7b8fce125a7f2dc86aa56f53f3
 SHA512 
d1a92bb86c6ba77bda9a33c5ab6da7456775bf5281e4ce0dc391c5671de71b3e34669e9fdcce1af8090c91b4f84cf954b6ae73497924aaf7ca181eff5e594b15
 DIST kdiff3-1.10.2.tar.xz 1112600 BLAKE2B 
095bf797c076ee52b65dbf67b948b7767252c793024a1cf45a522dc98393265d912a30c1a167ffdce3c575bdbbe878fe71d15f4c634fd07bc3bfefd227f2396b
 SHA512 
cbf63eae296370174c97a52213f436e326c1c1c576506d83ebca0a4c443b95aa4d69593df0e6688e13d5f187d60c81bfeb198f3681c2df8a4cfd6279bbd9cd7d

diff --git a/kde-misc/kdiff3/kdiff3-1.10.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.1.ebuild
deleted file mode 100644
index 1d6faa6f4ef7..
--- a/kde-misc/kdiff3/kdiff3-1.10.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-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
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_WITH_QT6=OFF
-   )
-   ecm_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: c176497bd682b49f48552d53224971f49924bf84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 30 18:16:16 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 30 18:16:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c176497b

kde-misc/kdiff3: drop 1.9.6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.9.6.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 372324cef1a2..d5ef8f33fff6 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.10.1.tar.xz 276 BLAKE2B 
7a5d73d839471bb407c3fec7f67375a25128d04ffe9d75d367b7794d204a670bfb80d118e9b179f785b9d37010911c1588684c7b8fce125a7f2dc86aa56f53f3
 SHA512 
d1a92bb86c6ba77bda9a33c5ab6da7456775bf5281e4ce0dc391c5671de71b3e34669e9fdcce1af8090c91b4f84cf954b6ae73497924aaf7ca181eff5e594b15
-DIST kdiff3-1.9.6.tar.xz 1059880 BLAKE2B 
86124e7a09324179d4952ad44adf7397db661490c9dff9da2cd3d62bed65a2f97aadb15e12c6e11b2ce74d8f93c50c1290608c6c26f25d858af796c48aaf008a
 SHA512 
0b12d0b81cdeeccf38248ca468ae714b7baadccce658cac41e619e960f865cff5e7362c78bf67b80037f3f4c763c123dd2aa65bb32567a3bd8f56e7158d72dbf

diff --git a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
deleted file mode 100644
index d225cdcfffc7..
--- a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.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
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 8dd4845b78429ac2930d56159846a453e40bd357
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 30 18:15:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 30 18:16:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd4845b

kde-misc/kdiff3: add 1.10.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.1.ebuild | 48 
 2 files changed, 49 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index f7ec8ea2e936..372324cef1a2 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
+DIST kdiff3-1.10.1.tar.xz 276 BLAKE2B 
7a5d73d839471bb407c3fec7f67375a25128d04ffe9d75d367b7794d204a670bfb80d118e9b179f785b9d37010911c1588684c7b8fce125a7f2dc86aa56f53f3
 SHA512 
d1a92bb86c6ba77bda9a33c5ab6da7456775bf5281e4ce0dc391c5671de71b3e34669e9fdcce1af8090c91b4f84cf954b6ae73497924aaf7ca181eff5e594b15
 DIST kdiff3-1.9.6.tar.xz 1059880 BLAKE2B 
86124e7a09324179d4952ad44adf7397db661490c9dff9da2cd3d62bed65a2f97aadb15e12c6e11b2ce74d8f93c50c1290608c6c26f25d858af796c48aaf008a
 SHA512 
0b12d0b81cdeeccf38248ca468ae714b7baadccce658cac41e619e960f865cff5e7362c78bf67b80037f3f4c763c123dd2aa65bb32567a3bd8f56e7158d72dbf

diff --git a/kde-misc/kdiff3/kdiff3-1.10.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.1.ebuild
new file mode 100644
index ..1d6faa6f4ef7
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: e092e339be346d389bebe362b16560c2a80b05f7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 25 18:05:13 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 25 18:05:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e092e339

kde-misc/kdiff3: Stabilize 1.10.0 x86, #893300

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
index 58ba3794cb36..6bc8f5f2178b 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Arthur Zamarin]

commit: 0fb89673a214341ff4fe5d2e7b557050d5b8bd6b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 25 14:46:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 25 14:46:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb89673

kde-misc/kdiff3: Stabilize 1.10.0 amd64, #893300

Signed-off-by: Arthur Zamarin  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
index 1d6faa6f4ef7..58ba3794cb36 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 4b459d5a96470056c4a64c40c61a50c33e5c9f19
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 16 21:34:41 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 18 10:01:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b459d5a

kde-misc/kdiff3: add 1.10.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest |  1 +
 kde-misc/kdiff3/kdiff3-1.10.0.ebuild | 48 
 2 files changed, 49 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 7a46dbef82d4..f7ec8ea2e936 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
+DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 
146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842
 SHA512 
5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.9.6.tar.xz 1059880 BLAKE2B 
86124e7a09324179d4952ad44adf7397db661490c9dff9da2cd3d62bed65a2f97aadb15e12c6e11b2ce74d8f93c50c1290608c6c26f25d858af796c48aaf008a
 SHA512 
0b12d0b81cdeeccf38248ca468ae714b7baadccce658cac41e619e960f865cff5e7362c78bf67b80037f3f4c763c123dd2aa65bb32567a3bd8f56e7158d72dbf

diff --git a/kde-misc/kdiff3/kdiff3-1.10.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
new file mode 100644
index ..1d6faa6f4ef7
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_WITH_QT6=OFF
+   )
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: fd43f053a2a75b4b862eb5d4d64c370f1bdd6700
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 25 07:28:07 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 25 09:22:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd43f053

kde-misc/kdiff3: drop 1.9.5

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.9.5.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index a4de5faea2da..7a46dbef82d4 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.9.5.tar.xz 1057524 BLAKE2B 
ef55ce58880d8611747929214bbc2e5d718d51d71915a327d711a828c20d91ce515fa37522ad79e3beca3616770b2cad9fc066814e5d7234e06af73ae22a4d77
 SHA512 
4c9629b2a8bc506a5b224a566cf2ef9b733d78fc3185d69988ed387621039a3f91472b02344377a254b3f19771bea5ce3355b0fd866402594eb63fd940a68c41
 DIST kdiff3-1.9.6.tar.xz 1059880 BLAKE2B 
86124e7a09324179d4952ad44adf7397db661490c9dff9da2cd3d62bed65a2f97aadb15e12c6e11b2ce74d8f93c50c1290608c6c26f25d858af796c48aaf008a
 SHA512 
0b12d0b81cdeeccf38248ca468ae714b7baadccce658cac41e619e960f865cff5e7362c78bf67b80037f3f4c763c123dd2aa65bb32567a3bd8f56e7158d72dbf

diff --git a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
deleted file mode 100644
index d225cdcfffc7..
--- a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.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
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: 6f433beedc9f301f82908571052110d41ed95c2d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul 25 07:05:58 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul 25 07:05:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f433bee

kde-misc/kdiff3: amd64 stable wrt bug #860798

Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
index e9271ef34f16..d225cdcfffc7 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Sam James]

commit: 12afd0c45ca9b9fbb51291f4cb0caf20c8402eba
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 23:23:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 23:23:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12afd0c4

kde-misc/kdiff3: Stabilize 1.9.6 x86, #860798

Signed-off-by: Sam James  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
index 2a6d26eb50f4..e9271ef34f16 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 6880272cef8dd13e1ad4f9aed71a117d1ae2053c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 27 10:24:10 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 27 10:35:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6880272c

kde-misc/kdiff3: 1.9.6 version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.9.6.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 22a7d1815dca..a4de5faea2da 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.9.5.tar.xz 1057524 BLAKE2B 
ef55ce58880d8611747929214bbc2e5d718d51d71915a327d711a828c20d91ce515fa37522ad79e3beca3616770b2cad9fc066814e5d7234e06af73ae22a4d77
 SHA512 
4c9629b2a8bc506a5b224a566cf2ef9b733d78fc3185d69988ed387621039a3f91472b02344377a254b3f19771bea5ce3355b0fd866402594eb63fd940a68c41
+DIST kdiff3-1.9.6.tar.xz 1059880 BLAKE2B 
86124e7a09324179d4952ad44adf7397db661490c9dff9da2cd3d62bed65a2f97aadb15e12c6e11b2ce74d8f93c50c1290608c6c26f25d858af796c48aaf008a
 SHA512 
0b12d0b81cdeeccf38248ca468ae714b7baadccce658cac41e619e960f865cff5e7362c78bf67b80037f3f4c763c123dd2aa65bb32567a3bd8f56e7158d72dbf

diff --git a/kde-misc/kdiff3/kdiff3-1.9.6.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
new file mode 100644
index ..2a6d26eb50f4
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.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
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 694e53d76075c1f89feb71d5d1e69516a333c46a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 10:14:45 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 31 11:21:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694e53d7

kde-misc/kdiff3: Drop 1.9.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.9.4.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 8d97f7109263..22a7d1815dca 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.9.4.tar.xz 1057404 BLAKE2B 
6aa24ce63f7731040dedca4c8c27890d88de1b1e1dba3b2ca778d294ce7480d96d9bd5f282ddfdb918d6b5a93adec92efc3977f44f2e735190a6df8acb5df150
 SHA512 
76555eb9253c4cb96d32de01126a4547adb3424997034f0d9aed50cc4df87cb15c038a12f8620a491a968b47a3ea5eafcb0f53978aca4300ca319677bb2b9e63
 DIST kdiff3-1.9.5.tar.xz 1057524 BLAKE2B 
ef55ce58880d8611747929214bbc2e5d718d51d71915a327d711a828c20d91ce515fa37522ad79e3beca3616770b2cad9fc066814e5d7234e06af73ae22a4d77
 SHA512 
4c9629b2a8bc506a5b224a566cf2ef9b733d78fc3185d69988ed387621039a3f91472b02344377a254b3f19771bea5ce3355b0fd866402594eb63fd940a68c41

diff --git a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
deleted file mode 100644
index c9768a871e94..
--- a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.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
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Jakov Smolić]

commit: d96885fa4d72930c39f361b03caefcad8fa22edb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 30 20:09:11 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 30 20:09:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96885fa

kde-misc/kdiff3: Stabilize 1.9.5 x86, #836397

Signed-off-by: Jakov Smolić  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
index 20e2240cd90e..d225cdcfffc7 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Jakov Smolić]

commit: 375f0b1af1ebaaf9d5d5628ad604f3d49f3aa0ac
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 30 11:08:28 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 30 11:08:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375f0b1a

kde-misc/kdiff3: Stabilize 1.9.5 amd64, #836397

Signed-off-by: Jakov Smolić  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
index 2a6d26eb50f4..20e2240cd90e 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 72ca5b4fa8bc3d57e4defeecc9a2d406e3d2d597
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 22 10:58:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 22 11:14:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ca5b4f

kde-misc/kdiff3: Drop 1.9.3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.9.3.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ecf58c3be501..c7423d1f5e80 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B 
d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964
 SHA512 
9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5
 DIST kdiff3-1.9.4.tar.xz 1057404 BLAKE2B 
6aa24ce63f7731040dedca4c8c27890d88de1b1e1dba3b2ca778d294ce7480d96d9bd5f282ddfdb918d6b5a93adec92efc3977f44f2e735190a6df8acb5df150
 SHA512 
76555eb9253c4cb96d32de01126a4547adb3424997034f0d9aed50cc4df87cb15c038a12f8620a491a968b47a3ea5eafcb0f53978aca4300ca319677bb2b9e63

diff --git a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
deleted file mode 100644
index c9768a871e94..
--- a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.82.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
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Sam James]

commit: af50059f1692cee735eb523f82800f52abde6e77
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 16 21:49:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 16 21:50:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af50059f

kde-misc/kdiff3: Stabilize 1.9.4 amd64, #829349

Signed-off-by: Sam James  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
index 2a85a162eaf3..c9768a871e94 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Sam James]

commit: ea0e0fcc782abd622b00a04f3a4535b0e15da305
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 16 21:48:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 16 21:48:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0e0fcc

kde-misc/kdiff3: Stabilize 1.9.4 x86, #829349

Signed-off-by: Sam James  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
index d7f3785a058e..2a85a162eaf3 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: c1f555723e3809bf71386ff4d45bd04e22c601db
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 22 15:45:22 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 22 16:35:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f55572

kde-misc/kdiff3: 1.9.4 version bump

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.9.4.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index a68ab0203c44..ecf58c3be501 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.9.3.tar.xz 1056920 BLAKE2B 
d32e60cbc8d41339dff9a91fe5a2c739a38dc856a0adc575fa0e777c921d40effb1f27b34d7a127a4aff95b10436ddafd7f3db63912c2def85307e1e46ea9964
 SHA512 
9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5
+DIST kdiff3-1.9.4.tar.xz 1057404 BLAKE2B 
6aa24ce63f7731040dedca4c8c27890d88de1b1e1dba3b2ca778d294ce7480d96d9bd5f282ddfdb918d6b5a93adec92efc3977f44f2e735190a6df8acb5df150
 SHA512 
76555eb9253c4cb96d32de01126a4547adb3424997034f0d9aed50cc4df87cb15c038a12f8620a491a968b47a3ea5eafcb0f53978aca4300ca319677bb2b9e63

diff --git a/kde-misc/kdiff3/kdiff3-1.9.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
new file mode 100644
index ..d7f3785a058e
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.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
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit: eed9956e8208611964ff7d3e1bc4a1f0c994f1f3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  3 20:39:41 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  3 20:39:41 2021 +
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..000
--- 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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: e89c4a420ce980d8daef6a9f62bed1ad34a11cd7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  3 17:51:59 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  3 17:51:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89c4a42

kde-misc/kdiff3: x86 stable wrt bug #815832

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
index ae667bf7760..c9768a871e9 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Sam James]

commit: 5a3c828ab990d072eb0ca4487b296e05f901cc88
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  2 22:49:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  2 22:49:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3c828a

kde-misc/kdiff3: Stabilize 1.9.3 amd64, #815832

Signed-off-by: Sam James  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
index d7f3785a058..ae667bf7760 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 3aed2565181158f916fb6c7d1333d740b1082ee1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 21 13:36:19 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  4 17:00:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aed2565

kde-misc/kdiff3: 1.9.3 version bump

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.9.3.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 7a7b12e9bb0..0aa8008f32f 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 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/kdiff3-1.9.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
new file mode 100644
index 000..d7f3785a058
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.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
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit: 3305ff2be5255bfd9fe7fd9848ceddef9339936e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul 15 07:46:57 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul 16 11:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3305ff2b

kde-misc/kdiff3: Drop 1.8.5

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |   1 -
 kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch | 112 -
 kde-misc/kdiff3/kdiff3-1.8.5.ebuild|  40 -
 3 files changed, 153 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 18b9eac6257..7a7b12e9bb0 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
 DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 
96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511
 SHA512 
3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8

diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch 
b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
deleted file mode 100644
index 180009afe0e..000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 5dcc0673c61cc75122bf5f812a45bbb15b778218 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov 
-Date: Mon, 27 Apr 2020 15:52:18 +0300
-Subject: [PATCH] Add HiDPI support
-
-* Backported to 1.8 branch

- src/Overview.cpp |  6 --
- src/directorymergewindow.cpp | 15 +--
- src/main.cpp |  1 +
- src/mergeresultwindow.cpp|  7 +--
- 4 files changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/src/Overview.cpp b/src/Overview.cpp
-index ee1d73f..ac35e7e 100644
 a/src/Overview.cpp
-+++ b/src/Overview.cpp
-@@ -271,7 +271,8 @@ void Overview::paintEvent(QPaintEvent*)
- int h = height() - 1;
- int w = width();
- 
--if(m_pixmap.size() != size())
-+const auto dpr = devicePixelRatioF();
-+if(m_pixmap.size() != size() * dpr)
- {
- if(m_pOptions->m_bWordWrap)
- {
-@@ -287,7 +288,8 @@ void Overview::paintEvent(QPaintEvent*)
- m_nofLines = m_pDiff3LineList->size();
- }
- 
--m_pixmap = QPixmap(size());
-+m_pixmap = QPixmap(size() * dpr);
-+m_pixmap.setDevicePixelRatio(dpr);
- 
- QPainter p(_pixmap);
- p.fillRect(rect(), m_pOptions->m_bgColor);
-diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
-index 31dbcaf..1cc62b4 100644
 a/src/directorymergewindow.cpp
-+++ b/src/directorymergewindow.cpp
-@@ -584,7 +584,10 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public 
QStyledItemDelegate
- //QPixmap icon = value.value(); //pixmap(column);
- if(!icon.isNull())
- {
--int yOffset = (sizeHint(option, index).height() - 
icon.height()) / 2;
-+const auto dpr = thePainter->device()->devicePixelRatioF();
-+const int w = qRound(icon.width() / dpr);
-+const int h = qRound(icon.height() / dpr);
-+int yOffset = (sizeHint(option, index).height() - h) / 2;
- thePainter->drawPixmap(x + 2, y + yOffset, icon);
- 
- int i = index == d->m_selection1Index ? 1 : index == 
d->m_selection2Index ? 2 : index == d->m_selection3Index ? 3 : 0;
-@@ -593,20 +596,20 @@ class DirectoryMergeWindow::DirMergeItemDelegate : 
public QStyledItemDelegate
- Options* pOpts = d->m_pOptions;
- QColor c(i == 1 ? pOpts->m_colorA : i == 2 ? 
pOpts->m_colorB : pOpts->m_colorC);
- thePainter->setPen(c); // highlight() );
--thePainter->drawRect(x + 2, y + yOffset, icon.width(), 
icon.height());
-+thePainter->drawRect(x + 2, y + yOffset, w, h);
- thePainter->setPen(QPen(c, 0, Qt::DotLine));
--thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() 
+ 2, icon.height() + 2);
-+thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 
2);
- thePainter->setPen(Qt::white);
- QString s(QChar('A' + i - 1));
- 
--thePainter->drawText(x + 2 + (icon.width() - 
Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
--y + yOffset + (icon.height() + 
thePainter->fontMetrics().ascent()) / 2 - 1,
-+   

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: eff08f43117d6cffc7cfc5ce093e66297e88d115
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 15 07:41:12 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 15 07:41:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff08f43

kde-misc/kdiff3: x86 stable wrt bug #796953

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
index 1db47af829d..82515f73d04 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: b98759d5db8e8380d6ab667b2c5679db429bf851
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 15 07:37:25 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 15 07:37:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98759d5

kde-misc/kdiff3: amd64 stable wrt bug #796953

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
index ce60073e5e9..1db47af829d 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 25d51e4f68efe9626b4d167d43b38f9257bca5cf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 14 11:08:10 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 14 11:08:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d51e4f

kde-misc/kdiff3: Set VIRTUALX_REQUIRED="test"

Closes: https://bugs.gentoo.org/801673
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
index a05eeb463c6..ce60073e5e9 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
@@ -6,6 +6,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: b32ab8a0a1623b7db7fcd853917655c3274fdd8a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 20 16:47:38 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 20 18:23:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32ab8a0

kde-misc/kdiff3: 1.9.2 version bump

See also:
https://mail.kde.org/pipermail/kde-announce-apps/2021-May/005655.html

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.9.2.ebuild | 42 +
 2 files changed, 43 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 754f54383c6..3c7a188321c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
 DIST kdiff3-1.9.1.tar.xz 1052912 BLAKE2B 
844d0a5cf8fe054fb897bf41f0933cc83e2f9837d0c6a963600468b37984801935c3c7d1c866ed7120f2147ac469d20429aa252de75b0b5729360e459dbf224e
 SHA512 
ce57083895f5ece2fffb9f4f1ad8b66df563a6f67eafc7758166bcde6cb5f822349d440d4d07a8b5076ea72f0a0f15979208cb5431524ba843814191a9c92969
+DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 
96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511
 SHA512 
3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8

diff --git a/kde-misc/kdiff3/kdiff3-1.9.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
new file mode 100644
index 000..a05eeb463c6
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.2.ebuild
@@ -0,0 +1,42 @@
+# 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
+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

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 608fddaff6bc5ef7b9014ca901e758ccbe9b6f9e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 20 16:49:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 20 18:23:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=608fddaf

kde-misc/kdiff3: Drop 1.9.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.9.1.ebuild | 42 -
 2 files changed, 43 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 3c7a188321c..18b9eac6257 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
-DIST kdiff3-1.9.1.tar.xz 1052912 BLAKE2B 
844d0a5cf8fe054fb897bf41f0933cc83e2f9837d0c6a963600468b37984801935c3c7d1c866ed7120f2147ac469d20429aa252de75b0b5729360e459dbf224e
 SHA512 
ce57083895f5ece2fffb9f4f1ad8b66df563a6f67eafc7758166bcde6cb5f822349d440d4d07a8b5076ea72f0a0f15979208cb5431524ba843814191a9c92969
 DIST kdiff3-1.9.2.tar.xz 1053404 BLAKE2B 
96d499a243921aed7fe51292cb8f88b9236949297a5ca9c271735ff2d80c70a8b6d864ed1bab6b55a52da34e2c8bd819cb9738694531f183ddce442c1edd1511
 SHA512 
3e233cd934d1e21ac1492f928c1d9517c913b1163812e80c5f6f10c4387a82ad18edf5a2153513edf7136358571169735b55fa13ea3512113b22d750156af6a8

diff --git a/kde-misc/kdiff3/kdiff3-1.9.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.1.ebuild
deleted file mode 100644
index a05eeb463c6..000
--- a/kde-misc/kdiff3/kdiff3-1.9.1.ebuild
+++ /dev/null
@@ -1,42 +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
-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

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 2cc375ee22608dff037229d7ece921cffc818202
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 14 20:58:40 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 14 20:58:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc375ee

kde-misc/kdiff3: Drop 1.9.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.9.0.ebuild | 43 -
 2 files changed, 44 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index d0b2c8be4e1..754f54383c6 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
-DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 
50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52
 SHA512 
5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4
 DIST kdiff3-1.9.1.tar.xz 1052912 BLAKE2B 
844d0a5cf8fe054fb897bf41f0933cc83e2f9837d0c6a963600468b37984801935c3c7d1c866ed7120f2147ac469d20429aa252de75b0b5729360e459dbf224e
 SHA512 
ce57083895f5ece2fffb9f4f1ad8b66df563a6f67eafc7758166bcde6cb5f822349d440d4d07a8b5076ea72f0a0f15979208cb5431524ba843814191a9c92969

diff --git a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
deleted file mode 100644
index adedf33c00c..000
--- a/kde-misc/kdiff3/kdiff3-1.9.0.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
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/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/kiconthemes-${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}/${P}-gcc11.patch" ) # bug 788058, git master

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 29755fb5500218b36ac06c0f020bc5c9dcf1dbe1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 14 20:55:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 14 20:58:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29755fb5

kde-misc/kdiff3: 1.9.1 version bump

Closes: https://bugs.gentoo.org/789330
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.9.1.ebuild | 42 +
 2 files changed, 43 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 53b8015b5a9..d0b2c8be4e1 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
 DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 
50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52
 SHA512 
5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4
+DIST kdiff3-1.9.1.tar.xz 1052912 BLAKE2B 
844d0a5cf8fe054fb897bf41f0933cc83e2f9837d0c6a963600468b37984801935c3c7d1c866ed7120f2147ac469d20429aa252de75b0b5729360e459dbf224e
 SHA512 
ce57083895f5ece2fffb9f4f1ad8b66df563a6f67eafc7758166bcde6cb5f822349d440d4d07a8b5076ea72f0a0f15979208cb5431524ba843814191a9c92969

diff --git a/kde-misc/kdiff3/kdiff3-1.9.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.1.ebuild
new file mode 100644
index 000..a05eeb463c6
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.1.ebuild
@@ -0,0 +1,42 @@
+# 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
+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

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit: 3812549fcaa4f4e19d67b8286c9d07320c422297
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May  4 21:41:32 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May  4 22:56:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3812549f

kde-misc/kdiff3: Fix build with GCC-11

See also: https://invent.kde.org/sdk/kdiff3/-/merge_requests/28

Upstream commit 0476b1daa73159aec411c7f10da6f313294f0e38

Thanks-to: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://bugs.gentoo.org/788058
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch | 24 
 kde-misc/kdiff3/kdiff3-1.9.0.ebuild|  2 ++
 2 files changed, 26 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch 
b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
new file mode 100644
index 000..581b487503e
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.9.0-gcc11.patch
@@ -0,0 +1,24 @@
+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.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
index b9bac1df1bd..adedf33c00c 100644
--- a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
@@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
sys-apps/diffutils
 "
+
+PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 788058, git master

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 3151ff4be3ad46821db755ed76442b881bd851dd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May  3 21:05:32 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May  3 21:08:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3151ff4b

kde-misc/kdiff3: 1.9.0 version bump

See also: https://mail.kde.org/pipermail/kde-announce-apps/2021-May/005652.html

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.9.0.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ce35cdfa885..53b8015b5a9 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
+DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 
50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52
 SHA512 
5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4

diff --git a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild 
b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
new file mode 100644
index 000..b9bac1df1bd
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
@@ -0,0 +1,41 @@
+# 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
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/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/kiconthemes-${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
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 45dbbf95a1306e66c0846f4ff8acf68ac158c5e1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 27 12:46:16 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 27 12:46:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45dbbf95

kde-misc/kdiff3: Drop 1.8.4

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.8.4.ebuild | 40 -
 2 files changed, 41 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index fefa398c018..ce35cdfa885 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 
4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e
 SHA512 
100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4

diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
deleted file mode 100644
index 7f4a90ae3b4..000
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/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=""
-
-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/kiconthemes-${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
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Sam James]

commit: 3ed962224f779be3409345e25c37e5707fd21e3f
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 27 12:29:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 27 12:29:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed96222

kde-misc/kdiff3: Stabilize 1.8.5 amd64, #770298

Signed-off-by: Sam James  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
index a454d7f1784..c9625b834e8 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: 4b9043e26b57e33d3e7f9ca373b15e7ff72051a7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Feb 25 13:53:19 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Feb 25 13:53:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9043e2

kde-misc/kdiff3: x86 stable wrt bug #770298

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
index ec84fcba2ce..a454d7f1784 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 142e2037d234e146cdc4657172d5c2d876141630
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 21 09:19:14 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 21 11:16:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142e2037

kde-misc/kdiff3: 1.8.5 version bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.8.5.ebuild | 40 +
 2 files changed, 41 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index c3d5e02ac2c..fefa398c018 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 
4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e
 SHA512 
100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
+DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 
347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415
 SHA512 
5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4

diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
new file mode 100644
index 000..ec84fcba2ce
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/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=""
+
+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/kiconthemes-${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
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.3-hidpi.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: d7bea1ea0a9cf592d8d89a8b482eaca9cc02c597
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 13 14:15:38 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 13 15:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7bea1ea

kde-misc/kdiff3: Drop 1.8.3-r1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 -
 kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild | 41 --
 2 files changed, 42 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 4142cf3e529..c3d5e02ac2c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 
43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e
 SHA512 
5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
 DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 
4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e
 SHA512 
100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8

diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
deleted file mode 100644
index 678e2ab4e74..000
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
-
-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/kiconthemes-${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
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: cd79ac000936fe048599ab27b131ca13d871adc0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 10:00:49 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 10:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd79ac00

kde-misc/kdiff3: x86 stable wrt bug #747667

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
index 4ebfdd79108..17ffac0a4a6 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: de3d184f307ac3cacbcd842aa4446e2e021d0ae1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 09:24:28 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 09:24:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3d184f

kde-misc/kdiff3: amd64 stable wrt bug #747667

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
index 7b3bf740d42..4ebfdd79108 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: d6e48538811e2aedc89fdf9ac6d04062d2ed780a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul 30 20:00:28 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  1 07:36:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e48538

kde-misc/kdiff3: Drop 1.8.2-r1 and 1.8.3 (r0)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 -
 .../files/kdiff3-1.8.2-crash-w-o-clipboard.patch   | 36 ---
 kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 --
 kde-misc/kdiff3/kdiff3-1.8.3.ebuild| 39 
 4 files changed, 117 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 5158282ef9f..7b68da8ed01 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B 
de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1
 SHA512 
c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
 DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 
43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e
 SHA512 
5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d

diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch 
b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
deleted file mode 100644
index b1d00a12f47..000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
-From: Christoph Feck 
-Date: Thu, 30 Apr 2020 18:27:58 -0400
-Subject: Fix crash when clipboard is not available
-
-Summary:
-QClipboard::mimeData() can be nullptr according to documentation.
-
-BUG: 419722
-FIXED-IN: 1.8.3
-
-Reviewers: mreeves
-
-Reviewed By: mreeves
-
-Differential Revision: https://phabricator.kde.org/D29248

- src/pdiff.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index f3f2284..3588e3e 100644
 a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
- {
- const QClipboard* clipboard = QApplication::clipboard();
- const QMimeData* mimeData = clipboard->mimeData();
--if(mimeData->hasText())
-+if(mimeData && mimeData->hasText())
- {
- QString s = clipboard->text();
- editPaste->setEnabled(!s.isEmpty());
--- 
-cgit v1.1
-

diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
deleted file mode 100644
index 0659672ef39..000
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
-
-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/kiconthemes-${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
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" )

diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
deleted file mode 100644
index 50728ca4d60..000
--- a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
-

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: 7172498c48a46f825b62f94c6ef83f3d71bdb92b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 30 07:19:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 30 07:21:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7172498c

kde-misc/kdiff3: x86 stable wrt bug #731966

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
index 40ad600717c..678e2ab4e74 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: 2c5280728bb61b71e4be77a38cb27c55fa2a48ce
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 30 06:56:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 30 06:57:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c528072

kde-misc/kdiff3: amd64 stable wrt bug #731966

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
index 9611b4dd913..40ad600717c 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit: 3490a8cb8b1f58dadaf25feedd2cf108ec1a9dd0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 30 21:42:13 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 30 21:44:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3490a8cb

kde-misc/kdiff3: Fix HiDPI support

Closes: https://bugs.gentoo.org/723436
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch | 112 +
 kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild |  41 +
 2 files changed, 153 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch 
b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
new file mode 100644
index 000..180009afe0e
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.8.3-hidpi.patch
@@ -0,0 +1,112 @@
+From 5dcc0673c61cc75122bf5f812a45bbb15b778218 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov 
+Date: Mon, 27 Apr 2020 15:52:18 +0300
+Subject: [PATCH] Add HiDPI support
+
+* Backported to 1.8 branch
+---
+ src/Overview.cpp |  6 --
+ src/directorymergewindow.cpp | 15 +--
+ src/main.cpp |  1 +
+ src/mergeresultwindow.cpp|  7 +--
+ 4 files changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/src/Overview.cpp b/src/Overview.cpp
+index ee1d73f..ac35e7e 100644
+--- a/src/Overview.cpp
 b/src/Overview.cpp
+@@ -271,7 +271,8 @@ void Overview::paintEvent(QPaintEvent*)
+ int h = height() - 1;
+ int w = width();
+ 
+-if(m_pixmap.size() != size())
++const auto dpr = devicePixelRatioF();
++if(m_pixmap.size() != size() * dpr)
+ {
+ if(m_pOptions->m_bWordWrap)
+ {
+@@ -287,7 +288,8 @@ void Overview::paintEvent(QPaintEvent*)
+ m_nofLines = m_pDiff3LineList->size();
+ }
+ 
+-m_pixmap = QPixmap(size());
++m_pixmap = QPixmap(size() * dpr);
++m_pixmap.setDevicePixelRatio(dpr);
+ 
+ QPainter p(_pixmap);
+ p.fillRect(rect(), m_pOptions->m_bgColor);
+diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
+index 31dbcaf..1cc62b4 100644
+--- a/src/directorymergewindow.cpp
 b/src/directorymergewindow.cpp
+@@ -584,7 +584,10 @@ class DirectoryMergeWindow::DirMergeItemDelegate : public 
QStyledItemDelegate
+ //QPixmap icon = value.value(); //pixmap(column);
+ if(!icon.isNull())
+ {
+-int yOffset = (sizeHint(option, index).height() - 
icon.height()) / 2;
++const auto dpr = thePainter->device()->devicePixelRatioF();
++const int w = qRound(icon.width() / dpr);
++const int h = qRound(icon.height() / dpr);
++int yOffset = (sizeHint(option, index).height() - h) / 2;
+ thePainter->drawPixmap(x + 2, y + yOffset, icon);
+ 
+ int i = index == d->m_selection1Index ? 1 : index == 
d->m_selection2Index ? 2 : index == d->m_selection3Index ? 3 : 0;
+@@ -593,20 +596,20 @@ class DirectoryMergeWindow::DirMergeItemDelegate : 
public QStyledItemDelegate
+ Options* pOpts = d->m_pOptions;
+ QColor c(i == 1 ? pOpts->m_colorA : i == 2 ? 
pOpts->m_colorB : pOpts->m_colorC);
+ thePainter->setPen(c); // highlight() );
+-thePainter->drawRect(x + 2, y + yOffset, icon.width(), 
icon.height());
++thePainter->drawRect(x + 2, y + yOffset, w, h);
+ thePainter->setPen(QPen(c, 0, Qt::DotLine));
+-thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() 
+ 2, icon.height() + 2);
++thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 
2);
+ thePainter->setPen(Qt::white);
+ QString s(QChar('A' + i - 1));
+ 
+-thePainter->drawText(x + 2 + (icon.width() - 
Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
+-y + yOffset + (icon.height() + 
thePainter->fontMetrics().ascent()) / 2 - 1,
++thePainter->drawText(x + 2 + (w - 
Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2,
++y + yOffset + (h + 
thePainter->fontMetrics().ascent()) / 2 - 1,
+ s);
+ }
+ else
+ {
+ thePainter->setPen(m_pDMW->palette().window().color());
+-thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() 
+ 2, icon.height() + 2);
++thePainter->drawRect(x + 1, y + yOffset - 1, w + 2, h + 
2);
+ }
+ return;
+ }
+diff --git a/src/main.cpp b/src/main.cpp
+index df06eab..c62aee3 100644
+--- a/src/main.cpp
 b/src/main.cpp
+@@ -81,6 +81,7 @@ int main(int argc, char* argv[])
+ {
+

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 869a1dc32fa83625f19aaef84a9feb5f82d857ab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 25 10:02:21 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 25 10:09:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869a1dc3

kde-misc/kdiff3: 1.8.3 version bump

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.8.3.ebuild | 39 +
 2 files changed, 40 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 366962072f9..5158282ef9f 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B 
de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1
 SHA512 
c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
+DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 
43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e
 SHA512 
5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d

diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
new file mode 100644
index 000..50728ca4d60
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
+
+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/kiconthemes-${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
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 285369d6a9cc8dcc1ff00ace2e9b70560b628dbb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 10 10:48:54 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 10 11:31:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285369d6

kde-misc/kdiff3: Drop 1.8.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.8.1.ebuild | 40 -
 2 files changed, 41 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index f290dcce90e..366962072f9 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B 
cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49
 SHA512 
09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
 DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B 
de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1
 SHA512 
c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0

diff --git a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
deleted file mode 100644
index 24aa5f576d3..000
--- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
-
-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/kiconthemes-${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
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Mikle Kolyada]

commit: 79b249761610fa31664b3f1901fe3c8576f9e715
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 10 09:19:19 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 10 09:19:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b24976

kde-misc/kdiff3: x86 stable wrt bug #720178

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
index 20cbdbbca49..0659672ef39 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Mikle Kolyada]

commit: 8318cd58132f0c3881158b5abcf69015dc3c6828
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 10 09:14:53 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 10 09:15:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8318cd58

kde-misc/kdiff3: amd64 stable wrt bug #720178

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
index 114f5b83e86..20cbdbbca49 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 6e508916f3fca24315b82d24f32fd88f6256a25a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May  1 17:19:38 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  1 20:31:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e508916

kde-misc/kdiff3: Drop 1.8.2 (r0)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.2.ebuild | 40 -
 1 file changed, 40 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.2.ebuild
deleted file mode 100644
index 64b665a240e..000
--- a/kde-misc/kdiff3/kdiff3-1.8.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
-
-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/kiconthemes-${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
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 307511d8ac390a0332969963ba0196673bc7e808
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May  1 17:19:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  1 20:31:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307511d8

kde-misc/kdiff3: Fix crash when clipboard is not available

Upstream commit 643edc26bcc8f8e083a97e87c2686f62ffd01f31

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419722
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kdiff3-1.8.2-crash-w-o-clipboard.patch   | 36 +++
 kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild | 41 ++
 2 files changed, 77 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch 
b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
new file mode 100644
index 000..b1d00a12f47
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
@@ -0,0 +1,36 @@
+From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
+From: Christoph Feck 
+Date: Thu, 30 Apr 2020 18:27:58 -0400
+Subject: Fix crash when clipboard is not available
+
+Summary:
+QClipboard::mimeData() can be nullptr according to documentation.
+
+BUG: 419722
+FIXED-IN: 1.8.3
+
+Reviewers: mreeves
+
+Reviewed By: mreeves
+
+Differential Revision: https://phabricator.kde.org/D29248
+---
+ src/pdiff.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pdiff.cpp b/src/pdiff.cpp
+index f3f2284..3588e3e 100644
+--- a/src/pdiff.cpp
 b/src/pdiff.cpp
+@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
+ {
+ const QClipboard* clipboard = QApplication::clipboard();
+ const QMimeData* mimeData = clipboard->mimeData();
+-if(mimeData->hasText())
++if(mimeData && mimeData->hasText())
+ {
+ QString s = clipboard->text();
+ editPaste->setEnabled(!s.isEmpty());
+-- 
+cgit v1.1
+

diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
new file mode 100644
index 000..114f5b83e86
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
+
+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/kiconthemes-${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
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+"
+
+PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 89ad4c317f4c81a4381550476ff0c2f58acb99ae
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 28 11:53:21 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 28 11:54:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ad4c31

kde-misc/kdiff3: 1.8.2 version bump

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.8.2.ebuild | 40 +
 2 files changed, 41 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 8bdceb71985..f290dcce90e 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B 
cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49
 SHA512 
09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
+DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B 
de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1
 SHA512 
c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0

diff --git a/kde-misc/kdiff3/kdiff3-1.8.2.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.2.ebuild
new file mode 100644
index 000..64b665a240e
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/development/org.kde.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=""
+
+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/kiconthemes-${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
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 27fef4dcc08b11c52d1fed2243e7b5aa30e9
Author: Roy Bamford  gentoo  org>
AuthorDate: Tue Feb 18 11:11:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 18 20:04:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27fe

kde-misc/kdiff3: added ~arm64 keyword

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
index 28ca5b8d00f..24aa5f576d3 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Georgy Yakovlev]

commit: 65064b07bad5f82df76b472f889aecddc850e58d
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Jan 26 07:59:43 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jan 26 10:17:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65064b07

kde-misc/kdiff3: keyword on ~ppc64

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
index cdd2662525d..28ca5b8d00f 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: ec7d1a6eb18b6e5939e1ae97664d8b798be817c1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 12 11:04:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 12 11:45:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7d1a6e

kde-misc/kdiff3: Port away from kde5.eclass, update HOMEPAGE

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.1.ebuild | 40 -
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
index f78a6bf8684..cdd2662525d 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
@@ -1,34 +1,38 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3;
+HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
+https://userbase.kde.org/KDiff3;
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
+   >=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/kiconthemes-${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
 "
 RDEPEND="${DEPEND}
sys-apps/diffutils

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 2f28ec399e41bf4239e92d8ff36073823a01c796
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 19 22:00:38 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 19 22:01:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f28ec39

kde-misc/kdiff3: Drop 0.9.98_p20170219-r1

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 -
 .../files/kdiff3-0.9.98_p20170219-cli-args.patch   | 51 --
 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild  | 37 
 3 files changed, 89 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index d62ce74d89f..8bdceb71985 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B 
cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49
 SHA512 
09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
deleted file mode 100644
index 3312b504e58..000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit b849851d3317903a8ab7c040966921384d9e6508
-Author: Peter Urbanec 
-Date:   Thu May 11 16:09:12 2017 +1000
-
-Implement most of the missing command line options
-
-A number of command line options were missing, which caused kdiff3 from
-failing to work properly when used as the mergetool in git. In particular,
-git relies on the -L group of options and without those it would fail.
-
-Signed-off-by: Peter Urbanec 
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 3549c92..fed486d 100644
 a/src/main.cpp
-+++ b/src/main.cpp
-@@ -67,24 +67,23 @@ int main(int argc, char *argv[])
- 
parser.addOption(QCommandLineOption(QStringList()

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 01c2ee88e61099953c524481ab8f3159a52be0ff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 19 22:00:11 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 19 22:01:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c2ee88

kde-misc/kdiff3: 1.8.1 amd64 stable

Closes: https://bugs.gentoo.org/685956
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/kdiff3-1.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
index de882cbf3eb..f78a6bf8684 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://userbase.kde.org/KDiff3;
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 7dfb309e132a0d92166e993813bbe77d1d268daf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 18 07:14:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 18 07:14:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dfb309e

kde-misc/kdiff3: 1.8.1 version bump

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   | 2 +-
 kde-misc/kdiff3/{kdiff3-1.8.ebuild => kdiff3-1.8.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 42ba186f102..d62ce74d89f 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-1.8.tar.xz 897716 BLAKE2B 
bd5ec9ad0db639905d88429204ffca88450957f052712e45168f2d4bae808f38e7fc543bcb4ff53632c018c44929364e0314ec681f3475b517d8482b9ae5cbb5
 SHA512 
f4d791f593eb75a4a5dbd567af31f01be0a372a4058e50e8ab34b29409cc162cab022f33c1db5527f04ae9e8f35d6b485ca7789c4cd955d745887c3439172940
+DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B 
cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49
 SHA512 
09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720

diff --git a/kde-misc/kdiff3/kdiff3-1.8.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
similarity index 100%
rename from kde-misc/kdiff3/kdiff3-1.8.ebuild
rename to kde-misc/kdiff3/kdiff3-1.8.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: e3b2f6f257e8dce76032167ebf5bfebed6911c34
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 14 10:00:12 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 14 13:59:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b2f6f2

kde-misc/kdiff3: 1.8 version bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 kde-misc/kdiff3/Manifest  |  1 +
 kde-misc/kdiff3/kdiff3-1.8.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 19e4a9bf616..92c9c9a4b07 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 DIST kdiff3-1.8.0_pre20190420.tar.gz 506141 BLAKE2B 
bbeacffb4fb0cc49ff17f936fa73aca4721798c212e0534ec984ee79071990c1f59cfda6d6f32758cc24fc577c7911bd10472abfb086e6e1527ee8799dd1e0dc
 SHA512 
1923a286fff2cb884eb8f7559558e1f157afad536e7bdc47152140b420179d322d135c72e1e8be5154783d85c798e0e00ed58e7b97bb19fe41b5ee70160196f2
+DIST kdiff3-1.8.tar.xz 897716 BLAKE2B 
bd5ec9ad0db639905d88429204ffca88450957f052712e45168f2d4bae808f38e7fc543bcb4ff53632c018c44929364e0314ec681f3475b517d8482b9ae5cbb5
 SHA512 
f4d791f593eb75a4a5dbd567af31f01be0a372a4058e50e8ab34b29409cc162cab022f33c1db5527f04ae9e8f35d6b485ca7789c4cd955d745887c3439172940

diff --git a/kde-misc/kdiff3/kdiff3-1.8.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.ebuild
new file mode 100644
index 000..85263eb39db
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 00d9d65de03f84e0e46cba9272d55f060bc8951e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 14 13:59:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 14 13:59:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d9d65d

kde-misc/kdiff3: Drop old 1.8.0_pre* snapshot

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild | 39 -
 2 files changed, 40 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 92c9c9a4b07..42ba186f102 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-1.8.0_pre20190420.tar.gz 506141 BLAKE2B 
bbeacffb4fb0cc49ff17f936fa73aca4721798c212e0534ec984ee79071990c1f59cfda6d6f32758cc24fc577c7911bd10472abfb086e6e1527ee8799dd1e0dc
 SHA512 
1923a286fff2cb884eb8f7559558e1f157afad536e7bdc47152140b420179d322d135c72e1e8be5154783d85c798e0e00ed58e7b97bb19fe41b5ee70160196f2
 DIST kdiff3-1.8.tar.xz 897716 BLAKE2B 
bd5ec9ad0db639905d88429204ffca88450957f052712e45168f2d4bae808f38e7fc543bcb4ff53632c018c44929364e0314ec681f3475b517d8482b9ae5cbb5
 SHA512 
f4d791f593eb75a4a5dbd567af31f01be0a372a4058e50e8ab34b29409cc162cab022f33c1db5527f04ae9e8f35d6b485ca7789c4cd955d745887c3439172940

diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild
deleted file mode 100644
index 1fe53c0bc06..000
--- a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="5b50c4c7b0ce7d5e06287c24b6b5600b6c2d68df"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3;
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: b0bd88379cd38bb86b9a195a2feaffc0a6bcfde2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 23 18:06:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 23 20:24:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd8837

kde-misc/kdiff3: 1.8.0_pre20190420 snapshot bump

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild | 39 +
 2 files changed, 40 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 83756717027..78df42f7901 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 DIST kdiff3-1.8.0_pre20190331.tar.gz 505587 BLAKE2B 
7dbe2efc548291848d30d8889f28ccf75610c2cb88e12d918fccd524ee8619e07501788d7e103175c211000aecc7ad1a48193b40d296f9a30eefcda02b1cda34
 SHA512 
02c6840a0015f096f0f3561a0306a078508520ea09733690522f74351925a00122b78eda2886267b3b0eb3d744bcfe80b7f710164bb1f22997e0fd0814e64649
+DIST kdiff3-1.8.0_pre20190420.tar.gz 506141 BLAKE2B 
bbeacffb4fb0cc49ff17f936fa73aca4721798c212e0534ec984ee79071990c1f59cfda6d6f32758cc24fc577c7911bd10472abfb086e6e1527ee8799dd1e0dc
 SHA512 
1923a286fff2cb884eb8f7559558e1f157afad536e7bdc47152140b420179d322d135c72e1e8be5154783d85c798e0e00ed58e7b97bb19fe41b5ee70160196f2

diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild
new file mode 100644
index 000..1fe53c0bc06
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190420.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="5b50c4c7b0ce7d5e06287c24b6b5600b6c2d68df"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 7c82f36523f1661a5740f0ebed6d6f788afe99cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 23 18:07:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 23 20:24:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c82f365

kde-misc/kdiff3: Drop 1.8.0_pre20190331

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild | 39 -
 2 files changed, 40 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 78df42f7901..19e4a9bf616 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-1.8.0_pre20190331.tar.gz 505587 BLAKE2B 
7dbe2efc548291848d30d8889f28ccf75610c2cb88e12d918fccd524ee8619e07501788d7e103175c211000aecc7ad1a48193b40d296f9a30eefcda02b1cda34
 SHA512 
02c6840a0015f096f0f3561a0306a078508520ea09733690522f74351925a00122b78eda2886267b3b0eb3d744bcfe80b7f710164bb1f22997e0fd0814e64649
 DIST kdiff3-1.8.0_pre20190420.tar.gz 506141 BLAKE2B 
bbeacffb4fb0cc49ff17f936fa73aca4721798c212e0534ec984ee79071990c1f59cfda6d6f32758cc24fc577c7911bd10472abfb086e6e1527ee8799dd1e0dc
 SHA512 
1923a286fff2cb884eb8f7559558e1f157afad536e7bdc47152140b420179d322d135c72e1e8be5154783d85c798e0e00ed58e7b97bb19fe41b5ee70160196f2

diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild
deleted file mode 100644
index 437350e6feb..000
--- a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="12d54309def29c3bcb69d92e1b70540c4aa0f9cd"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3;
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 9049f550ca69b18da691c351942c9de00f5b82f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  3 15:40:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  3 16:22:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9049f550

kde-misc/kdiff3: Drop 1.8.0_pre20190322

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild | 39 -
 2 files changed, 40 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 857b72de8cb..83756717027 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-1.8.0_pre20190322.tar.gz 505531 BLAKE2B 
ee62473d80c9c2f14f77677195b9128b2a471871795815af4f9b0ceaef2d4c7650c61c3e006d2e087ca96e9f6e020dbac86eef22f9ca1451ada84b2899494859
 SHA512 
0bbd58e764076c85ade2f0c34bf2f8450fa80280cd954f699985a86c309f11666e8d0f7e9edeeea9cab81271bf6830516a50f8b222ffe5c90f54d173012eb799
 DIST kdiff3-1.8.0_pre20190331.tar.gz 505587 BLAKE2B 
7dbe2efc548291848d30d8889f28ccf75610c2cb88e12d918fccd524ee8619e07501788d7e103175c211000aecc7ad1a48193b40d296f9a30eefcda02b1cda34
 SHA512 
02c6840a0015f096f0f3561a0306a078508520ea09733690522f74351925a00122b78eda2886267b3b0eb3d744bcfe80b7f710164bb1f22997e0fd0814e64649

diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild
deleted file mode 100644
index 9cf955d9eae..000
--- a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="0caf3edb739cfcf5a57df305c6d6dec37dbc8bff"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3;
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: f2be77666bfafa103464e75c604f2ddc7d5e14d0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  3 15:39:43 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  3 16:22:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2be7766

kde-misc/kdiff3: 1.8.0_pre20190331 snapshot bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild | 39 +
 2 files changed, 40 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 121fde030b4..857b72de8cb 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 DIST kdiff3-1.8.0_pre20190322.tar.gz 505531 BLAKE2B 
ee62473d80c9c2f14f77677195b9128b2a471871795815af4f9b0ceaef2d4c7650c61c3e006d2e087ca96e9f6e020dbac86eef22f9ca1451ada84b2899494859
 SHA512 
0bbd58e764076c85ade2f0c34bf2f8450fa80280cd954f699985a86c309f11666e8d0f7e9edeeea9cab81271bf6830516a50f8b222ffe5c90f54d173012eb799
+DIST kdiff3-1.8.0_pre20190331.tar.gz 505587 BLAKE2B 
7dbe2efc548291848d30d8889f28ccf75610c2cb88e12d918fccd524ee8619e07501788d7e103175c211000aecc7ad1a48193b40d296f9a30eefcda02b1cda34
 SHA512 
02c6840a0015f096f0f3561a0306a078508520ea09733690522f74351925a00122b78eda2886267b3b0eb3d744bcfe80b7f710164bb1f22997e0fd0814e64649

diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild
new file mode 100644
index 000..437350e6feb
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190331.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="12d54309def29c3bcb69d92e1b70540c4aa0f9cd"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 8c9a1a9ed1a49152336e9dc423d33e7f70d2cc20
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 26 19:09:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 26 20:55:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9a1a9e

kde-misc/kdiff3: 1.8.0_pre20190322 snapshot bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest|  1 +
 kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild | 39 +
 2 files changed, 40 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 795f4022597..38125346760 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 DIST kdiff3-0.9.98_p20190317.tar.gz 501849 BLAKE2B 
3cfda0333293cfa032305e3431cbafb7bb66c0985c2de7ab1858e2f030b9508f4104db9148a50895db2c7eef79c758ca3e34de9fd74b10ef0aee97fd5b2498fa
 SHA512 
b9592d072f084c4fe2dbf16e33e34e93203996dfbb86229ccebac47c1f44120e3f05c11713efc27180e361c69f45a88385a2b41a88d6bac27d390a362047b47f
+DIST kdiff3-1.8.0_pre20190322.tar.gz 505531 BLAKE2B 
ee62473d80c9c2f14f77677195b9128b2a471871795815af4f9b0ceaef2d4c7650c61c3e006d2e087ca96e9f6e020dbac86eef22f9ca1451ada84b2899494859
 SHA512 
0bbd58e764076c85ade2f0c34bf2f8450fa80280cd954f699985a86c309f11666e8d0f7e9edeeea9cab81271bf6830516a50f8b222ffe5c90f54d173012eb799

diff --git a/kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild 
b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild
new file mode 100644
index 000..9cf955d9eae
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.0_pre20190322.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="0caf3edb739cfcf5a57df305c6d6dec37dbc8bff"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: f397e9bf24620fa5fe480db5ce78a238be8881fc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 26 19:10:31 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 26 20:55:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f397e9bf

kde-misc/kdiff3: Drop 0.9.98_p20190317 snapshot

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 -
 kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild | 39 --
 2 files changed, 40 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 38125346760..121fde030b4 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-0.9.98_p20190317.tar.gz 501849 BLAKE2B 
3cfda0333293cfa032305e3431cbafb7bb66c0985c2de7ab1858e2f030b9508f4104db9148a50895db2c7eef79c758ca3e34de9fd74b10ef0aee97fd5b2498fa
 SHA512 
b9592d072f084c4fe2dbf16e33e34e93203996dfbb86229ccebac47c1f44120e3f05c11713efc27180e361c69f45a88385a2b41a88d6bac27d390a362047b47f
 DIST kdiff3-1.8.0_pre20190322.tar.gz 505531 BLAKE2B 
ee62473d80c9c2f14f77677195b9128b2a471871795815af4f9b0ceaef2d4c7650c61c3e006d2e087ca96e9f6e020dbac86eef22f9ca1451ada84b2899494859
 SHA512 
0bbd58e764076c85ade2f0c34bf2f8450fa80280cd954f699985a86c309f11666e8d0f7e9edeeea9cab81271bf6830516a50f8b222ffe5c90f54d173012eb799

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild
deleted file mode 100644
index c8deed4412f..000
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="d9a7796cc8989885fec921723da0bfa88a6ae939"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3;
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: a9f589103f8c750773daa013d372185403be24ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 20 14:00:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 20 14:02:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f58910

kde-misc/kdiff3: 0.9.98_p20190317 snapshot bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 +
 kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index f1f5fbd1425..e99fcd53f34 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 DIST kdiff3-0.9.98_p20190224.tar.gz 501286 BLAKE2B 
3bb7550b2546b0e6fb57209e2954718e0b0c03fda0fa5c24ef347b16e9669ebd98cf6718a670d96aa2b36b9fee5615807b63a2d615e13e96b5ceb91de1bf
 SHA512 
a2c4aef6797593a127a2f7ffaf1fbbde45422a823902a3ab7bf32aeb7bd4216e52f223ee914f39035db2ce5ca6758e00581b228acf3dcf295e87feb3a6326419
+DIST kdiff3-0.9.98_p20190317.tar.gz 501849 BLAKE2B 
3cfda0333293cfa032305e3431cbafb7bb66c0985c2de7ab1858e2f030b9508f4104db9148a50895db2c7eef79c758ca3e34de9fd74b10ef0aee97fd5b2498fa
 SHA512 
b9592d072f084c4fe2dbf16e33e34e93203996dfbb86229ccebac47c1f44120e3f05c11713efc27180e361c69f45a88385a2b41a88d6bac27d390a362047b47f

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild
new file mode 100644
index 000..c8deed4412f
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="d9a7796cc8989885fec921723da0bfa88a6ae939"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: f7493160af6b9efeeb7649c9bba1da2a87a95988
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 20 14:01:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 20 14:02:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7493160

kde-misc/kdiff3: Drop 0.9.98_p20190224

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 -
 ...diff3-0.9.98_p20190224-clangtidy-optional.patch | 34 --
 kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild | 41 --
 3 files changed, 76 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e99fcd53f34..795f4022597 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-0.9.98_p20190224.tar.gz 501286 BLAKE2B 
3bb7550b2546b0e6fb57209e2954718e0b0c03fda0fa5c24ef347b16e9669ebd98cf6718a670d96aa2b36b9fee5615807b63a2d615e13e96b5ceb91de1bf
 SHA512 
a2c4aef6797593a127a2f7ffaf1fbbde45422a823902a3ab7bf32aeb7bd4216e52f223ee914f39035db2ce5ca6758e00581b228acf3dcf295e87feb3a6326419
 DIST kdiff3-0.9.98_p20190317.tar.gz 501849 BLAKE2B 
3cfda0333293cfa032305e3431cbafb7bb66c0985c2de7ab1858e2f030b9508f4104db9148a50895db2c7eef79c758ca3e34de9fd74b10ef0aee97fd5b2498fa
 SHA512 
b9592d072f084c4fe2dbf16e33e34e93203996dfbb86229ccebac47c1f44120e3f05c11713efc27180e361c69f45a88385a2b41a88d6bac27d390a362047b47f

diff --git 
a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
deleted file mode 100644
index a2a5f54f7d1..000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 26657d8bf425415c97801fe976939329f11c3979 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Mon, 4 Mar 2019 11:21:31 +0100
-Subject: [PATCH] Optionalise clang-tidy
-
-It should not be run as part of a standard build.

- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1d72a7..2e8bad4 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,7 @@ find_package(
- IconThemes
- )
- 
-+option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version 
>=3.6" OFF)
- 
- set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons 
KF5::Crash KF5::IconThemes )
- 
-@@ -68,7 +69,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- endif()
- 
- #new in cmake 3.6+ integrate clang-tidy
--if(NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
-+if(ENABLE_CLANG_TIDY AND NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
- find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-7" 
"clang-tidy-6.0" "clang-tidy-6" DOC "Path to clang-tidy executable")
- if(NOT CLANG_TIDY_EXE)
- message(STATUS "clang-tidy not found disabling integration.")
--- 
-2.21.0
-

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
deleted file mode 100644
index 43713fc03ec..000
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="5a8ebed6a30bba2e001fc5c5acc4f414d6405005"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3;
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-   !kde-misc/kdiff3:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
-
-S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit: 9b044400b13f99364e1e5526699dde2d46f23baa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  4 10:33:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar  4 10:35:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b044400

kde-misc/kdiff3: Disable clang-tidy for standard build

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...diff3-0.9.98_p20190224-clangtidy-optional.patch | 34 ++
 kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild |  2 ++
 2 files changed, 36 insertions(+)

diff --git 
a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
new file mode 100644
index 000..a2a5f54f7d1
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
@@ -0,0 +1,34 @@
+From 26657d8bf425415c97801fe976939329f11c3979 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 4 Mar 2019 11:21:31 +0100
+Subject: [PATCH] Optionalise clang-tidy
+
+It should not be run as part of a standard build.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1d72a7..2e8bad4 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -50,6 +50,7 @@ find_package(
+ IconThemes
+ )
+ 
++option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version 
>=3.6" OFF)
+ 
+ set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons 
KF5::Crash KF5::IconThemes )
+ 
+@@ -68,7 +69,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ endif()
+ 
+ #new in cmake 3.6+ integrate clang-tidy
+-if(NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
++if(ENABLE_CLANG_TIDY AND NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
+ find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-7" 
"clang-tidy-6.0" "clang-tidy-6" DOC "Path to clang-tidy executable")
+ if(NOT CLANG_TIDY_EXE)
+ message(STATUS "clang-tidy not found disabling integration.")
+-- 
+2.21.0
+

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
index 13049219f43..43713fc03ec 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
@@ -36,4 +36,6 @@ RDEPEND="${DEPEND}
!kde-misc/kdiff3:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
+
 S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 4d2b3a2e0df863a92e3d96cef6ed5d38e952803f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  3 13:49:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar  3 15:27:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2b3a2e

kde-misc/kdiff3: Re-add kde project

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index 7d273a80ff6..a964a720b98 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -5,4 +5,8 @@
voyag...@gentoo.org
Bernard Cafarelli

+   
+   k...@gentoo.org
+   Gentoo KDE Project
+   
 

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 21208f8aeace18f4bb754efc4785654461ecb629
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  3 13:48:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar  3 15:27:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21208f8a

kde-misc/kdiff3: Add 0.9.98_p20190224 snapshot, EAPI-7 bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/kdiff3/Manifest   |  1 +
 kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e1f0154631f..f1f5fbd1425 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 
6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927
 SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
+DIST kdiff3-0.9.98_p20190224.tar.gz 501286 BLAKE2B 
3bb7550b2546b0e6fb57209e2954718e0b0c03fda0fa5c24ef347b16e9669ebd98cf6718a670d96aa2b36b9fee5615807b63a2d615e13e96b5ceb91de1bf
 SHA512 
a2c4aef6797593a127a2f7ffaf1fbbde45422a823902a3ab7bf32aeb7bd4216e52f223ee914f39035db2ce5ca6758e00581b228acf3dcf295e87feb3a6326419

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
new file mode 100644
index 000..13049219f43
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="5a8ebed6a30bba2e001fc5c5acc4f414d6405005"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   sys-apps/diffutils
+   !kde-misc/kdiff3:4
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: f00fccdfe1cd297458d771d18679fb1fba4b6750
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 24 13:01:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 24 13:10:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00fccdf

kde-misc/kdiff3: Drop obsolete remote-id from metadata-xml

No longer a sourceforge project.

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 kde-misc/kdiff3/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index d87d3af8d71..7d273a80ff6 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -5,7 +5,4 @@
voyag...@gentoo.org
Bernard Cafarelli

-   
-   kdiff3
-   
 

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/krcstat/, kde-misc/akonadi-ews/, ...

[Michał Górny]

commit: 65553177fcfb77a55afb896d34e05d5ef17a4c86
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 10 09:38:50 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 10 09:42:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65553177

kde-misc/*: Update Manifest hashes

 kde-misc/akonadi-ews/Manifest| 2 +-
 kde-misc/basket/Manifest | 2 +-
 kde-misc/colord-kde/Manifest | 2 +-
 kde-misc/gmailfeed/Manifest  | 2 +-
 kde-misc/kanyremote/Manifest | 2 +-
 kde-misc/kdeconnect/Manifest | 4 ++--
 kde-misc/kdiff3/Manifest | 2 +-
 kde-misc/kdirstat/Manifest   | 2 +-
 kde-misc/kimtoy/Manifest | 2 +-
 kde-misc/kio-gdrive/Manifest | 4 ++--
 kde-misc/kio-gopher/Manifest | 2 +-
 kde-misc/kio-locate/Manifest | 2 +-
 kde-misc/kio-stash/Manifest  | 2 +-
 kde-misc/kmarkdownwebview/Manifest   | 4 ++--
 kde-misc/kolor-manager/Manifest  | 2 +-
 kde-misc/kopete-antispam/Manifest| 2 +-
 kde-misc/kopete-thinklight/Manifest  | 2 +-
 kde-misc/krcstat/Manifest| 2 +-
 kde-misc/krename/Manifest| 2 +-
 kde-misc/krusader/Manifest   | 2 +-
 kde-misc/kshutdown/Manifest  | 4 ++--
 kde-misc/ktexteditorpreviewplugin/Manifest   | 2 +-
 kde-misc/ktoshiba/Manifest   | 2 +-
 kde-misc/kwebkitpart/Manifest| 2 +-
 kde-misc/latte-dock/Manifest | 4 ++--
 kde-misc/openofficeorg-thumbnail/Manifest| 2 +-
 kde-misc/plasma-applet-network-monitor/Manifest  | 2 +-
 kde-misc/plasma-applet-redshift-control/Manifest | 2 +-
 kde-misc/plasma-applet-weather-widget/Manifest   | 2 +-
 kde-misc/rsibreak/Manifest   | 2 +-
 kde-misc/skanlite/Manifest   | 2 +-
 kde-misc/systemd-kcm/Manifest| 2 +-
 kde-misc/wacomtablet/Manifest| 4 ++--
 kde-misc/yakuake/Manifest| 2 +-
 kde-misc/zanshin/Manifest| 2 +-
 35 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/kde-misc/akonadi-ews/Manifest b/kde-misc/akonadi-ews/Manifest
index c1516f970a7..f6b6dc1f79f 100644
--- a/kde-misc/akonadi-ews/Manifest
+++ b/kde-misc/akonadi-ews/Manifest
@@ -1 +1 @@
-DIST akonadi-ews-0.8.1.tar.gz 143994 SHA256 
855a6b2ae38e75fa9d9f9400ec91fb74f093940648ae61a0b6a9f2d66eee3caa SHA512 
dd9ce54cfde2fbba2d64fd3112581d63985cc05156abb859368d6337e711755d362f5935295c1ce7bbd7d6a2a4c471bce02449a8583d1c09cc384bee279ffd89
 WHIRLPOOL 
8545ff9bd95d81a902f935a514b1e89637f68f2bf06f8e0d3dac6fa2106d45b75122a1c850de22fc26b0d38b5ba16603e80703188c16947f03db87882d070901
+DIST akonadi-ews-0.8.1.tar.gz 143994 BLAKE2B 
1801e43b31782b7bc37b49fd4d3c96714ff88df66fd66b6a68d39180b71395e16f2d637fb1275392e7831909ff302764879c17bb0d6012dc1e68b09ac80ab0dd
 SHA512 
dd9ce54cfde2fbba2d64fd3112581d63985cc05156abb859368d6337e711755d362f5935295c1ce7bbd7d6a2a4c471bce02449a8583d1c09cc384bee279ffd89

diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 88d490e105c..790e94a6b8d 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1 +1 @@
-DIST basket-2.49a_p20170225.tar.gz 4680129 SHA256 
860de00d0287ad4527b6b996e1eb6dc48ff1ea42424059df9bec347813080d49 SHA512 
87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
 WHIRLPOOL 
7ce54ac0c57728fc8a54e333b3457c7bee7870e13a298b8ac9c2dbe8019bd53e7c2e81e45c8e113142532d90b7d5b17f6d9d56f9354a0ed21ff7e23ff70dfe21
+DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B 
f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989
 SHA512 
87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c

diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index aa53692e874..cd71911abb8 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1 +1 @@
-DIST colord-kde-0.5.0.tar.xz 97572 SHA256 
6c545009af737ad67900e4d8549086bc65b979c799b2402871bba44addb52d2f SHA512 
f285931f0f97462fcf173f64aaf2f32752bddb0b724d2055055ce5beb7dbe89ccebc62cb8c2ce455a8d68beb737fd55bf89be8e4dc7eaa37f09878b757370f07
 WHIRLPOOL 
4dc42e0378caded5277f665e3ee79b6f38f91ec97c37cf10f022d02e20b470b785c07a59ca02cc2918b8dfebc47bd9c0d8a644572b91e6ad00decd10e0e3291f
+DIST colord-kde-0.5.0.tar.xz 97572 BLAKE2B 
7cb5434c25e576c98e2ffbf428bf81d37605fd489199bacc2c040d443021f1f1055b3640f2698b622b021e34f4c517e168a45cd2c1006fdc2c24590789b482e3
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Johannes Huber]

commit: f776830f77066d0e39ebb191869429b9916cf86e
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Sep 15 19:04:41 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Sep 15 19:04:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f776830f

kde-misc/kdiff3: Drop slot 4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-misc/kdiff3/Manifest|  1 -
 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 48 -
 2 files changed, 49 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 5c0a801aaff..2b2a91ba132 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 
802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 
867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6
 WHIRLPOOL 
4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 SHA256 
ed764a5380818424b629e6474eb24e7c4dd2d8af3b443caeb15761908918e97e SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 WHIRLPOOL 
1916fe160b98659dac3b9e9962aba3fdfe9f46a602c3eaa56be59bda9caac572ad612fbac4106b07f6bdb288a4b2ba95e0d53e48431d63beb6bbcd2fb5358472

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
deleted file mode 100644
index 3490fd344f0..000
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt/KDE based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="qt5"
-
-DEPEND="
-   !qt5? ( dev-qt/qtcore:4
-   dev-qt/qtgui:4 )
-   qt5? ( dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5 )
-"
-RDEPEND="${DEPEND}
-   sys-apps/diffutils
-"
-
-RESTRICT="test"
-
-src_prepare() {
-   default
-   # adapt to Gentoo paths
-   sed -e s,documentation.path.*$,documentation.path\ =\ 
"${EPREFIX}"/usr/share/doc/"${PF}", \
-   -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, -i 
src-QT4/kdiff3.pro || die
-}
-
-src_configure() {
-   if ! use qt5; then
-   eqmake4 "${S}"/src-QT4/kdiff3.pro
-   else
-   eqmake5 "${S}"/src-QT4/kdiff3.pro
-   fi
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-}

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Michał Górny]

commit: 602982f3512e5e0058bb202f2c576b7932caf15a
Author: Francesco Turco  fastmail  fm>
AuthorDate: Sun Sep  3 16:16:55 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  6 20:58:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602982f3

kde-misc/kdiff3: use HTTPS for links to dev.gentoo.org

 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
index 85071b00c2d..3e8593f0cfe 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 DESCRIPTION="Frontend to diff3 based on Qt/KF5"
 HOMEPAGE="http://kdiff3.sourceforge.net/
 https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5;
-SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: a6c0c2f43a3e498095a6194f163da2aab2a198e9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  3 09:24:50 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 09:27:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c0c2f4

kde-misc/kdiff3: Drop USE=debug,handbook,kde,qt4

kde-frameworks/kdelibs is deprecated and going to be removed.
Plasma users are served well by the kf5-based snapshot, everyone else
probably does not care about USE=kde in this version of kdiff3 anymore.

- Remove obsolete REQUIRED_USE
- Bump to EAPI 6
- Drop kde4-base.eclass
- sed in place and add missing || die

KDE_LINGUAS and USE=handbook only ever worked with USE=kde enabled.
The remaining bits and pieces install exactly as USE=-kde did before.

Gentoo-bug: 629018
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 89 +++--
 1 file changed, 18 insertions(+), 71 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 56c3427c41e..3490fd344f0 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -1,101 +1,48 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} != ** ]]; then
-   KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et 
fr ga
-   gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw 
sk
-   sv ta tg tr ug uk zh_CN zh_TW"
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-   KEYWORDS="amd64 x86 ~amd64-linux"
-   KDE_HANDBOOK="optional"
-else
-   KEYWORDS=""
-fi
-
-KDE_REQUIRED="optional"
-inherit kde4-base qmake-utils
+inherit qmake-utils
 
 DESCRIPTION="Qt/KDE based frontend to diff3"
 HOMEPAGE="http://kdiff3.sourceforge.net/;
-EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" )
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="debug kde +qt4 qt5"
-
-REQUIRED_USE="kde? ( qt4 )
-   ^^ ( qt4 qt5 )"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE="qt5"
 
-CDEPEND="
-   qt4? ( dev-qt/qtcore:4
+DEPEND="
+   !qt5? ( dev-qt/qtcore:4
dev-qt/qtgui:4 )
qt5? ( dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5 )
-   kde? ( kde-frameworks/kdelibs:4 )
-"
-DEPEND="${CDEPEND}
-   sys-devel/gettext
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
sys-apps/diffutils
 "
 
-RESTRICT="!kde? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
-
-src_unpack(){
-   if [[ ${PV} == ** ]]; then
-   git-r3_src_unpack
-   mv "${S}"/${PN}/* "${S}" || die
-   else
-   default
-   fi
-}
+RESTRICT="test"
 
 src_prepare() {
-   if ! use kde; then
-   # adapt to Gentoo paths
-   sed -e s,documentation.path.*$,documentation.path\ =\ 
"${EPREFIX}"/usr/share/doc/"${PF}", \
-   -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
-   "${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
-   else
-   kde4-base_src_prepare
-   fi
+   default
+   # adapt to Gentoo paths
+   sed -e s,documentation.path.*$,documentation.path\ =\ 
"${EPREFIX}"/usr/share/doc/"${PF}", \
+   -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, -i 
src-QT4/kdiff3.pro || die
 }
 
 src_configure() {
-   if use kde; then
-   kde4-base_src_configure
-   elif use qt4; then
-   eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
+   if ! use qt5; then
+   eqmake4 "${S}"/src-QT4/kdiff3.pro
else
-   eqmake5 "${S}"/src-QT4/kdiff3_fixed.pro
-   fi
-}
-
-src_compile() {
-   if use kde; then
-   kde4-base_src_compile
-   else
-   default
+   eqmake5 "${S}"/src-QT4/kdiff3.pro
fi
 }
 
 src_install() {
-   if use kde; then
-   kde4-base_src_install
-   else
-   emake INSTALL_ROOT="${D}" install
-   fi
-}
-
-src_test() {
-   if use kde; then
-   kde4-base_src_test
-   fi
+   emake INSTALL_ROOT="${D}" install
 }

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/files/, kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: b69e33fd1b39328198edfb12bc3dcdce0addd30f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  3 09:26:20 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 09:27:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b69e33fd

kde-misc/kdiff3: Drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-misc/kdiff3/Manifest   |  1 -
 .../kdiff3/files/kdiff3-0.9.97-relativepath.patch  | 66 ---
 .../files/kdiff3-0.9.98-kdelibs-4.14.11.patch  | 12 ---
 kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild| 95 --
 4 files changed, 174 deletions(-)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 16f3d816b47..5c0a801aaff 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,2 @@
-DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 
e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 
8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab
 WHIRLPOOL 
190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 
802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 
867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6
 WHIRLPOOL 
4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 SHA256 
ed764a5380818424b629e6474eb24e7c4dd2d8af3b443caeb15761908918e97e SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 WHIRLPOOL 
1916fe160b98659dac3b9e9962aba3fdfe9f46a602c3eaa56be59bda9caac572ad612fbac4106b07f6bdb288a4b2ba95e0d53e48431d63beb6bbcd2fb5358472

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
deleted file mode 100644
index f0f43e8a8f1..000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
 a/kdiff3/src-QT4/fileaccess.cpp
-+++ b/kdiff3/src-QT4/fileaccess.cpp
-@@ -183,7 +183,8 @@
- 
- void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
- {
--   m_filePath   = nicePath( fi.filePath() ); // remove "./" at start   
-+   m_filePath   = pParent == 0 ? fi.absoluteFilePath() : 
-+ nicePath( fi.filePath() ); // remove "./" at 
start   
- 
-m_bSymLink   = fi.isSymLink();
-if ( m_bSymLink || (!m_bExists  && m_filePath.contains("@@") ) )
-@@ -566,7 +567,16 @@
-if ( parent() != 0 )
-   return parent()->absoluteFilePath() + "/" + m_filePath;
-else
--  return m_filePath;
-+   {
-+  if ( m_filePath.isEmpty() )
-+   return QString();
-+  
-+  QFileInfo fi( m_filePath );
-+  if ( fi.isAbsolute() )
-+   return m_filePath;
-+  else
-+   return fi.absoluteFilePath(); // Probably never reached
-+   }
- }  // Full abs path
- 
- // Just the name-part of the path, without parent directories
-@@ -1184,7 +1194,7 @@
-   m_bSuccess = false;
-   KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, 
permissions, KIO::HideProgressInfo );
-   connect( pJob, SIGNAL(result(KJob*)), this, 
SLOT(slotSimpleJobResult(KJob*)));
--  connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, 
SLOT(slotPercent(KJob*, unsigned long)));
-+  connect( pJob, SIGNAL(percent(KJob*,unsigned long)), , 
SLOT(slotPercent(KJob*, unsigned long)));
- 
-   ProgressProxy::enterEventLoop( pJob,
-  i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) 
);
-@@ -1673,7 +1683,7 @@
-   ,  SLOT( slotListDirInfoMessage(KJob*, const 
QString&) ));
- 
-  // This line makes the transfer via fish unreliable.:-(
-- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, 
SLOT(slotPercent(KJob*, unsigned long)));
-+ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), , 
SLOT(slotPercent(KJob*, unsigned long)));
- 
-  ProgressProxy::enterEventLoop( pListJob,
- i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
-
-kdiff3/src-QT4/kdiff3.cpp Diff
-
 a/kdiff3/src-QT4/kdiff3.cpp
-+++ b/kdiff3/src-QT4/kdiff3.cpp
-@@ -211,6 +211,8 @@
-   m_outputFilename = args->getOption("output");
-   if ( m_outputFilename.isEmpty() )
-  m_outputFilename = args->getOption("out");
-+  if ( ! m_outputFilename.isEmpty() )
-+ m_outputFilename = FileAccess( m_outputFilename, true 
).absoluteFilePath();
-}
- 
-m_bAutoFlag = args!=0  && args->isSet("auto");
-
-

diff --git 

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: 02f7c7a0b50dbe1d5d54cccddcc8d3ee010bd4f4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 15 09:53:53 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 15 09:53:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f7c7a0

kde-misc/kdiff3: x86 stable wrt bug #621398

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
index 78abba11b28..85071b00c2d 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
@@ -11,7 +11,7 @@ 
https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5;
 SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Agostino Sarubbo]

commit: 5298ef9fc2f69589b1f742525b33a3da9d05ea3a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 14 07:49:03 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 14 07:49:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5298ef9f

kde-misc/kdiff3: amd64 stable wrt bug #621398

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
index 04a916f8c4b..78abba11b28 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
@@ -11,7 +11,7 @@ 
https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5;
 SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Andreas Sturmlechner]

commit: 0f8be8520d3495bd57ed7638671d288c8855cea9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 14 10:00:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 14 10:13:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8be852

kde-misc/kdiff3: Fix missing cli options

Thanks-to: Peter Urbanec  urbanec.net>
Gentoo-bug: 546494

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../files/kdiff3-0.9.98_p20170219-cli-args.patch   | 51 ++
 kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild  | 37 
 2 files changed, 88 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
new file mode 100644
index 000..3312b504e58
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
@@ -0,0 +1,51 @@
+commit b849851d3317903a8ab7c040966921384d9e6508
+Author: Peter Urbanec 
+Date:   Thu May 11 16:09:12 2017 +1000
+
+Implement most of the missing command line options
+
+A number of command line options were missing, which caused kdiff3 from
+failing to work properly when used as the mergetool in git. In particular,
+git relies on the -L group of options and without those it would fail.
+
+Signed-off-by: Peter Urbanec 
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 3549c92..fed486d 100644
+--- a/src/main.cpp
 b/src/main.cpp
+@@ -67,24 +67,23 @@ int main(int argc, char *argv[])
+ 
parser.addOption(QCommandLineOption(QStringList()<show();

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
new file mode 100644
index 000..04a916f8c4b
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 4e04f51ea82a659268879a5d231ee22269d4bc70
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 14 10:01:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 14 10:13:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e04f51e

kde-misc/kdiff3: Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild | 34 --
 1 file changed, 34 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild
deleted file mode 100644
index eb5269e1c4f..000
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on Qt/KF5"
-HOMEPAGE="http://kdiff3.sourceforge.net/;
-SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-   !kde-misc/kdiff3:4
-   sys-apps/diffutils
-"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit: 5bd3a116d3ea7d8388b1e6dfdbbacc672ba2e4b2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 10 00:20:31 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  6 21:29:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd3a116

kde-misc/kdiff3: Add 0.9.98_p20170219 KF5-based snapshot

Snapshot from git://anongit.kde.org/scratch/thomasfischer/kdiff3
+refs/heads/kf5

Gentoo-bug: 579678

Package-Manager: portage-2.3.0

 kde-misc/kdiff3/Manifest   |  1 +
 kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild | 34 ++
 2 files changed, 35 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index a06addf167e..16f3d816b47 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,3 @@
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 
e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 
8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab
 WHIRLPOOL 
190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 
802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 
867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6
 WHIRLPOOL 
4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98
+DIST kdiff3-0.9.98_p20170219.tar.xz 798588 SHA256 
ed764a5380818424b629e6474eb24e7c4dd2d8af3b443caeb15761908918e97e SHA512 
847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 WHIRLPOOL 
1916fe160b98659dac3b9e9962aba3fdfe9f46a602c3eaa56be59bda9caac572ad612fbac4106b07f6bdb288a4b2ba95e0d53e48431d63beb6bbcd2fb5358472

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild
new file mode 100644
index 000..eb5269e1c4f
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Frontend to diff3 based on Qt/KF5"
+HOMEPAGE="http://kdiff3.sourceforge.net/;
+SRC_URI="http://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+   !kde-misc/kdiff3:4
+   sys-apps/diffutils
+"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/

[Michael Palimaka]

commit: b2abe5f8a5fbf2fa50bf9be77f4352fa499f7949
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jul 20 20:01:35 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 20 20:03:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2abe5f8

kde-misc/kdiff3: drop kde project

Package-Manager: portage-2.3.0

 kde-misc/kdiff3/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index 296c28a..d87d3af 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -5,10 +5,6 @@
voyag...@gentoo.org
Bernard Cafarelli

-   
-   k...@gentoo.org
-   Gentoo KDE Project
-   

kdiff3

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

[Michael Palimaka]

commit: e5a0398b8ea72f146c06a4b208ceef93587352a5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jul 20 19:58:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 20 20:03:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a0398b

kde-misc/kdiff3: restore 0.9.97-r2

This reverts commit 047c73f0b2503ad56a6de2ef46ec6b2df727d94b.

Gentoo-bug: 546494

 kde-misc/kdiff3/Manifest   |  1 +
 .../kdiff3/files/kdiff3-0.9.97-relativepath.patch  | 66 +++
 kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild| 96 ++
 3 files changed, 163 insertions(+)

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index dc41d54..a06addf 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1 +1,2 @@
+DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 
e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 
8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab
 WHIRLPOOL 
190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 
802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 
867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6
 WHIRLPOOL 
4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch 
b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
new file mode 100644
index 000..f0f43e8
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch
@@ -0,0 +1,66 @@
+
+
+--- a/kdiff3/src-QT4/fileaccess.cpp
 b/kdiff3/src-QT4/fileaccess.cpp
+@@ -183,7 +183,8 @@
+ 
+ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
+ {
+-   m_filePath   = nicePath( fi.filePath() ); // remove "./" at start   
++   m_filePath   = pParent == 0 ? fi.absoluteFilePath() : 
++ nicePath( fi.filePath() ); // remove "./" at 
start   
+ 
+m_bSymLink   = fi.isSymLink();
+if ( m_bSymLink || (!m_bExists  && m_filePath.contains("@@") ) )
+@@ -566,7 +567,16 @@
+if ( parent() != 0 )
+   return parent()->absoluteFilePath() + "/" + m_filePath;
+else
+-  return m_filePath;
++   {
++  if ( m_filePath.isEmpty() )
++   return QString();
++  
++  QFileInfo fi( m_filePath );
++  if ( fi.isAbsolute() )
++   return m_filePath;
++  else
++   return fi.absoluteFilePath(); // Probably never reached
++   }
+ }  // Full abs path
+ 
+ // Just the name-part of the path, without parent directories
+@@ -1184,7 +1194,7 @@
+   m_bSuccess = false;
+   KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, 
permissions, KIO::HideProgressInfo );
+   connect( pJob, SIGNAL(result(KJob*)), this, 
SLOT(slotSimpleJobResult(KJob*)));
+-  connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, 
SLOT(slotPercent(KJob*, unsigned long)));
++  connect( pJob, SIGNAL(percent(KJob*,unsigned long)), , 
SLOT(slotPercent(KJob*, unsigned long)));
+ 
+   ProgressProxy::enterEventLoop( pJob,
+  i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) 
);
+@@ -1673,7 +1683,7 @@
+   ,  SLOT( slotListDirInfoMessage(KJob*, const 
QString&) ));
+ 
+  // This line makes the transfer via fish unreliable.:-(
+- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, 
SLOT(slotPercent(KJob*, unsigned long)));
++ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), , 
SLOT(slotPercent(KJob*, unsigned long)));
+ 
+  ProgressProxy::enterEventLoop( pListJob,
+ i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
+
+kdiff3/src-QT4/kdiff3.cpp Diff
+
+--- a/kdiff3/src-QT4/kdiff3.cpp
 b/kdiff3/src-QT4/kdiff3.cpp
+@@ -211,6 +211,8 @@
+   m_outputFilename = args->getOption("output");
+   if ( m_outputFilename.isEmpty() )
+  m_outputFilename = args->getOption("out");
++  if ( ! m_outputFilename.isEmpty() )
++ m_outputFilename = FileAccess( m_outputFilename, true 
).absoluteFilePath();
+}
+ 
+m_bAutoFlag = args!=0  && args->isSet("auto");
+
+

diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild 
b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
new file mode 100644
index 000..941e98f
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} != ** ]]; then
+   KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et 
fr ga
+   gl hi hne hr hu is it ja ka