1 |
commit: 2b2b32f650e62f7d79df328657e2b3fae4a817c3 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 29 18:07:35 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 29 18:09:52 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2b32f6 |
7 |
|
8 |
dev-vcs/veracity: Remove last-rited pkg |
9 |
|
10 |
Gentoo-bug: 607998 |
11 |
|
12 |
dev-vcs/veracity/Manifest | 3 - |
13 |
...racity-1.0.0.10517-spidermonkey-as-needed.patch | 32 -------- |
14 |
.../files/veracity-1.0.0.10517-system-sqlite.patch | 45 ----------- |
15 |
.../files/veracity-1.0.0.10517-werror.patch | 19 ----- |
16 |
dev-vcs/veracity/metadata.xml | 4 - |
17 |
dev-vcs/veracity/veracity-1.0.0.10517.ebuild | 86 -------------------- |
18 |
dev-vcs/veracity/veracity-1.1.0.10565.ebuild | 93 ---------------------- |
19 |
7 files changed, 282 deletions(-) |
20 |
|
21 |
diff --git a/dev-vcs/veracity/Manifest b/dev-vcs/veracity/Manifest |
22 |
deleted file mode 100644 |
23 |
index 690cbeaead7..00000000000 |
24 |
--- a/dev-vcs/veracity/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1,3 +0,0 @@ |
27 |
-DIST js-1.8.0-rc1.tar.gz 1310344 SHA256 374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413 SHA512 b6e851d96cc3b5a10c3fc531922e8ba59c28e587c72365b63c3a0ab65a400cb24a217310dc9891387c02b79eb5f159e9b3d9bab36ce138257815b11d0524d5ba WHIRLPOOL 918e11fd7dfb9de6c7f8274761963109a72551a5b5606e5c22fa476975f47f51f64a6d3f4f9cb07818e5a6216c2fb2f0181c5e0efd2930cf01abc9ba6d22e370 |
28 |
-DIST veracity-source-1.0.0.10517.tar.gz 5211043 SHA256 2f9d1e3108229a85adff01d713abaea9eeaf873de5f651db60271efb7f517321 SHA512 c1f5e5a4231763ea75d779922c355de0f925de5e7a92a579d63191612d9f576e3105152be3d55a24e93589c7651b95e5fb7749bc488e777b9c6be030ebfb2b27 WHIRLPOOL efd4800f5095214a03fff12e1fae5276589d40c1e66790b9a455f1771f6778b86c218a52b9d0b193eb3c8f710ba3d1075fb983d4ec3e7e9270cb594958265624 |
29 |
-DIST veracity-source-1.1.0.10565.tar.gz 5377948 SHA256 2d129005ec1c62b78307a08899edce3a036e75a4a22be4e0dfed02c3fe17a16b SHA512 b26a34bdd6e71e460c878622114ee317f27dce594f6de4588dbb1cce8f0df9ac5d3679b0f8f31f9fd3afe2aa81218fe026ede0ae3c1a4cd3f47d09b584a02de9 WHIRLPOOL 7774359f38be43d97f1ed6aedc4c92d994fc0695cee481c0f7dedcd7a9456f8bdf9b885052c10d0e5895e5dd8010affb1335adcc69c33cc0d2db3c791c4dd1de |
30 |
|
31 |
diff --git a/dev-vcs/veracity/files/veracity-1.0.0.10517-spidermonkey-as-needed.patch b/dev-vcs/veracity/files/veracity-1.0.0.10517-spidermonkey-as-needed.patch |
32 |
deleted file mode 100644 |
33 |
index 31964feb310..00000000000 |
34 |
--- a/dev-vcs/veracity/files/veracity-1.0.0.10517-spidermonkey-as-needed.patch |
35 |
+++ /dev/null |
36 |
@@ -1,32 +0,0 @@ |
37 |
-# HG changeset patch |
38 |
-# User Nathan Phillip Brink <ohnobinki@××××××××××××××.net> |
39 |
-# Date 1315717091 0 |
40 |
-# Node ID 30297b7085c3a1ea1ecd390330ff291761128bae |
41 |
-# Parent b44ad1bfbdbefb74cf53502ee6d0e5e7a5f97da5 |
42 |
-The embedded spidermonkey libjs.a needs nspr, fix -Wl,--as-needed. |
43 |
- |
44 |
-diff -r b44ad1bfbdbe -r 30297b7085c3 common-CMakeLists.txt |
45 |
---- a/common-CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000 |
46 |
-+++ b/common-CMakeLists.txt Sun Sep 11 04:58:11 2011 +0000 |
47 |
-@@ -297,10 +297,6 @@ |
48 |
- INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR}) |
49 |
- set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${CURL_LIBRARIES}) |
50 |
- |
51 |
--FIND_LIBRARY(NSPR_LIB NAMES nspr4 libnspr4) |
52 |
--set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${NSPR_LIB}) |
53 |
--MARK_AS_ADVANCED(NSPR_LIB) |
54 |
-- |
55 |
- FIND_PACKAGE(PkgConfig REQUIRED) |
56 |
- PKG_CHECK_MODULES(SQLITE REQUIRED sqlite3) |
57 |
- SET(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${SQLITE_LDFLAGS}) |
58 |
-@@ -321,6 +317,10 @@ |
59 |
- MARK_AS_ADVANCED(SPIDERMONKEY_LIB) |
60 |
- set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${SPIDERMONKEY_LIB}) |
61 |
- |
62 |
-+FIND_LIBRARY(NSPR_LIB NAMES nspr4 libnspr4) |
63 |
-+set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${NSPR_LIB}) |
64 |
-+MARK_AS_ADVANCED(NSPR_LIB) |
65 |
-+ |
66 |
- SET(CMAKE_DATA_DIR "share/veracity" CACHE STRING "Install location for data (relative to prefix).") |
67 |
- SET(CMAKE_DOC_DIR "share/veracity" CACHE STRING "Install location for documentation (relative to prefix).") |
68 |
- SET(CMAKE_MAN_DIR "man" CACHE STRING "Install location for man pages (relative to prefix).") |
69 |
|
70 |
diff --git a/dev-vcs/veracity/files/veracity-1.0.0.10517-system-sqlite.patch b/dev-vcs/veracity/files/veracity-1.0.0.10517-system-sqlite.patch |
71 |
deleted file mode 100644 |
72 |
index 5252dc0e369..00000000000 |
73 |
--- a/dev-vcs/veracity/files/veracity-1.0.0.10517-system-sqlite.patch |
74 |
+++ /dev/null |
75 |
@@ -1,45 +0,0 @@ |
76 |
-# HG changeset patch |
77 |
-# User Nathan Phillip Brink <ohnobinki@××××××××××××××.net> |
78 |
-# Date 1314878981 0 |
79 |
-# Node ID 91ac9ba6484c95748fef02086619f9edeff7d434 |
80 |
-# Parent 6769293155a7f4f8f7744f38ba1a24e38a77128c |
81 |
-Use system sqlite3 instead of bundled. |
82 |
- |
83 |
-diff -r 6769293155a7 -r 91ac9ba6484c common-CMakeLists.txt |
84 |
---- a/common-CMakeLists.txt Thu Sep 01 04:07:58 2011 +0000 |
85 |
-+++ b/common-CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000 |
86 |
-@@ -291,6 +291,11 @@ |
87 |
- set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${NSPR_LIB}) |
88 |
- MARK_AS_ADVANCED(NSPR_LIB) |
89 |
- |
90 |
-+FIND_PACKAGE(PkgConfig REQUIRED) |
91 |
-+PKG_CHECK_MODULES(SQLITE REQUIRED sqlite3) |
92 |
-+SET(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${SQLITE_LDFLAGS}) |
93 |
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SQLITE_CFLAGS}") |
94 |
-+ |
95 |
- # Only look for libuuid on Linux. OSX and Windows have this built in |
96 |
- IF("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") |
97 |
- FIND_PACKAGE(UUID REQUIRED) |
98 |
-diff -r 6769293155a7 -r 91ac9ba6484c src/CMakeLists.txt |
99 |
---- a/src/CMakeLists.txt Thu Sep 01 04:07:58 2011 +0000 |
100 |
-+++ b/src/CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000 |
101 |
-@@ -33,8 +33,6 @@ |
102 |
- add_subdirectory(winsync) |
103 |
- endif () # WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC |
104 |
- |
105 |
--add_subdirectory(thirdparty) |
106 |
-- |
107 |
- INSTALL( |
108 |
- DIRECTORY server_files |
109 |
- DESTINATION "${Veracity_DATA_DEST}" |
110 |
-diff -r 6769293155a7 -r 91ac9ba6484c src/libraries/ut/CMakeLists.txt |
111 |
---- a/src/libraries/ut/CMakeLists.txt Thu Sep 01 04:07:58 2011 +0000 |
112 |
-+++ b/src/libraries/ut/CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000 |
113 |
-@@ -161,6 +161,6 @@ |
114 |
- source_group("Header Files" FILES ${HEADERS}) |
115 |
- |
116 |
- add_library(sglib STATIC ${ALL_SOURCE}) |
117 |
--target_link_libraries(sglib sghash sgtemplates sqlite3 ${SG_THIRDPARTY_LIBRARIES} ${SG_OS_LIBS}) |
118 |
-+target_link_libraries(sglib sghash sgtemplates ${SG_THIRDPARTY_LIBRARIES} ${SG_OS_LIBS}) |
119 |
- |
120 |
- set_target_properties(sglib PROPERTIES FOLDER "Libraries") |
121 |
|
122 |
diff --git a/dev-vcs/veracity/files/veracity-1.0.0.10517-werror.patch b/dev-vcs/veracity/files/veracity-1.0.0.10517-werror.patch |
123 |
deleted file mode 100644 |
124 |
index 7e622a7d101..00000000000 |
125 |
--- a/dev-vcs/veracity/files/veracity-1.0.0.10517-werror.patch |
126 |
+++ /dev/null |
127 |
@@ -1,19 +0,0 @@ |
128 |
-# HG changeset patch |
129 |
-# User Nathan Phillip Brink <ohnobinki@××××××××××××××.net> |
130 |
-# Date 1314847280 0 |
131 |
-# Node ID 0646c94f7b47befbd5acc814ef1219b09f03fa71 |
132 |
-# Parent 368b57a9e1f890c4521d92c8d8c0e7abba7cfccc |
133 |
-Fix -Werror (by removing it and letting the user specify CFLAGS). |
134 |
- |
135 |
-diff -r 368b57a9e1f8 -r 0646c94f7b47 common-CMakeLists.txt |
136 |
---- a/common-CMakeLists.txt Thu Sep 01 03:20:54 2011 +0000 |
137 |
-+++ b/common-CMakeLists.txt Thu Sep 01 03:21:20 2011 +0000 |
138 |
-@@ -128,8 +128,6 @@ |
139 |
- # TODO but gcc on the Mac is at version 4.0 and this |
140 |
- # TODO option was added in some later version. |
141 |
- |
142 |
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wdeclaration-after-statement -Werror -Wstrict-prototypes") |
143 |
-- |
144 |
- # the apple_unicode code violates the strict-aliasing rules |
145 |
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing") |
146 |
- |
147 |
|
148 |
diff --git a/dev-vcs/veracity/metadata.xml b/dev-vcs/veracity/metadata.xml |
149 |
deleted file mode 100644 |
150 |
index 097975e3adc..00000000000 |
151 |
--- a/dev-vcs/veracity/metadata.xml |
152 |
+++ /dev/null |
153 |
@@ -1,4 +0,0 @@ |
154 |
-<?xml version="1.0" encoding="UTF-8"?> |
155 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
156 |
-<pkgmetadata> |
157 |
-</pkgmetadata> |
158 |
|
159 |
diff --git a/dev-vcs/veracity/veracity-1.0.0.10517.ebuild b/dev-vcs/veracity/veracity-1.0.0.10517.ebuild |
160 |
deleted file mode 100644 |
161 |
index d8f26dc3165..00000000000 |
162 |
--- a/dev-vcs/veracity/veracity-1.0.0.10517.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,86 +0,0 @@ |
165 |
-# Copyright 1999-2012 Gentoo Foundation |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
- |
168 |
-EAPI=4 |
169 |
- |
170 |
-inherit eutils cmake-utils |
171 |
- |
172 |
-JS_P=js-1.8.0-rc1 |
173 |
- |
174 |
-DESCRIPTION="A modern and featureful DVCS (distributed version control system)" |
175 |
-HOMEPAGE="http://veracity-scm.com/" |
176 |
-SRC_URI="http://download.sourcegear.com/Veracity/release/${PV}/${PN}-source-${PV}.tar.gz |
177 |
- |
178 |
- ftp://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz |
179 |
- http://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz" |
180 |
- |
181 |
-LICENSE="Apache-2.0" |
182 |
-SLOT="0" |
183 |
-KEYWORDS="~amd64 ~x86 ~x86-linux" |
184 |
-IUSE="test" |
185 |
- |
186 |
-S=${WORKDIR}/${PN} |
187 |
- |
188 |
-# Tests fail in 1.0.0.10517. |
189 |
-RESTRICT=test |
190 |
- |
191 |
-# Veracity can only use the API from spidermonkey-1.8.0 which isn't |
192 |
-# available in gentoo-x86. It seems that spidermonkey needs to be |
193 |
-# SLOTed... because Veracity needs differing amounts of nontrivial work |
194 |
-# to support spidermonkey-1.8.2 or any newer spidermonkey. |
195 |
-# |
196 |
-# || ( >=dev-lang/spidermonkey-1.8[threadsafe] >=dev-lang/spidermonkey-1.8.5 ) |
197 |
-RDEPEND=" |
198 |
- dev-libs/icu |
199 |
- net-misc/curl |
200 |
- dev-libs/nspr |
201 |
- sys-apps/util-linux |
202 |
- dev-db/sqlite:3 |
203 |
- sys-libs/zlib" |
204 |
-DEPEND="${RDEPEND} |
205 |
- virtual/pkgconfig |
206 |
- test? ( app-arch/unzip )" |
207 |
- |
208 |
-src_prepare() { |
209 |
- epatch "${FILESDIR}"/${P}-werror.patch |
210 |
- epatch "${FILESDIR}"/${P}-system-sqlite.patch |
211 |
- epatch "${FILESDIR}"/${P}-spidermonkey-as-needed.patch |
212 |
- |
213 |
- rm -rf src/thirdparty || die |
214 |
- |
215 |
- pushd "${WORKDIR}"/js || die |
216 |
- ( |
217 |
- EPATCH_OPTS+=" -p8" |
218 |
- epatch "${S}"/thirdparty/patches/js-1.8.0-rc1__{jsapi.c,jscntxt.{c,h}}.patch |
219 |
- ) |
220 |
-} |
221 |
- |
222 |
-src_configure() { |
223 |
- # Convince cmake scripts that spidermonkey has been prepared. |
224 |
- mkdir -p thirdparty/{include/spidermonkey,lib} || die |
225 |
- |
226 |
- local mycmakeargs=( |
227 |
- -DVVTHIRDPARTY="${S}"/thirdparty |
228 |
- -DSPIDERMONKEY_INCDIR="${S}"/thirdparty/include |
229 |
- -DSPIDERMONKEY_LIB="${S}"/thirdparty/lib/libjs.a |
230 |
- ) |
231 |
- cmake-utils_src_configure |
232 |
-} |
233 |
- |
234 |
-src_compile() { |
235 |
- einfo "Compiling embedded spidermonkey (${JS_P})." |
236 |
- # Based on thirdparty/build_linux.sh. |
237 |
- emake -j1 \ |
238 |
- -C "${WORKDIR}"/js/src \ |
239 |
- JS_DIST="${EPREFIX}"/usr \ |
240 |
- JS_THREADSAFE=1 \ |
241 |
- BUILD_OPT=1 \ |
242 |
- -f Makefile.ref |
243 |
- cp "${WORKDIR}"/js/src/{*.{h,msg,tbl},Linux_All_OPT.OBJ/*.h} thirdparty/include/spidermonkey/ \ |
244 |
- || die "Preparing embedded spidermonkey." |
245 |
- cp "${WORKDIR}"/js/src/Linux_All_OPT.OBJ/libjs.a thirdparty/lib/ \ |
246 |
- || die "Preparing embedded spidermonkey." |
247 |
- |
248 |
- einfo "Compiling ${P}." |
249 |
- cmake-utils_src_compile |
250 |
-} |
251 |
|
252 |
diff --git a/dev-vcs/veracity/veracity-1.1.0.10565.ebuild b/dev-vcs/veracity/veracity-1.1.0.10565.ebuild |
253 |
deleted file mode 100644 |
254 |
index 298be9fa2d2..00000000000 |
255 |
--- a/dev-vcs/veracity/veracity-1.1.0.10565.ebuild |
256 |
+++ /dev/null |
257 |
@@ -1,93 +0,0 @@ |
258 |
-# Copyright 1999-2012 Gentoo Foundation |
259 |
-# Distributed under the terms of the GNU General Public License v2 |
260 |
- |
261 |
-EAPI=4 |
262 |
- |
263 |
-inherit bash-completion-r1 eutils cmake-utils |
264 |
- |
265 |
-JS_P=js-1.8.0-rc1 |
266 |
- |
267 |
-DESCRIPTION="A modern and featureful DVCS (distributed version control system)" |
268 |
-HOMEPAGE="http://veracity-scm.com/" |
269 |
-SRC_URI="http://download.sourcegear.com/Veracity/release/${PV}/${PN}-source-${PV}.tar.gz |
270 |
- |
271 |
- ftp://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz |
272 |
- http://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz" |
273 |
- |
274 |
-LICENSE="Apache-2.0" |
275 |
-SLOT="0" |
276 |
-KEYWORDS="~amd64 ~x86 ~x86-linux" |
277 |
-IUSE="test" |
278 |
- |
279 |
-S=${WORKDIR}/${PN} |
280 |
- |
281 |
-# Tests fail in 1.0.0.10517. |
282 |
-RESTRICT=test |
283 |
- |
284 |
-# Veracity can only use the API from spidermonkey-1.8.0 which isn't |
285 |
-# available in gentoo-x86. It seems that spidermonkey needs to be |
286 |
-# SLOTed... because Veracity needs differing amounts of nontrivial work |
287 |
-# to support spidermonkey-1.8.2 or any newer spidermonkey. |
288 |
-# |
289 |
-# || ( >=dev-lang/spidermonkey-1.8[threadsafe] >=dev-lang/spidermonkey-1.8.5 ) |
290 |
-RDEPEND=" |
291 |
- dev-libs/icu |
292 |
- net-misc/curl |
293 |
- dev-libs/nspr |
294 |
- sys-apps/util-linux |
295 |
- dev-db/sqlite:3 |
296 |
- sys-libs/zlib" |
297 |
-DEPEND="${RDEPEND} |
298 |
- virtual/pkgconfig |
299 |
- test? ( app-arch/unzip )" |
300 |
- |
301 |
-src_prepare() { |
302 |
- epatch "${FILESDIR}"/${PN}-1.0.0.10517-werror.patch |
303 |
- epatch "${FILESDIR}"/${PN}-1.0.0.10517-system-sqlite.patch |
304 |
- epatch "${FILESDIR}"/${PN}-1.0.0.10517-spidermonkey-as-needed.patch |
305 |
- |
306 |
- rm -rf src/thirdparty || die |
307 |
- |
308 |
- pushd "${WORKDIR}"/js || die |
309 |
- ( |
310 |
- EPATCH_OPTS+=" -p8" |
311 |
- epatch "${S}"/thirdparty/patches/js-1.8.0-rc1__{jsapi.c,jscntxt.{c,h}}.patch |
312 |
- ) |
313 |
-} |
314 |
- |
315 |
-src_configure() { |
316 |
- # Convince cmake scripts that spidermonkey has been prepared. |
317 |
- mkdir -p thirdparty/{include/spidermonkey,lib} || die |
318 |
- |
319 |
- local mycmakeargs=( |
320 |
- -DVVTHIRDPARTY="${S}"/thirdparty |
321 |
- -DSPIDERMONKEY_INCDIR="${S}"/thirdparty/include |
322 |
- -DSPIDERMONKEY_LIB="${S}"/thirdparty/lib/libjs.a |
323 |
- ) |
324 |
- cmake-utils_src_configure |
325 |
-} |
326 |
- |
327 |
-src_compile() { |
328 |
- einfo "Compiling embedded spidermonkey (${JS_P})." |
329 |
- # Based on thirdparty/build_linux.sh. |
330 |
- emake -j1 \ |
331 |
- -C "${WORKDIR}"/js/src \ |
332 |
- JS_DIST="${EPREFIX}"/usr \ |
333 |
- JS_THREADSAFE=1 \ |
334 |
- BUILD_OPT=1 \ |
335 |
- -f Makefile.ref |
336 |
- cp "${WORKDIR}"/js/src/{*.{h,msg,tbl},Linux_All_OPT.OBJ/*.h} thirdparty/include/spidermonkey/ \ |
337 |
- || die "Preparing embedded spidermonkey." |
338 |
- cp "${WORKDIR}"/js/src/Linux_All_OPT.OBJ/libjs.a thirdparty/lib/ \ |
339 |
- || die "Preparing embedded spidermonkey." |
340 |
- |
341 |
- einfo "Compiling ${P}." |
342 |
- cmake-utils_src_compile |
343 |
-} |
344 |
- |
345 |
-src_install() { |
346 |
- cmake-utils_src_install |
347 |
- |
348 |
- rm -f "${D}"/etc/bash-completion.d || die |
349 |
- newbashcomp src/cmd/vv.bash_completion vv |
350 |
-} |