commit: 25346e04f3c3b328aa32bfba97bef42cba4e1cb3
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 6 16:55:51 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 6 16:55:51 2014 +0000
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-9999.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..0000000
--- 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-9999.ebuild
b/kde-misc/kdiff3/kdiff3-9999.ebuild
index f8ccf8c..cc8c481 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.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} == *9999* ]]; then
git-r3_src_unpack
