[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: cf336d57503e67447129f1a3747bb474c2513094
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 3 12:54:34 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 3 12:54:34 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf336d57
kde-misc/kdiff3: Port to KF6
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-misc/kdiff3/kdiff3-.ebuild | 34 +-
kde-misc/kdiff3/metadata.xml | 1 +
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index c14f073c9c..34fb160506 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -4,43 +4,43 @@
EAPI=8
ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=6.0.0
+QTMIN=6.6.2
inherit ecm kde.org
DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3;
LICENSE="GPL-2"
-SLOT="5"
+SLOT="0"
KEYWORDS=""
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
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
"
RDEPEND="${COMMON_DEPEND}
+ !${CATEGORY}/${PN}:5
sys-apps/diffutils
"
src_configure() {
local mycmakeargs=(
- -DBUILD_WITH_QT6=OFF
+ -DBUILD_WITH_QT6=ON
+ # TODO: -DENABLE_GDBINDEX?
)
ecm_src_configure
}
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index ce2a339150..b100fbb81d 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -11,5 +11,6 @@
https://bugs.kde.org/
+ sdk/kdiff3
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: ab170b1365c0ffd0f818a7e70ed57b05589e6840
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 9 09:48:34 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 9 12:52:38 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab170b13
kde-misc/kdiff3: Make sure we don't build against Qt6
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-misc/kdiff3/kdiff3-.ebuild | 7 +++
1 file changed, 7 insertions(+)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index d8bee5ee9a..d7952caa80 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -38,3 +38,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
sys-apps/diffutils
"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_QT6=OFF
+ )
+ ecm_src_configure
+}
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 7f0167f0c11504404cdbb83a6859d9589ed04a84
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 4 18:47:51 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 4 18:47:51 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f0167f0
kde-misc/kdiff3: Drop 1.9.3, moved to Gentoo ebuild repo
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-misc/kdiff3/kdiff3-1.9.3.ebuild | 41 -
1 file changed, 41 deletions(-)
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 d7f3785a05..00
--- 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] proj/kde:master commit in: kde-misc/kdiff3/
commit: 95b9d2cc5d5c41bddd07a3199ac5ab57434f9c30
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 21 13:36:19 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 21 13:51:36 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=95b9d2cc
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/kdiff3-1.9.3.ebuild | 41 +
1 file changed, 41 insertions(+)
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 00..d7f3785a05
--- /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] proj/kde:master commit in: kde-misc/kdiff3/
commit: dcfc93f241e7a677ad3a200ef1632e0eabbe1c4d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 14 11:08:10 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 14 11:14:55 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dcfc93f2 kde-misc/kdiff3: Set VIRTUALX_REQUIRED="test" Bug: 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-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-misc/kdiff3/kdiff3-.ebuild b/kde-misc/kdiff3/kdiff3-.ebuild index e0b2352524..a36d72a44d 100644 --- a/kde-misc/kdiff3/kdiff3-.ebuild +++ b/kde-misc/kdiff3/kdiff3-.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] proj/kde:master commit in: kde-misc/kdiff3/
commit: d06051407bbfb8b325e27f004222b68fe7deba66
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri May 14 20:56:05 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri May 14 20:56:05 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d0605140
kde-misc/kdiff3: Update HOMEPAGE, drop unused DEPEND
Upstream commit 99f349270a46b8a7b1a81f02595dfd157dc3b14e
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-misc/kdiff3/kdiff3-.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index 39dc95cbaf..e0b2352524 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -9,7 +9,7 @@ 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;
+HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3;
LICENSE="GPL-2"
SLOT="5"
@@ -25,7 +25,6 @@ COMMON_DEPEND="
>=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
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: c3723e81c0561db436359448f071e40e76e21332
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 24 16:25:42 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 24 16:25:42 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3723e81
kde-misc/kdiff3: Add new DEPEND
Upstream commit 1a188bf350655b4999e0e4fa793a1637f9627cba
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-misc/kdiff3/kdiff3-.ebuild | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index 4e9dc77b18..622ae35d39 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-DEPEND="
+COMMON_DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -33,6 +33,9 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
sys-apps/diffutils
"
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 2d0da3b014ec1e96e944ec3ebaa78077fae4ab9d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri May 1 17:13:39 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri May 1 22:37:56 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d0da3b0
kde-misc/kdiff3: Drop obsolete blocker
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-misc/kdiff3/kdiff3-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index f2152de967..4e9dc77b18 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -35,5 +35,4 @@ DEPEND="
"
RDEPEND="${DEPEND}
sys-apps/diffutils
- !kde-misc/kdiff3:4
"
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 1719122bbb5e39a2332a30b48b07dab043583788 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 30 20:51:49 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 30 20:51:49 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1719122b kde-misc/kdiff3: Set KDE_HANDBOOK to optional Upstream commit 1ef6d9780b2ec112d902ad7dcbf928ab6534d24f Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/kdiff3/kdiff3-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-misc/kdiff3/kdiff3-.ebuild b/kde-misc/kdiff3/kdiff3-.ebuild index c515855076..9d64282038 100644 --- a/kde-misc/kdiff3/kdiff3-.ebuild +++ b/kde-misc/kdiff3/kdiff3-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" +KDE_HANDBOOK="optional" inherit kde5 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 71257db1df7df3517eb5b91063391eeb8b6d1817 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 3 13:49:15 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 3 13:49:15 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=71257db1 kde-misc/kdiff3: Add missing DEPEND Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/kdiff3/kdiff3-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-misc/kdiff3/kdiff3-.ebuild b/kde-misc/kdiff3/kdiff3-.ebuild index 06c6bc40b1..c515855076 100644 --- a/kde-misc/kdiff3/kdiff3-.ebuild +++ b/kde-misc/kdiff3/kdiff3-.ebuild @@ -22,6 +22,7 @@ DEPEND=" $(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)
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 0210a53ae2e61bd69306afe834fb803050a54838
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 15 00:32:30 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 15 00:32:39 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0210a53a
kde-misc/kdiff3: Moved back to KDE infrastructure
Package-Manager: Portage-2.3.24, Repoman-2.3.6
kde-misc/kdiff3/kdiff3-.ebuild | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index 59e202dc93..ece8530a13 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -3,17 +3,17 @@
EAPI=6
+KDE_HANDBOOK="forceoptional"
inherit kde5
-DESCRIPTION="Frontend to diff3 based on Qt/KF5"
-HOMEPAGE="https://gitlab.com/tfischer/kdiff3.git;
-EGIT_REPO_URI="https://gitlab.com/tfischer/${PN}.git;
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KDiff3;
LICENSE="GPL-2"
KEYWORDS=""
IUSE=""
-CDEPEND="
+DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
@@ -28,10 +28,7 @@ CDEPEND="
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtwidgets)
"
-DEPEND="${CDEPEND}
- sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
sys-apps/diffutils
!kde-misc/kdiff3:4
"
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 9f71c6dda6234cb8584c90e6bc23ee504c78b877
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 9 19:10:18 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 9 19:10:18 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f71c6dd
kde-misc/kdiff3: HOMEPAGE, EGIT_REPO_URI moved to gitlab
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-misc/kdiff3/kdiff3-.ebuild | 15 ++-
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index e8e02e5a99..e7d24dedc3 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -3,12 +3,11 @@
EAPI=6
-EGIT_BRANCH="kf5"
inherit kde5
DESCRIPTION="Frontend to diff3 based on Qt/KF5"
-HOMEPAGE="http://kdiff3.sourceforge.net/;
-EGIT_REPO_URI="https://anongit.kde.org/scratch/thomasfischer/${PN};
+HOMEPAGE="https://gitlab.com/tfischer/kdiff3.git;
+EGIT_REPO_URI="https://gitlab.com/tfischer/${PN}.git;
LICENSE="GPL-2"
KEYWORDS=""
@@ -25,7 +24,6 @@ CDEPEND="
$(add_frameworks_dep kparts)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtcore)
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtwidgets)
@@ -37,12 +35,3 @@ RDEPEND="${CDEPEND}
sys-apps/diffutils
!kde-misc/kdiff3:4
"
-
-src_unpack(){
- if [[ ${KDE_BUILD_TYPE} = live ]]; then
- git-r3_src_unpack
- mv "${S}"/${PN}/* "${S}" || die
- else
- kde5_src_unpack
- fi
-}
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: 7e3db22e7bc79465ab5925a4e749fae15644f298 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 15 22:48:46 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 15 22:48:46 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e3db22e kde-misc/kdiff3: Add missing dependency Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-misc/kdiff3/kdiff3-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-misc/kdiff3/kdiff3-.ebuild b/kde-misc/kdiff3/kdiff3-.ebuild index 86a2233a4e..e8e02e5a99 100644 --- a/kde-misc/kdiff3/kdiff3-.ebuild +++ b/kde-misc/kdiff3/kdiff3-.ebuild @@ -18,6 +18,7 @@ CDEPEND=" $(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)
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
commit: a6bdd8040ffd4690e48baf52c8fddc6551c30159
Author: Johannes Huber gentoo org>
AuthorDate: Wed Mar 30 18:23:38 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Mar 30 18:24:34 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6bdd804
kde-misc/kdiff3: KF5, EAPI 6
Package-Manager: portage-2.2.28
kde-misc/kdiff3/kdiff3-.ebuild | 92 ++
1 file changed, 23 insertions(+), 69 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index 94b3f55..a4835f6 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -2,93 +2,47 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-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 ~ppc ~x86 ~amd64-linux"
- KDE_HANDBOOK="optional"
-else
- KEYWORDS=""
-fi
+EGIT_BRANCH="kf5"
+inherit kde5
-KDE_REQUIRED="optional"
-inherit kde4-base qt4-r2
-
-DESCRIPTION="Qt/KDE based frontend to diff3"
+DESCRIPTION="Frontend to diff3 based on Qt/KF5"
HOMEPAGE="http://kdiff3.sourceforge.net/;
-EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" )
+EGIT_REPO_URI="git://anongit.kde.org/scratch/thomasfischer/${PN}"
LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug kde"
+KEYWORDS=""
+IUSE=""
CDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- kde? ( $(add_kdebase_dep kdelibs) )
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(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 qtcore)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwidgets)
"
DEPEND="${CDEPEND}
sys-devel/gettext
"
RDEPEND="${CDEPEND}
sys-apps/diffutils
+ !kde-misc/kdiff3:4
"
-RESTRICT="!kde? ( test )"
-
src_unpack(){
- if [[ ${PV} == ** ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
git-r3_src_unpack
mv "${S}"/${PN}/* "${S}" || die
- elif use kde; then
- kde4-base_src_unpack
- else
- qt4-r2_src_unpack
- fi
-}
-
-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
-}
-
-src_configure() {
- if use kde; then
- kde4-base_src_configure
- else
- eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
- fi
-}
-
-src_compile() {
- if use kde; then
- kde4-base_src_compile
- else
- qt4-r2_src_compile
- fi
-}
-
-src_install() {
- if use kde; then
- kde4-base_src_install
- else
- qt4-r2_src_install
- fi
-}
-
-src_test() {
- if use kde; then
- kde4-base_src_test
+ kde5_src_unpack
fi
}
[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/
commit: 25346e04f3c3b328aa32bfba97bef42cba4e1cb3
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Aug 6 16:55:51 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Aug 6 16:55:51 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25346e04
[kde-misc/kdiff3] Sync with tree
Package-Manager: portage-2.2.11-r1
---
kde-misc/kdiff3/files/kdiff3-build.patch | 25 -
kde-misc/kdiff3/kdiff3-.ebuild | 9 +
2 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/kde-misc/kdiff3/files/kdiff3-build.patch
b/kde-misc/kdiff3/files/kdiff3-build.patch
deleted file mode 100644
index 14b7147..000
--- a/kde-misc/kdiff3/files/kdiff3-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/kdiff3/src-QT4/difftextwindow.cpp
b/kdiff3/src-QT4/difftextwindow.cpp
-index c2c0779..ee104a3 100644
a/kdiff3/src-QT4/difftextwindow.cpp
-+++ b/kdiff3/src-QT4/difftextwindow.cpp
-@@ -33,6 +33,8 @@
- #include QUrl
- #include QMenu
- #include QTextLayout
-+#include QRunnable
-+#include QThreadPool
-
-
-
-diff --git a/kdiff3/src-QT4/progress.cpp b/kdiff3/src-QT4/progress.cpp
-index 9e585a3..88947db 100644
a/kdiff3/src-QT4/progress.cpp
-+++ b/kdiff3/src-QT4/progress.cpp
-@@ -15,6 +15,7 @@
- #include QPushButton
- #include QLabel
- #include QApplication
-+#include QThread
- #include kio/job.h
-
- #include klocale.h
diff --git a/kde-misc/kdiff3/kdiff3-.ebuild
b/kde-misc/kdiff3/kdiff3-.ebuild
index f8ccf8c..cc8c481 100644
--- a/kde-misc/kdiff3/kdiff3-.ebuild
+++ b/kde-misc/kdiff3/kdiff3-.ebuild
@@ -26,19 +26,20 @@ LICENSE=GPL-2
SLOT=4
IUSE=debug kde
-DEPEND=
+CDEPEND=
dev-qt/qtcore:4
dev-qt/qtgui:4
kde? ( $(add_kdebase_dep kdelibs) )
-RDEPEND=${DEPEND}
+DEPEND=${CDEPEND}
+ sys-devel/gettext
+
+RDEPEND=${CDEPEND}
sys-apps/diffutils
RESTRICT=!kde? ( test )
-PATCHES=( ${FILESDIR}/${PN}-build.patch )
-
src_unpack(){
if [[ ${PV} == ** ]]; then
git-r3_src_unpack
