| 1 |
commit: 680ff47b297fb3cab7cf7b3e2ec304e6b8f882fb |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 29 17:55:24 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 30 12:07:04 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680ff47b |
| 7 |
|
| 8 |
dev-vcs/kdesvn: Fix configure, bug 559638 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch | 75 +++++++++++++++++++++++++++ |
| 13 |
dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild | 7 ++- |
| 14 |
2 files changed, 80 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..1a3c4b7 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch |
| 21 |
@@ -0,0 +1,75 @@ |
| 22 |
+From: Christophe Giboudeaux <cgiboudeaux@×××.com> |
| 23 |
+Date: Thu, 04 Jul 2013 13:59:57 +0000 |
| 24 |
+Subject: Drop cmake_uninstall.cmake.in |
| 25 |
+X-Git-Url: http://quickgit.kde.org/?p=kdesvn.git&a=commitdiff&h=267bda11388934cf126334269f15611e96729983 |
| 26 |
+--- |
| 27 |
+Drop cmake_uninstall.cmake.in |
| 28 |
+ |
| 29 |
+FindKDE4Internal.cmake already creates an cmake_uninstall file. |
| 30 |
+--- |
| 31 |
+Backported to 1.6.0 (toUppercase, cmake path) |
| 32 |
+ |
| 33 |
+--- a/CMakeLists.txt 2010-03-20 17:08:10.000000000 +0100 |
| 34 |
++++ b/CMakeLists.txt 2015-12-29 18:40:33.550299882 +0100 |
| 35 |
+@@ -165,14 +165,6 @@ |
| 36 |
+ IMMEDIATE |
| 37 |
+ @ONLY) |
| 38 |
+ |
| 39 |
+-CONFIGURE_FILE( |
| 40 |
+- "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/cmake_uninstall.cmake.in" |
| 41 |
+- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" |
| 42 |
+- IMMEDIATE @ONLY) |
| 43 |
+- |
| 44 |
+-ADD_CUSTOM_TARGET(uninstall |
| 45 |
+- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") |
| 46 |
+- |
| 47 |
+ ADD_CUSTOM_TARGET(dist |
| 48 |
+ "${CMAKE_BINARY_DIR}/makedist.sh" |
| 49 |
+ DEPENDS doc |
| 50 |
+--- a/cmakemodules/cmake_uninstall.cmake.in |
| 51 |
++++ /dev/null |
| 52 |
+@@ -1,43 +1 @@ |
| 53 |
+-#### |
| 54 |
+- # Copyright (C) 2005-2009 by Rajko Albrecht ral@××××××××××××.de # |
| 55 |
+- # http://kdesvn.alwins-world.de/ # |
| 56 |
+- # # |
| 57 |
+- # This program is free software; you can redistribute it and/or modify # |
| 58 |
+- # it under the terms of the GNU General Public License as published by # |
| 59 |
+- # the Free Software Foundation; either version 2 of the License, or # |
| 60 |
+- # (at your option) any later version. # |
| 61 |
+- # # |
| 62 |
+- # This program is distributed in the hope that it will be useful, # |
| 63 |
+- # but WITHOUT ANY WARRANTY; without even the implied warranty of # |
| 64 |
+- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # |
| 65 |
+- # GNU General Public License for more details. # |
| 66 |
+- # # |
| 67 |
+- # You should have received a copy of the GNU General Public License # |
| 68 |
+- # along with this program; if not, write to the # |
| 69 |
+- # Free Software Foundation, Inc., # |
| 70 |
+- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # |
| 71 |
+- #### |
| 72 |
+ |
| 73 |
+-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") |
| 74 |
+- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") |
| 75 |
+-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") |
| 76 |
+- |
| 77 |
+-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) |
| 78 |
+-STRING(REGEX REPLACE "\n" ";" files "${files}") |
| 79 |
+-FOREACH(file ${files}) |
| 80 |
+- MESSAGE(STATUS "Uninstalling \"${file}\"") |
| 81 |
+- IF(NOT EXISTS "${file}") |
| 82 |
+-#not a failure - missing links are marked as missed too, so when lib is removed the links are |
| 83 |
+-#there but invalid! |
| 84 |
+- MESSAGE(STATUS "File \"${file}\" does not exists.") |
| 85 |
+- ENDIF(NOT EXISTS "${file}") |
| 86 |
+- EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" |
| 87 |
+- OUTPUT_VARIABLE rm_out |
| 88 |
+- RETURN_VARIABLE rm_retval) |
| 89 |
+- IF("${rm_retval}" GREATER 0) |
| 90 |
+- MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") |
| 91 |
+- ENDIF("${rm_retval}" GREATER 0) |
| 92 |
+-ENDFOREACH(file) |
| 93 |
+- |
| 94 |
+- |
| 95 |
+- |
| 96 |
+ |
| 97 |
|
| 98 |
diff --git a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild |
| 99 |
index af14991..8564f3b 100644 |
| 100 |
--- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild |
| 101 |
+++ b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild |
| 102 |
@@ -9,7 +9,7 @@ KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru" |
| 103 |
KDE_LINGUAS_LIVE_OVERRIDE="true" |
| 104 |
inherit flag-o-matic kde4-base |
| 105 |
|
| 106 |
-DESCRIPTION="KDESvn is a frontend to the subversion vcs" |
| 107 |
+DESCRIPTION="A frontend to the subversion vcs" |
| 108 |
HOMEPAGE="http://kdesvn.alwins-world.de/" |
| 109 |
if [[ ${PV} != 9999* ]]; then |
| 110 |
SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2" |
| 111 |
@@ -31,7 +31,10 @@ RDEPEND="${DEPEND} |
| 112 |
!kde-apps/kdesdk-kioslaves:4[subversion(+)] |
| 113 |
" |
| 114 |
|
| 115 |
-PATCHES=( "${FILESDIR}/${P}-bug-address.patch" ) |
| 116 |
+PATCHES=( |
| 117 |
+ "${FILESDIR}/${P}-bug-address.patch" |
| 118 |
+ "${FILESDIR}/${P}-cmake.patch" |
| 119 |
+) |
| 120 |
|
| 121 |
src_configure() { |
| 122 |
append-cppflags -DQT_THREAD_SUPPORT |
Archives