commit: 2b2b32f650e62f7d79df328657e2b3fae4a817c3
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:07:35 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 18:09:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2b32f6
dev-vcs/veracity: Remove last-rited pkg
Gentoo-bug: 607998
dev-vcs/veracity/Manifest | 3 -
...racity-1.0.0.10517-spidermonkey-as-needed.patch | 32 --------
.../files/veracity-1.0.0.10517-system-sqlite.patch | 45 -----------
.../files/veracity-1.0.0.10517-werror.patch | 19 -----
dev-vcs/veracity/metadata.xml | 4 -
dev-vcs/veracity/veracity-1.0.0.10517.ebuild | 86 --------------------
dev-vcs/veracity/veracity-1.1.0.10565.ebuild | 93 ----------------------
7 files changed, 282 deletions(-)
diff --git a/dev-vcs/veracity/Manifest b/dev-vcs/veracity/Manifest
deleted file mode 100644
index 690cbeaead7..00000000000
--- a/dev-vcs/veracity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST js-1.8.0-rc1.tar.gz 1310344 SHA256
374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413 SHA512
b6e851d96cc3b5a10c3fc531922e8ba59c28e587c72365b63c3a0ab65a400cb24a217310dc9891387c02b79eb5f159e9b3d9bab36ce138257815b11d0524d5ba
WHIRLPOOL
918e11fd7dfb9de6c7f8274761963109a72551a5b5606e5c22fa476975f47f51f64a6d3f4f9cb07818e5a6216c2fb2f0181c5e0efd2930cf01abc9ba6d22e370
-DIST veracity-source-1.0.0.10517.tar.gz 5211043 SHA256
2f9d1e3108229a85adff01d713abaea9eeaf873de5f651db60271efb7f517321 SHA512
c1f5e5a4231763ea75d779922c355de0f925de5e7a92a579d63191612d9f576e3105152be3d55a24e93589c7651b95e5fb7749bc488e777b9c6be030ebfb2b27
WHIRLPOOL
efd4800f5095214a03fff12e1fae5276589d40c1e66790b9a455f1771f6778b86c218a52b9d0b193eb3c8f710ba3d1075fb983d4ec3e7e9270cb594958265624
-DIST veracity-source-1.1.0.10565.tar.gz 5377948 SHA256
2d129005ec1c62b78307a08899edce3a036e75a4a22be4e0dfed02c3fe17a16b SHA512
b26a34bdd6e71e460c878622114ee317f27dce594f6de4588dbb1cce8f0df9ac5d3679b0f8f31f9fd3afe2aa81218fe026ede0ae3c1a4cd3f47d09b584a02de9
WHIRLPOOL
7774359f38be43d97f1ed6aedc4c92d994fc0695cee481c0f7dedcd7a9456f8bdf9b885052c10d0e5895e5dd8010affb1335adcc69c33cc0d2db3c791c4dd1de
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
deleted file mode 100644
index 31964feb310..00000000000
--- a/dev-vcs/veracity/files/veracity-1.0.0.10517-spidermonkey-as-needed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Nathan Phillip Brink <ohnobi...@ohnopublishing.net>
-# Date 1315717091 0
-# Node ID 30297b7085c3a1ea1ecd390330ff291761128bae
-# Parent b44ad1bfbdbefb74cf53502ee6d0e5e7a5f97da5
-The embedded spidermonkey libjs.a needs nspr, fix -Wl,--as-needed.
-
-diff -r b44ad1bfbdbe -r 30297b7085c3 common-CMakeLists.txt
---- a/common-CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000
-+++ b/common-CMakeLists.txt Sun Sep 11 04:58:11 2011 +0000
-@@ -297,10 +297,6 @@
- INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
- set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${CURL_LIBRARIES})
-
--FIND_LIBRARY(NSPR_LIB NAMES nspr4 libnspr4)
--set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${NSPR_LIB})
--MARK_AS_ADVANCED(NSPR_LIB)
--
- FIND_PACKAGE(PkgConfig REQUIRED)
- PKG_CHECK_MODULES(SQLITE REQUIRED sqlite3)
- SET(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${SQLITE_LDFLAGS})
-@@ -321,6 +317,10 @@
- MARK_AS_ADVANCED(SPIDERMONKEY_LIB)
- set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${SPIDERMONKEY_LIB})
-
-+FIND_LIBRARY(NSPR_LIB NAMES nspr4 libnspr4)
-+set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${NSPR_LIB})
-+MARK_AS_ADVANCED(NSPR_LIB)
-+
- SET(CMAKE_DATA_DIR "share/veracity" CACHE STRING "Install location for data
(relative to prefix).")
- SET(CMAKE_DOC_DIR "share/veracity" CACHE STRING "Install location for
documentation (relative to prefix).")
- SET(CMAKE_MAN_DIR "man" CACHE STRING "Install location for man pages
(relative to prefix).")
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
deleted file mode 100644
index 5252dc0e369..00000000000
--- a/dev-vcs/veracity/files/veracity-1.0.0.10517-system-sqlite.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User Nathan Phillip Brink <ohnobi...@ohnopublishing.net>
-# Date 1314878981 0
-# Node ID 91ac9ba6484c95748fef02086619f9edeff7d434
-# Parent 6769293155a7f4f8f7744f38ba1a24e38a77128c
-Use system sqlite3 instead of bundled.
-
-diff -r 6769293155a7 -r 91ac9ba6484c common-CMakeLists.txt
---- a/common-CMakeLists.txt Thu Sep 01 04:07:58 2011 +0000
-+++ b/common-CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000
-@@ -291,6 +291,11 @@
- set(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${NSPR_LIB})
- MARK_AS_ADVANCED(NSPR_LIB)
-
-+FIND_PACKAGE(PkgConfig REQUIRED)
-+PKG_CHECK_MODULES(SQLITE REQUIRED sqlite3)
-+SET(SG_THIRDPARTY_LIBRARIES ${SG_THIRDPARTY_LIBRARIES} ${SQLITE_LDFLAGS})
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SQLITE_CFLAGS}")
-+
- # Only look for libuuid on Linux. OSX and Windows have this built in
- IF("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
- FIND_PACKAGE(UUID REQUIRED)
-diff -r 6769293155a7 -r 91ac9ba6484c src/CMakeLists.txt
---- a/src/CMakeLists.txt Thu Sep 01 04:07:58 2011 +0000
-+++ b/src/CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000
-@@ -33,8 +33,6 @@
- add_subdirectory(winsync)
- endif () # WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC
-
--add_subdirectory(thirdparty)
--
- INSTALL(
- DIRECTORY server_files
- DESTINATION "${Veracity_DATA_DEST}"
-diff -r 6769293155a7 -r 91ac9ba6484c src/libraries/ut/CMakeLists.txt
---- a/src/libraries/ut/CMakeLists.txt Thu Sep 01 04:07:58 2011 +0000
-+++ b/src/libraries/ut/CMakeLists.txt Thu Sep 01 12:09:41 2011 +0000
-@@ -161,6 +161,6 @@
- source_group("Header Files" FILES ${HEADERS})
-
- add_library(sglib STATIC ${ALL_SOURCE})
--target_link_libraries(sglib sghash sgtemplates sqlite3
${SG_THIRDPARTY_LIBRARIES} ${SG_OS_LIBS})
-+target_link_libraries(sglib sghash sgtemplates ${SG_THIRDPARTY_LIBRARIES}
${SG_OS_LIBS})
-
- set_target_properties(sglib PROPERTIES FOLDER "Libraries")
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
deleted file mode 100644
index 7e622a7d101..00000000000
--- a/dev-vcs/veracity/files/veracity-1.0.0.10517-werror.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Nathan Phillip Brink <ohnobi...@ohnopublishing.net>
-# Date 1314847280 0
-# Node ID 0646c94f7b47befbd5acc814ef1219b09f03fa71
-# Parent 368b57a9e1f890c4521d92c8d8c0e7abba7cfccc
-Fix -Werror (by removing it and letting the user specify CFLAGS).
-
-diff -r 368b57a9e1f8 -r 0646c94f7b47 common-CMakeLists.txt
---- a/common-CMakeLists.txt Thu Sep 01 03:20:54 2011 +0000
-+++ b/common-CMakeLists.txt Thu Sep 01 03:21:20 2011 +0000
-@@ -128,8 +128,6 @@
- # TODO but gcc on the Mac is at version 4.0 and this
- # TODO option was added in some later version.
-
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra
-Wdeclaration-after-statement -Werror -Wstrict-prototypes")
--
- # the apple_unicode code violates the strict-aliasing rules
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
-
diff --git a/dev-vcs/veracity/metadata.xml b/dev-vcs/veracity/metadata.xml
deleted file mode 100644
index 097975e3adc..00000000000
--- a/dev-vcs/veracity/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-vcs/veracity/veracity-1.0.0.10517.ebuild
b/dev-vcs/veracity/veracity-1.0.0.10517.ebuild
deleted file mode 100644
index d8f26dc3165..00000000000
--- a/dev-vcs/veracity/veracity-1.0.0.10517.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-JS_P=js-1.8.0-rc1
-
-DESCRIPTION="A modern and featureful DVCS (distributed version control system)"
-HOMEPAGE="http://veracity-scm.com/";
-SRC_URI="http://download.sourcegear.com/Veracity/release/${PV}/${PN}-source-${PV}.tar.gz
-
- ftp://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz
- http://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="test"
-
-S=${WORKDIR}/${PN}
-
-# Tests fail in 1.0.0.10517.
-RESTRICT=test
-
-# Veracity can only use the API from spidermonkey-1.8.0 which isn't
-# available in gentoo-x86. It seems that spidermonkey needs to be
-# SLOTed... because Veracity needs differing amounts of nontrivial work
-# to support spidermonkey-1.8.2 or any newer spidermonkey.
-#
-# || ( >=dev-lang/spidermonkey-1.8[threadsafe] >=dev-lang/spidermonkey-1.8.5 )
-RDEPEND="
- dev-libs/icu
- net-misc/curl
- dev-libs/nspr
- sys-apps/util-linux
- dev-db/sqlite:3
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( app-arch/unzip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-werror.patch
- epatch "${FILESDIR}"/${P}-system-sqlite.patch
- epatch "${FILESDIR}"/${P}-spidermonkey-as-needed.patch
-
- rm -rf src/thirdparty || die
-
- pushd "${WORKDIR}"/js || die
- (
- EPATCH_OPTS+=" -p8"
- epatch
"${S}"/thirdparty/patches/js-1.8.0-rc1__{jsapi.c,jscntxt.{c,h}}.patch
- )
-}
-
-src_configure() {
- # Convince cmake scripts that spidermonkey has been prepared.
- mkdir -p thirdparty/{include/spidermonkey,lib} || die
-
- local mycmakeargs=(
- -DVVTHIRDPARTY="${S}"/thirdparty
- -DSPIDERMONKEY_INCDIR="${S}"/thirdparty/include
- -DSPIDERMONKEY_LIB="${S}"/thirdparty/lib/libjs.a
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- einfo "Compiling embedded spidermonkey (${JS_P})."
- # Based on thirdparty/build_linux.sh.
- emake -j1 \
- -C "${WORKDIR}"/js/src \
- JS_DIST="${EPREFIX}"/usr \
- JS_THREADSAFE=1 \
- BUILD_OPT=1 \
- -f Makefile.ref
- cp "${WORKDIR}"/js/src/{*.{h,msg,tbl},Linux_All_OPT.OBJ/*.h}
thirdparty/include/spidermonkey/ \
- || die "Preparing embedded spidermonkey."
- cp "${WORKDIR}"/js/src/Linux_All_OPT.OBJ/libjs.a thirdparty/lib/ \
- || die "Preparing embedded spidermonkey."
-
- einfo "Compiling ${P}."
- cmake-utils_src_compile
-}
diff --git a/dev-vcs/veracity/veracity-1.1.0.10565.ebuild
b/dev-vcs/veracity/veracity-1.1.0.10565.ebuild
deleted file mode 100644
index 298be9fa2d2..00000000000
--- a/dev-vcs/veracity/veracity-1.1.0.10565.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1 eutils cmake-utils
-
-JS_P=js-1.8.0-rc1
-
-DESCRIPTION="A modern and featureful DVCS (distributed version control system)"
-HOMEPAGE="http://veracity-scm.com/";
-SRC_URI="http://download.sourcegear.com/Veracity/release/${PV}/${PN}-source-${PV}.tar.gz
-
- ftp://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz
- http://ftp.mozilla.org/pub/mozilla.org/js/${JS_P}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="test"
-
-S=${WORKDIR}/${PN}
-
-# Tests fail in 1.0.0.10517.
-RESTRICT=test
-
-# Veracity can only use the API from spidermonkey-1.8.0 which isn't
-# available in gentoo-x86. It seems that spidermonkey needs to be
-# SLOTed... because Veracity needs differing amounts of nontrivial work
-# to support spidermonkey-1.8.2 or any newer spidermonkey.
-#
-# || ( >=dev-lang/spidermonkey-1.8[threadsafe] >=dev-lang/spidermonkey-1.8.5 )
-RDEPEND="
- dev-libs/icu
- net-misc/curl
- dev-libs/nspr
- sys-apps/util-linux
- dev-db/sqlite:3
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( app-arch/unzip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.0.10517-werror.patch
- epatch "${FILESDIR}"/${PN}-1.0.0.10517-system-sqlite.patch
- epatch "${FILESDIR}"/${PN}-1.0.0.10517-spidermonkey-as-needed.patch
-
- rm -rf src/thirdparty || die
-
- pushd "${WORKDIR}"/js || die
- (
- EPATCH_OPTS+=" -p8"
- epatch
"${S}"/thirdparty/patches/js-1.8.0-rc1__{jsapi.c,jscntxt.{c,h}}.patch
- )
-}
-
-src_configure() {
- # Convince cmake scripts that spidermonkey has been prepared.
- mkdir -p thirdparty/{include/spidermonkey,lib} || die
-
- local mycmakeargs=(
- -DVVTHIRDPARTY="${S}"/thirdparty
- -DSPIDERMONKEY_INCDIR="${S}"/thirdparty/include
- -DSPIDERMONKEY_LIB="${S}"/thirdparty/lib/libjs.a
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- einfo "Compiling embedded spidermonkey (${JS_P})."
- # Based on thirdparty/build_linux.sh.
- emake -j1 \
- -C "${WORKDIR}"/js/src \
- JS_DIST="${EPREFIX}"/usr \
- JS_THREADSAFE=1 \
- BUILD_OPT=1 \
- -f Makefile.ref
- cp "${WORKDIR}"/js/src/{*.{h,msg,tbl},Linux_All_OPT.OBJ/*.h}
thirdparty/include/spidermonkey/ \
- || die "Preparing embedded spidermonkey."
- cp "${WORKDIR}"/js/src/Linux_All_OPT.OBJ/libjs.a thirdparty/lib/ \
- || die "Preparing embedded spidermonkey."
-
- einfo "Compiling ${P}."
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm -f "${D}"/etc/bash-completion.d || die
- newbashcomp src/cmd/vv.bash_completion vv
-}
