From 4a7d361df68404083d91714b653a2c8f9cfea875 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sat, 23 Jan 2016 01:59:05 +1100 Subject: [PATCH] x11-misc/qterm: fix build failure caused by duplicate target Gentoo-bug: 559042 Package-Manager: portage-2.2.27 --- .../files/qterm-0.5.12-duplicatetarget.patch | 17 +++++++++++++++++ x11-misc/qterm/qterm-0.5.12-r1.ebuild | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch 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 000000000000..f35625c6d020 --- /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 3edb3b1f2d74..ba001304bcf1 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() { -- 2.26.2