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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     79e6eaca022e22c63ef4e7bf3d4694d945c13eea
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 14:42:39 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 14:43:22 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e6eaca

kde-apps/kdiff3: add patch fixing build failure with kde-base/kdelibs-4.14.11

Gentoo-bug: 559014

Package-Manager: portage-2.2.20.1

 kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch | 12 ++++++++++++
 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild                   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
new file mode 100644
index 0000000..9332701
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
@@ -0,0 +1,12 @@
+--- po/CMakeLists.txt
++++ po/CMakeLists.txt
+@@ -1,3 +1,9 @@
++# The pofiles macro creates in some versions same name targets
++# which since cmake 2.8 leads to target clashes.
++# Hence force the old policy for all po directories.
++# http://public.kitware.com/Bug/view.php?id=12952
++cmake_policy(SET CMP0002 OLD)
++
+ find_package(Gettext REQUIRED)
+ if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "Please install msgmerge binary")

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 268ec2d..93e2413 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -47,6 +47,8 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="!kde? ( test )"
 
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+
 src_unpack(){
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack