* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2012-08-15 13:33 Johannes Huber
0 siblings, 0 replies; 24+ messages in thread
From: Johannes Huber @ 2012-08-15 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 04c014b6199d8573f8c4ca5033c58e1ae25f5c42
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 11:11:52 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 11:11:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=04c014b6
[kde-misc/kdiff3] Sync with tree.
(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 5d0d326..ea43d33 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -4,30 +4,31 @@
EAPI=4
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.4.0"
-
if [[ ${PV} != *9999* ]]; 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 ~ppc64 ~x86 ~amd64-linux"
KDE_HANDBOOK="optional"
+else
+ ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+ KEYWORDS=""
fi
+KDE_REQUIRED="optional"
inherit kde4-base qt4-r2
DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="4"
IUSE="debug kde"
DEPEND="
- >=x11-libs/qt-core-${QT_MINIMAL}:4
- >=x11-libs/qt-gui-${QT_MINIMAL}:4
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
kde? ( $(add_kdebase_dep kdelibs) )
"
RDEPEND="${DEPEND}
@@ -38,7 +39,6 @@ RESTRICT="!kde? ( test )"
src_unpack(){
if [[ ${PV} == *9999* ]]; then
- ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
subversion_src_unpack
elif use kde; then
kde4-base_src_unpack
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2024-05-20 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2024-05-20 21:24 UTC (permalink / raw
To: gentoo-commits
commit: b8517f6c043b87c73a4ed1d630c4cbb925d4c764
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 21:17:32 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 20 21:21:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8517f6c
kde-misc/kdiff3: Update dependencies
Upstream commits:
870507fcb0b534531f5cf87b0069521a34b8ee7b
d6ed425e1de1a58febf9cbc2be6834e5566fbdce
001d9ebde083e6237af8a1ee6157c9ba9341d9a3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 34fb160506..7b7cfe151a 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -30,17 +30,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
DEPEND="${COMMON_DEPEND}
- dev-libs/boost
+ >=dev-libs/boost-1.82
"
RDEPEND="${COMMON_DEPEND}
!${CATEGORY}/${PN}:5
sys-apps/diffutils
"
-src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_QT6=ON
- # TODO: -DENABLE_GDBINDEX?
- )
- ecm_src_configure
-}
+# TODO: -DENABLE_GDBINDEX?
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2024-03-03 13:56 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2024-03-03 13:56 UTC (permalink / raw
To: gentoo-commits
commit: cf336d57503e67447129f1a3747bb474c2513094
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 12:54:34 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 12:54:34 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf336d57
kde-misc/kdiff3: Port to KF6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 34 +++++++++++++++++-----------------
kde-misc/kdiff3/metadata.xml | 1 +
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index c14f073c9c..34fb160506 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">sdk/kdiff3</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2022-07-09 12:52 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2022-07-09 12:52 UTC (permalink / raw
To: gentoo-commits
commit: ab170b1365c0ffd0f818a7e70ed57b05589e6840
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 09:48:34 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 12:52:38 2022 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index d8bee5ee9a..d7952caa80 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2021-09-04 21:27 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-09-04 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 7f0167f0c11504404cdbb83a6859d9589ed04a84
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 18:47:51 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 18:47:51 2021 +0000
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 <asturm <AT> 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..0000000000
--- 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
-"
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2021-08-21 13:51 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-08-21 13:51 UTC (permalink / raw
To: gentoo-commits
commit: 95b9d2cc5d5c41bddd07a3199ac5ab57434f9c30
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 13:36:19 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:51:36 2021 +0000
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 <asturm <AT> 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 0000000000..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
+"
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2021-07-14 11:15 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-07-14 11:15 UTC (permalink / raw
To: gentoo-commits
commit: dcfc93f241e7a677ad3a200ef1632e0eabbe1c4d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 11:08:10 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 11:14:55 2021 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index e0b2352524..a36d72a44d 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2021-05-14 20:57 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2021-05-14 20:57 UTC (permalink / raw
To: gentoo-commits
commit: d06051407bbfb8b325e27f004222b68fe7deba66
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 20:56:05 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 20:56:05 2021 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 39dc95cbaf..e0b2352524 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2020-05-24 17:27 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-05-24 17:27 UTC (permalink / raw
To: gentoo-commits
commit: c3723e81c0561db436359448f071e40e76e21332
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:25:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:25:42 2020 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 4e9dc77b18..622ae35d39 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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
"
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2020-05-01 22:38 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-05-01 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 2d0da3b014ec1e96e944ec3ebaa78077fae4ab9d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 1 17:13:39 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 1 22:37:56 2020 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index f2152de967..4e9dc77b18 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -35,5 +35,4 @@ DEPEND="
"
RDEPEND="${DEPEND}
sys-apps/diffutils
- !kde-misc/kdiff3:4
"
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2019-06-30 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2019-06-30 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 1719122bbb5e39a2332a30b48b07dab043583788
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 20:51:49 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:51:49 2019 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index c515855076..9d64282038 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
inherit kde5
DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2019-03-03 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2019-03-03 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 71257db1df7df3517eb5b91063391eeb8b6d1817
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 13:49:15 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 13:49:15 2019 +0000
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 <asturm <AT> gentoo.org>
kde-misc/kdiff3/kdiff3-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 06c6bc40b1..c515855076 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2018-02-15 0:32 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2018-02-15 0:32 UTC (permalink / raw
To: gentoo-commits
commit: 0210a53ae2e61bd69306afe834fb803050a54838
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 00:32:30 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 00:32:39 2018 +0000
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-9999.ebuild | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 59e202dc93..ece8530a13 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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
"
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2017-09-09 19:12 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-09-09 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 9f71c6dda6234cb8584c90e6bc23ee504c78b877
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 19:10:18 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 19:10:18 2017 +0000
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-9999.ebuild | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index e8e02e5a99..e7d24dedc3 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2017-04-15 23:15 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-04-15 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 7e3db22e7bc79465ab5925a4e749fae15644f298
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 22:48:46 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 22:48:46 2017 +0000
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-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 86a2233a4e..e8e02e5a99 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2016-03-30 18:24 Johannes Huber
0 siblings, 0 replies; 24+ messages in thread
From: Johannes Huber @ 2016-03-30 18:24 UTC (permalink / raw
To: gentoo-commits
commit: a6bdd8040ffd4690e48baf52c8fddc6551c30159
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 18:23:38 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 18:24:34 2016 +0000
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-9999.ebuild | 92 ++++++++++----------------------------
1 file changed, 23 insertions(+), 69 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 94b3f55..a4835f6 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -2,93 +2,47 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-if [[ ${PV} != *9999* ]]; 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} == *9999* ]]; 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
}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2013-10-13 16:39 Johannes Huber
0 siblings, 0 replies; 24+ messages in thread
From: Johannes Huber @ 2013-10-13 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 1ff53e5fb96967804561040e350791ab47551a1b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 18:39:36 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 18:39:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1ff53e5f
[kde-misc/kdiff3] Move to git-r3 eclass.
Package-Manager: portage-2.2.7
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 825b43f..feafd7c 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -20,8 +20,7 @@ inherit kde4-base qt4-r2
DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
-EGIT_REPO_URI="git://git.code.sf.net/p/kdiff3/code"
-EGIT_PROJECT="${PN}"
+EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" )
LICENSE="GPL-2"
SLOT="4"
@@ -40,7 +39,7 @@ RESTRICT="!kde? ( test )"
src_unpack(){
if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
mv "${S}"/${PN}/* "${S}" || die
elif use kde; then
kde4-base_src_unpack
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2013-06-29 13:01 Johannes Huber
0 siblings, 0 replies; 24+ messages in thread
From: Johannes Huber @ 2013-06-29 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 3a0955522988d512877f819904e4b302bd06082e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 11:57:56 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 11:57:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a095552
[kde-misc/kdiff3] EAPI 5. Sync metadata with tree.
Package-Manager: portage-2.2.0_alpha186
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 2 +-
kde-misc/kdiff3/metadata.xml | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 383967b..825b43f 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
if [[ ${PV} != *9999* ]]; then
KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index 8d1e86a..37dfd56 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
+ <maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2012-12-10 16:12 Michael Palimaka
0 siblings, 0 replies; 24+ messages in thread
From: Michael Palimaka @ 2012-12-10 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 8c4f331be431566789bb7845406920b99309986b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 16:10:06 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 16:10:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c4f331b
[kde-misc/kdiff3] Drop ppc64 keyword due to unkeyworded required dependencies.
Package-Manager: portage-2.1.11.36
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 9d4adba..8553d0b 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
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 ~ppc64 ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
KDE_HANDBOOK="optional"
else
KEYWORDS=""
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2012-10-18 23:15 Maciej Mrozowski
0 siblings, 0 replies; 24+ messages in thread
From: Maciej Mrozowski @ 2012-10-18 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 9998f02595ccce0d62cd2929e02ff6aabd17c748
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 23:14:18 2012 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 23:14:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9998f025
[kde-misc/kdiff3] Set EGIT_PROJECT, do not append Categories to .desktop file
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index ebab1ed..9d4adba 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -21,6 +21,7 @@ inherit kde4-base qt4-r2
DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
EGIT_REPO_URI="git://git.code.sf.net/p/kdiff3/code"
+EGIT_PROJECT="${PN}"
LICENSE="GPL-2"
SLOT="4"
@@ -58,8 +59,6 @@ src_prepare() {
else
kde4-base_src_prepare
fi
-
- echo "Categories=Qt;KDE;Development;" >> "${S}"/src-QT4/kdiff3.desktop
}
src_configure() {
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2012-10-17 11:43 Michael Palimaka
0 siblings, 0 replies; 24+ messages in thread
From: Michael Palimaka @ 2012-10-17 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 4ca738870de6600a10f41b7f5a258b51264b79cb
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 11:41:23 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 11:41:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ca73887
[kde-misc/kdiff3] Upstream has migrated to git, wrt bug #436288.
Package-Manager: portage-2.1.11.28
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 31810f4..ebab1ed 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -16,12 +16,11 @@ else
fi
KDE_REQUIRED="optional"
-KDE_SCM="svn"
inherit kde4-base qt4-r2
DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
-ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
+EGIT_REPO_URI="git://git.code.sf.net/p/kdiff3/code"
LICENSE="GPL-2"
SLOT="4"
@@ -40,7 +39,8 @@ RESTRICT="!kde? ( test )"
src_unpack(){
if [[ ${PV} == *9999* ]]; then
- subversion_src_unpack
+ git-2_src_unpack
+ mv "${S}"/${PN}/* "${S}" || die
elif use kde; then
kde4-base_src_unpack
else
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2012-07-14 18:01 Michael Palimaka
0 siblings, 0 replies; 24+ messages in thread
From: Michael Palimaka @ 2012-07-14 18:01 UTC (permalink / raw
To: gentoo-commits
commit: d45c62ffc9e726a6f2d5cfb0761fc87d2a416501
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 17:56:06 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 17:56:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d45c62ff
[kde-misc/kdiff3] Add Qt slot deps.
(Portage version: 2.1.11.5/git/Linux x86_64, unsigned Manifest commit)
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index e626d20..5d0d326 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -26,8 +26,8 @@ SLOT="4"
IUSE="debug kde"
DEPEND="
- >=x11-libs/qt-core-${QT_MINIMAL}
- >=x11-libs/qt-gui-${QT_MINIMAL}
+ >=x11-libs/qt-core-${QT_MINIMAL}:4
+ >=x11-libs/qt-gui-${QT_MINIMAL}:4
kde? ( $(add_kdebase_dep kdelibs) )
"
RDEPEND="${DEPEND}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2012-01-16 16:36 Johannes Huber
0 siblings, 0 replies; 24+ messages in thread
From: Johannes Huber @ 2012-01-16 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 3196b9a490cdd14a5ec93257835b3c1e5522bd08
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 16:35:11 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 16:35:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3196b9a4
[kde-misc/kdiff3] Synced with tree.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 92e2f64..e626d20 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -8,8 +8,9 @@ KDE_REQUIRED="optional"
QT_MINIMAL="4.4.0"
if [[ ${PV} != *9999* ]]; then
- KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
- nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
+ 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"
KDE_HANDBOOK="optional"
fi
@@ -49,9 +50,10 @@ src_unpack(){
src_prepare() {
if ! use kde; then
# adapt to Gentoo paths
- sed -e s,documentation.path.*$,documentation.path\ =\ /usr/share/doc/${PF}, \
- -e s,target.path.*$,target.path\ =\ /usr/bin, \
- "${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
+ 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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/
@ 2011-07-03 16:41 Maciej Mrozowski
0 siblings, 0 replies; 24+ messages in thread
From: Maciej Mrozowski @ 2011-07-03 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 5ec3458ec69ab3257673e9cdeedcd61cac77eaf1
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 00:53:04 2011 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 16:39:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ec3458e
[kde-misc/kdiff3] Filemanager integration is now handled by kfileitemactionplugin, the one using libkonq is now as a fallback (for < KDE-4.6.1), removing konqueror USE flag
---
kde-misc/kdiff3/kdiff3-9999.ebuild | 8 ++------
kde-misc/kdiff3/metadata.xml | 3 ---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 20c987f..522057c 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -22,15 +22,12 @@ HOMEPAGE="http://kdiff3.sourceforge.net/"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="4"
-IUSE="debug kde konqueror"
+IUSE="debug kde"
DEPEND="
>=x11-libs/qt-core-${QT_MINIMAL}
>=x11-libs/qt-gui-${QT_MINIMAL}
- kde? (
- $(add_kdebase_dep kdelibs)
- konqueror? ( $(add_kdebase_dep libkonq) )
- )
+ kde? ( $(add_kdebase_dep kdelibs) )
"
RDEPEND="${DEPEND}
sys-apps/diffutils
@@ -64,7 +61,6 @@ src_prepare() {
src_configure() {
if use kde; then
- mycmakeargs=( $(cmake-utils_use_with konqueror LibKonq) )
kde4-base_src_configure
else
eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index f356bc1..8d1e86a 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
-<use>
- <flag name="konqueror">Builds context menu extension plugin for <pkg>kde-base/konqueror</pkg>.</flag>
-</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 24+ messages in thread
end of thread, other threads:[~2024-05-20 21:24 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-15 13:33 [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2024-05-20 21:24 Andreas Sturmlechner
2024-03-03 13:56 Andreas Sturmlechner
2022-07-09 12:52 Andreas Sturmlechner
2021-09-04 21:27 Andreas Sturmlechner
2021-08-21 13:51 Andreas Sturmlechner
2021-07-14 11:15 Andreas Sturmlechner
2021-05-14 20:57 Andreas Sturmlechner
2020-05-24 17:27 Andreas Sturmlechner
2020-05-01 22:38 Andreas Sturmlechner
2019-06-30 20:52 Andreas Sturmlechner
2019-03-03 21:24 Andreas Sturmlechner
2018-02-15 0:32 Andreas Sturmlechner
2017-09-09 19:12 Andreas Sturmlechner
2017-04-15 23:15 Andreas Sturmlechner
2016-03-30 18:24 Johannes Huber
2013-10-13 16:39 Johannes Huber
2013-06-29 13:01 Johannes Huber
2012-12-10 16:12 Michael Palimaka
2012-10-18 23:15 Maciej Mrozowski
2012-10-17 11:43 Michael Palimaka
2012-07-14 18:01 Michael Palimaka
2012-01-16 16:36 Johannes Huber
2011-07-03 16:41 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox