summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-12-29 18:55:24 +0100
committerMichael Palimaka <kensington@gentoo.org>2015-12-30 23:07:04 +1100
commit680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb (patch)
tree9b34e37a7e5973ce5bf38289d67413a78d9bed81 /dev-vcs/kdesvn
parentdev-perl/Compress-Bzip2: Version bump (diff)
downloadgentoo-680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb.tar.gz
gentoo-680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb.tar.bz2
gentoo-680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb.zip
dev-vcs/kdesvn: Fix configure, bug 559638
Package-Manager: portage-2.2.24
Diffstat (limited to 'dev-vcs/kdesvn')
-rw-r--r--dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch75
-rw-r--r--dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild7
2 files changed, 80 insertions, 2 deletions
diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
new file mode 100644
index 00000000000..1a3c4b77e2d
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
@@ -0,0 +1,75 @@
+From: Christophe Giboudeaux <cgiboudeaux@gmx.com>
+Date: Thu, 04 Jul 2013 13:59:57 +0000
+Subject: Drop cmake_uninstall.cmake.in
+X-Git-Url: http://quickgit.kde.org/?p=kdesvn.git&a=commitdiff&h=267bda11388934cf126334269f15611e96729983
+---
+Drop cmake_uninstall.cmake.in
+
+FindKDE4Internal.cmake already creates an cmake_uninstall file.
+---
+Backported to 1.6.0 (toUppercase, cmake path)
+
+--- a/CMakeLists.txt 2010-03-20 17:08:10.000000000 +0100
++++ b/CMakeLists.txt 2015-12-29 18:40:33.550299882 +0100
+@@ -165,14 +165,6 @@
+ IMMEDIATE
+ @ONLY)
+
+-CONFIGURE_FILE(
+- "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/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")
+-
+ ADD_CUSTOM_TARGET(dist
+ "${CMAKE_BINARY_DIR}/makedist.sh"
+ DEPENDS doc
+--- a/cmakemodules/cmake_uninstall.cmake.in
++++ /dev/null
+@@ -1,43 +1 @@
+-####
+- # Copyright (C) 2005-2009 by Rajko Albrecht ral@alwins-world.de #
+- # http://kdesvn.alwins-world.de/ #
+- # #
+- # This program is free software; you can redistribute it and/or modify #
+- # it under the terms of the GNU General Public License as published by #
+- # the Free Software Foundation; either version 2 of the License, or #
+- # (at your option) any later version. #
+- # #
+- # This program is distributed in the hope that it will be useful, #
+- # but WITHOUT ANY WARRANTY; without even the implied warranty of #
+- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+- # GNU General Public License for more details. #
+- # #
+- # You should have received a copy of the GNU General Public License #
+- # along with this program; if not, write to the #
+- # Free Software Foundation, Inc., #
+- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #
+- ####
+
+-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+-
+-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+-STRING(REGEX REPLACE "\n" ";" files "${files}")
+-FOREACH(file ${files})
+- MESSAGE(STATUS "Uninstalling \"${file}\"")
+- IF(NOT EXISTS "${file}")
+-#not a failure - missing links are marked as missed too, so when lib is removed the links are
+-#there but invalid!
+- MESSAGE(STATUS "File \"${file}\" does not exists.")
+- ENDIF(NOT EXISTS "${file}")
+- EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+- OUTPUT_VARIABLE rm_out
+- RETURN_VARIABLE rm_retval)
+- IF("${rm_retval}" GREATER 0)
+- MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+- ENDIF("${rm_retval}" GREATER 0)
+-ENDFOREACH(file)
+-
+-
+-
+
diff --git a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
index af14991902a..8564f3b9a37 100644
--- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
@@ -9,7 +9,7 @@ KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru"
KDE_LINGUAS_LIVE_OVERRIDE="true"
inherit flag-o-matic kde4-base
-DESCRIPTION="KDESvn is a frontend to the subversion vcs"
+DESCRIPTION="A frontend to the subversion vcs"
HOMEPAGE="http://kdesvn.alwins-world.de/"
if [[ ${PV} != 9999* ]]; then
SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
@@ -31,7 +31,10 @@ RDEPEND="${DEPEND}
!kde-apps/kdesdk-kioslaves:4[subversion(+)]
"
-PATCHES=( "${FILESDIR}/${P}-bug-address.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-bug-address.patch"
+ "${FILESDIR}/${P}-cmake.patch"
+)
src_configure() {
append-cppflags -DQT_THREAD_SUPPORT