summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-01-23 01:59:05 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-01-23 02:05:30 +1100
commit4a7d361df68404083d91714b653a2c8f9cfea875 (patch)
treef7ad9110e93deee572ce82ec06ec74b487795bfd /x11-misc/qterm
parentbase/package.use.stable.mask: Mask chromium-48[system-ffmpeg] (diff)
downloadgentoo-4a7d361df68404083d91714b653a2c8f9cfea875.tar.gz
gentoo-4a7d361df68404083d91714b653a2c8f9cfea875.tar.bz2
gentoo-4a7d361df68404083d91714b653a2c8f9cfea875.zip
x11-misc/qterm: fix build failure caused by duplicate target
Gentoo-bug: 559042 Package-Manager: portage-2.2.27
Diffstat (limited to 'x11-misc/qterm')
-rw-r--r--x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch17
-rw-r--r--x11-misc/qterm/qterm-0.5.12-r1.ebuild3
2 files changed, 19 insertions, 1 deletions
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
index 00000000000..f35625c6d02
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch
@@ -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")
diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
index 3edb3b1f2d7..ba001304bcf 100644
--- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
+++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
@@ -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() {