x11-misc/qterm: fix build failure caused by duplicate target
authorMichael Palimaka <kensington@gentoo.org>
Fri, 22 Jan 2016 14:59:05 +0000 (01:59 +1100)
committerMichael Palimaka <kensington@gentoo.org>
Fri, 22 Jan 2016 15:05:30 +0000 (02:05 +1100)
Gentoo-bug: 559042

Package-Manager: portage-2.2.27

x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch [new file with mode: 0644]
x11-misc/qterm/qterm-0.5.12-r1.ebuild

diff --git a/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch b/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch
new file mode 100644 (file)
index 0000000..f35625c
--- /dev/null
@@ -0,0 +1,17 @@
+Remove duplicate target that was already created by FindKDE4Internal.
+
+Gentoo-bug: 559042
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,10 +19,3 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ include("package.cmake")
+-
+-configure_file(
+-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+-  IMMEDIATE @ONLY)
+-add_custom_target(uninstall
+-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
index 3edb3b1f2d74268801b2eafaa5cbe110187c6c5e..ba001304bcf1d3843d7813731094860814186d8f 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,6 +33,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-0.5.11-gentoo.patch"
        "${FILESDIR}/${P}-qt4.patch"
        "${FILESDIR}/${P}-glibc216.patch"
+       "${FILESDIR}/${P}-duplicatetarget.patch"
 )
 
 src_install() {