Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/kdesvn/files/, dev-vcs/kdesvn/
Date: Thu, 29 Dec 2016 18:26:10
Message-Id: 1483035961.f4c9c765f7952257c2d8d1f419bf67ae2166ca4b.johu@gentoo
1 commit: f4c9c765f7952257c2d8d1f419bf67ae2166ca4b
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 18:25:29 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 18:26:01 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c9c765
7
8 dev-vcs/kdesvn: Remove 1.6.0 (r1)
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-vcs/kdesvn/Manifest | 1 -
13 .../kdesvn/files/kdesvn-1.6.0-bug-address.patch | 20 ------
14 dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch | 75 ----------------------
15 dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild | 45 -------------
16 4 files changed, 141 deletions(-)
17
18 diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
19 index a3a3558..99159fe 100644
20 --- a/dev-vcs/kdesvn/Manifest
21 +++ b/dev-vcs/kdesvn/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f
24 DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01
25 DIST kdesvn-2.0.0.tar.xz 2014660 SHA256 d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 WHIRLPOOL ebd26101e8779c047f186c408b5694647a07f565d295e6f1a1cfcf118c2fdfeb19298fb254928061c51ce8a4be7d5d651ea2c4021bf19fdcbd011bd109160a70
26
27 diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch
28 deleted file mode 100644
29 index e1c9907..00000000
30 --- a/dev-vcs/kdesvn/files/kdesvn-1.6.0-bug-address.patch
31 +++ /dev/null
32 @@ -1,20 +0,0 @@
33 ---- src/main.cpp.old 2013-07-07 17:37:05.617114521 +0200
34 -+++ src/main.cpp 2013-07-07 17:37:20.322929644 +0200
35 -@@ -40,7 +40,6 @@
36 - KAboutData::License_GPL,ki18n("(C) 2005-2009 Rajko Albrecht"));
37 - about.addAuthor( ki18n("Rajko Albrecht"),ki18n("Developer"),QByteArray("ral@××××××××××××.de"),QByteArray());
38 - about.setHomepage("http://kdesvn.alwins-world.de/");
39 -- about.setBugAddress("kdesvn-bugs@××××××××××××.de");
40 -
41 - KCmdLineArgs::init(argc, argv, &about);
42 - KCmdLineOptions options;
43 ---- src/kdesvn_part.cpp.old 2013-07-07 17:37:41.415664472 +0200
44 -+++ src/kdesvn_part.cpp 2013-07-07 17:37:53.484512746 +0200
45 -@@ -174,7 +174,6 @@
46 - about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Original author and maintainer"), "ral@××××××××××××.de" );
47 - about.setOtherText(m_Extratext);
48 - about.setHomepage("http://kdesvn.alwins-world.de/");
49 -- about.setBugAddress("kdesvn-bugs@××××××××××××.de");
50 - about.setProgramIconName("kdesvn");
51 - about.setTranslator(ki18n("kdesvn: NAME OF TRANSLATORS\\nYour names"),
52 - ki18n("kdesvn: EMAIL OF TRANSLATORS\\nYour emails"));
53
54 diff --git a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
55 deleted file mode 100644
56 index 1a3c4b7..00000000
57 --- a/dev-vcs/kdesvn/files/kdesvn-1.6.0-cmake.patch
58 +++ /dev/null
59 @@ -1,75 +0,0 @@
60 -From: Christophe Giboudeaux <cgiboudeaux@×××.com>
61 -Date: Thu, 04 Jul 2013 13:59:57 +0000
62 -Subject: Drop cmake_uninstall.cmake.in
63 -X-Git-Url: http://quickgit.kde.org/?p=kdesvn.git&a=commitdiff&h=267bda11388934cf126334269f15611e96729983
64 ----
65 -Drop cmake_uninstall.cmake.in
66 -
67 -FindKDE4Internal.cmake already creates an cmake_uninstall file.
68 ----
69 -Backported to 1.6.0 (toUppercase, cmake path)
70 -
71 ---- a/CMakeLists.txt 2010-03-20 17:08:10.000000000 +0100
72 -+++ b/CMakeLists.txt 2015-12-29 18:40:33.550299882 +0100
73 -@@ -165,14 +165,6 @@
74 - IMMEDIATE
75 - @ONLY)
76 -
77 --CONFIGURE_FILE(
78 -- "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/cmake_uninstall.cmake.in"
79 -- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
80 -- IMMEDIATE @ONLY)
81 --
82 --ADD_CUSTOM_TARGET(uninstall
83 -- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
84 --
85 - ADD_CUSTOM_TARGET(dist
86 - "${CMAKE_BINARY_DIR}/makedist.sh"
87 - DEPENDS doc
88 ---- a/cmakemodules/cmake_uninstall.cmake.in
89 -+++ /dev/null
90 -@@ -1,43 +1 @@
91 --####
92 -- # Copyright (C) 2005-2009 by Rajko Albrecht ral@××××××××××××.de #
93 -- # http://kdesvn.alwins-world.de/ #
94 -- # #
95 -- # This program is free software; you can redistribute it and/or modify #
96 -- # it under the terms of the GNU General Public License as published by #
97 -- # the Free Software Foundation; either version 2 of the License, or #
98 -- # (at your option) any later version. #
99 -- # #
100 -- # This program is distributed in the hope that it will be useful, #
101 -- # but WITHOUT ANY WARRANTY; without even the implied warranty of #
102 -- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
103 -- # GNU General Public License for more details. #
104 -- # #
105 -- # You should have received a copy of the GNU General Public License #
106 -- # along with this program; if not, write to the #
107 -- # Free Software Foundation, Inc., #
108 -- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #
109 -- ####
110 -
111 --IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
112 -- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
113 --ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
114 --
115 --FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
116 --STRING(REGEX REPLACE "\n" ";" files "${files}")
117 --FOREACH(file ${files})
118 -- MESSAGE(STATUS "Uninstalling \"${file}\"")
119 -- IF(NOT EXISTS "${file}")
120 --#not a failure - missing links are marked as missed too, so when lib is removed the links are
121 --#there but invalid!
122 -- MESSAGE(STATUS "File \"${file}\" does not exists.")
123 -- ENDIF(NOT EXISTS "${file}")
124 -- EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
125 -- OUTPUT_VARIABLE rm_out
126 -- RETURN_VARIABLE rm_retval)
127 -- IF("${rm_retval}" GREATER 0)
128 -- MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
129 -- ENDIF("${rm_retval}" GREATER 0)
130 --ENDFOREACH(file)
131 --
132 --
133 --
134 -
135
136 diff --git a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild b/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
137 deleted file mode 100644
138 index 8564f3b..00000000
139 --- a/dev-vcs/kdesvn/kdesvn-1.6.0-r1.ebuild
140 +++ /dev/null
141 @@ -1,45 +0,0 @@
142 -# Copyright 1999-2015 Gentoo Foundation
143 -# Distributed under the terms of the GNU General Public License v2
144 -# $Id$
145 -
146 -EAPI=5
147 -
148 -KDE_HANDBOOK="optional"
149 -KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru"
150 -KDE_LINGUAS_LIVE_OVERRIDE="true"
151 -inherit flag-o-matic kde4-base
152 -
153 -DESCRIPTION="A frontend to the subversion vcs"
154 -HOMEPAGE="http://kdesvn.alwins-world.de/"
155 -if [[ ${PV} != 9999* ]]; then
156 - SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
157 -fi
158 -
159 -LICENSE="GPL-2"
160 -KEYWORDS="amd64 x86"
161 -SLOT="4"
162 -IUSE="debug"
163 -
164 -DEPEND="
165 - dev-libs/apr:1
166 - dev-libs/apr-util:1
167 - >=dev-vcs/subversion-1.7
168 - sys-devel/gettext
169 - dev-qt/qtsql:4[sqlite]
170 -"
171 -RDEPEND="${DEPEND}
172 - !kde-apps/kdesdk-kioslaves:4[subversion(+)]
173 -"
174 -
175 -PATCHES=(
176 - "${FILESDIR}/${P}-bug-address.patch"
177 - "${FILESDIR}/${P}-cmake.patch"
178 -)
179 -
180 -src_configure() {
181 - append-cppflags -DQT_THREAD_SUPPORT
182 -
183 - [[ ${PV} = 9999* ]] && mycmakeargs=(-DDAILY_BUILD=ON)
184 -
185 - kde4-base_src_configure
186 -}