commit: 0529aa65430ba260d3a7e103187a04e7164951ee Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Mon Jul 17 23:25:30 2017 +0000 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> CommitDate: Tue Jul 18 16:09:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0529aa65
net-fs/cvmfs: version bump Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-fs/cvmfs/Manifest | 2 +- net-fs/cvmfs/cvmfs-2.1.19.ebuild | 102 ------------------------- net-fs/cvmfs/cvmfs-2.3.5.ebuild | 158 +++++++++++++++++++++++++++++++++++++++ net-fs/cvmfs/cvmfs-9999.ebuild | 109 --------------------------- net-fs/cvmfs/metadata.xml | 2 + 5 files changed, 161 insertions(+), 212 deletions(-) diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index 14078f98a2c..6cf2de2ca10 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1,2 +1,2 @@ -DIST cvmfs-2.1.19.tar.gz 34454888 SHA256 9f86629eba17d8f21222f50e3f693038b6a99798b74913d12c7583199df677b1 SHA512 ea2b68a545b5b20eacbe5244283f71f977365dce7cf09e3b0ef045fe5044b2835e81a79deaed74afaec44cfd25df602ebffaf26d0fe1f5ce6032e71ba10ffdc7 WHIRLPOOL 14fa079be91dce64151c60ec2fda6c2a874957e3388da98e1d51ce1536e67b9b56d40a1c7f98862743120d7230b789f6c7e524983a58e58ef409f028613d2c64 DIST cvmfs-2.1.20.0-fix05.tar.gz 36877322 SHA256 83d9358bebdd3987472ed602efb7b0d06b586216030e02bc100a363dc7bbfc20 SHA512 95dc6d5e433630aecd45e15d59f831b4b1ccd8a439f799ae078a61bd6fd8e4dc10ae72d760352913c1d4d9e50cd5bc71ddd82b40b8b9b59d371d62aa7e62abf6 WHIRLPOOL a9ab8500ddd31466df26c12fbcaf0403e748fc1d52c9b5eefa495bc1aaa1f1c67e5f679407d55143fe161f7de7be0d52284cb947a63ff0e0a3f63ade879bb21c +DIST cvmfs-2.3.5.tar.gz 37771779 SHA256 4e35b81f98f8b3c9588081abaedee76bd796da6750ff1fcd6189882a751d397b SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b WHIRLPOOL d3de1deb541ee8c3e439e1fbda151c73d602ec4ceb54b1e94fd50a1c8716b497c23082b60cb887dabbd3602dbc5c6d1bc375544d20201d95d92ea7f0c30d5823 diff --git a/net-fs/cvmfs/cvmfs-2.1.19.ebuild b/net-fs/cvmfs/cvmfs-2.1.19.ebuild deleted file mode 100644 index f5f64c47c64..00000000000 --- a/net-fs/cvmfs/cvmfs-2.1.19.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="HTTP read-only file system for distributing software" -HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"; -SRC_URI="https://ecsft.cern.ch/dist/${PN}/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="+client debug doc test server" - -CDEPEND=" - dev-cpp/gtest - dev-db/sqlite:3= - dev-libs/openssl:0 - net-libs/pacparser:0= - net-misc/curl:0=[adns] - sys-apps/attr - sys-libs/zlib:0= - client? ( - dev-cpp/sparsehash - dev-libs/leveldb:0= - sys-fs/fuse:0= ) - server? ( >=dev-cpp/tbb-4.2:0= )" - -RDEPEND="${CDEPEND} - client? ( net-fs/autofs ) - server? ( www-servers/apache[ssl] )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -src_prepare() { - sed -i -e 's/COPYING//' CMakeLists.txt || die - rm bootstrap.sh || die - sed -i \ - -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ - CMakeLists.txt || die - # hack for bundled vjson - # vjson not worth unbundling, already upstream obsolete - # upstream replaced by gason with a new api - if use server; then - sed -i \ - -e 's/g++/$(CXX)/g' \ - -e 's/-O2/$(CXXFLAGS)/g' \ - -e 's/ar/$(AR)/' \ - -e 's/ranlib/$(RANLIB)/' \ - externals/vjson/src/Makefile || die - mkdir -p "${S}_build"/externals/build_vjson - cp externals/vjson/src/* "${S}_build"/externals/build_vjson/ || die - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DGOOGLETEST_BUILTIN=OFF - -DLEVELDB_BUILTIN=OFF - -DLIBCURL_BUILTIN=OFF - -DPACPARSER_BUILTIN=OFF - -DSPARSEHASH_BUILTIN=OFF - -DSQLITE3_BUILTIN=OFF - -DTBB_PRIVATE_LIB=OFF - -DZLIB_BUILTIN=OFF - $(cmake-utils_use debug BUILD_SERVER_DEBUG) - $(cmake-utils_use server BUILD_SERVER) - $(cmake-utils_use client BUILD_CVMFS) - $(cmake-utils_use client BUILD_LIBCVMFS) - $(cmake-utils_use client INSTALL_MOUNT_SCRIPTS) - $(cmake-utils_use test BUILD_UNITTESTS) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc; then - cd doc - doxygen cvmfs.doxy || die - fi -} - -src_install() { - cmake-utils_src_install - use doc && dohtml -r doc/html/* -} - -pkg_config() { - if use client; then - einfo "Setting up CernVM-FS client" - cvmfs_config setup - einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local and run" - einfo " ${EROOT%/}/usr/init.d/autofs restart" - fi -} diff --git a/net-fs/cvmfs/cvmfs-2.3.5.ebuild b/net-fs/cvmfs/cvmfs-2.3.5.ebuild new file mode 100644 index 00000000000..ae16006ece1 --- /dev/null +++ b/net-fs/cvmfs/cvmfs-2.3.5.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils linux-info bash-completion-r1 + +MYP=${PN}-${PV/_p/-fix} + +DESCRIPTION="HTTP read-only file system for distributing software" +HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"; +SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz"; + +LICENSE="BSD" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="aufs bash-completion debug doc server test test-programs" + +CDEPEND=" + dev-cpp/gtest + >=dev-cpp/sparsehash-1.12 + dev-db/sqlite:3= + dev-libs/leveldb:0= + dev-libs/openssl:0 + net-libs/pacparser:0= + net-misc/curl:0[adns] + sys-apps/attr + sys-fs/fuse:0= + sys-libs/libcap:0= + sys-libs/zlib:0= + server? ( + >=dev-cpp/tbb-4.4:0=[debug?] + dev-python/geoip-python + ) +" + +RDEPEND="${CDEPEND} + app-admin/sudo + net-fs/autofs + server? ( + aufs? ( || ( + sys-fs/aufs3 + sys-fs/aufs4 + sys-kernel/aufs-sources ) ) + www-servers/apache + ) +" + +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + test? ( + dev-python/geoip-python + >=dev-cpp/tbb-4.4:0= + || ( sys-devel/gdb dev-util/lldb ) + ) +" + +REQUIRED_USE="test-programs? ( server )" + +S="${WORKDIR}/${PN}-${MYP}" + +pkg_setup() { + if use server; then + if use aufs; then + CONFIG_CHECK="~AUFS_FS" + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set with the aufs flag" + else + CONFIG_CHECK="~OVERLAY_FS" + ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set" + fi + linux-info_pkg_setup + fi +} + +src_prepare() { + cmake-utils_src_prepare + # gentoo stuff + sed -i -e 's/COPYING//' CMakeLists.txt || die + rm bootstrap.sh || die + sed -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ + -i CMakeLists.txt || die + + sed -e 's|${res_path}/conf.d|${res_path/modules.d|' \ + -i cvmfs/cvmfs_server || die + + # hack for bundled vjson sha2 and sha3 + # vjson not worth unbundling, already upstream obsolete + # upstream replaced by gason with a new api + sed -e 's/g++/$(CXX)/g' \ + -e 's/ar/$(AR)/' \ + -e 's/ranlib/$(RANLIB)/' \ + -i externals/vjson/src/Makefile || die + local d + for d in vjson sha2 sha3; do + mkdir -p "${WORKDIR}/${P}_build"/externals/build_${d} + cp -r externals/${d}/src/* \ + "${WORKDIR}/${P}_build"/externals/build_${d}/ || die + done +} + +src_configure() { + local mycmakeargs=( + -DGEOIP_BUILTIN=OFF + -DGOOGLETEST_BUILTIN=OFF + -DLEVELDB_BUILTIN=OFF + -DLIBCURL_BUILTIN=OFF + -DPACPARSER_BUILTIN=OFF + -DSPARSEHASH_BUILTIN=OFF + -DSQLITE3_BUILTIN=OFF + -DTBB_PRIVATE_LIB=OFF + -DZLIB_BUILTIN=OFF + -DBUILD_CVMFS=ON + -DBUILD_PRELOADER=ON + -DBUILD_LIBCVMFS=ON + -DINSTALL_MOUNT_SCRIPTS=ON + -DINSTALL_PUBLIC_KEYS=ON + -DINSTALL_BASH_COMPLETION=OFF + -DBUILD_DOCUMENTATION="$(usex doc)" + -DBUILD_SERVER="$(usex server)" + ) + if use test || use test-programs; then + mycmakeargs+=( -DBUILD_UNITTESTS=ON ) + fi + use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON ) + if use debug; then + mycmakeargs+=( + $(cmake-utils_use server BUILD_SERVER_DEBUG) + $(cmake-utils_use test BUILD_UNITTESTS_DEBUG) + ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use doc && cmake-utils_src_compile doc +} + +src_install() { + cmake-utils_src_install + use bash-completion && \ + newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs + dodoc doc/*.md + if use doc; then + insinto /usr/share/doc/${PF} + doins -r "${BUILD_DIR}"/html + docompress -x /usr/share/doc/${PF}/html + fi +} + +pkg_config() { + einfo "Setting up CernVM-FS client" + cvmfs_config setup + einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local" + einfo "and restart the autofs service" +} diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild deleted file mode 100644 index 3dbf849fa2f..00000000000 --- a/net-fs/cvmfs/cvmfs-9999.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -EGIT_REPO_URI="https://github.com/cvmfs/cvmfs.git"; -EGIT_BRANCH="devel" - -inherit git-r3 cmake-utils - -DESCRIPTION="HTTP read-only file system for distributing software" -HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"; - -SRC_URI= -KEYWORDS= - -LICENSE="BSD" -SLOT="0" - -IUSE="+client debug doc test server" - -CDEPEND=" - dev-cpp/gtest - dev-db/sqlite:3= - dev-libs/openssl:0 - net-libs/pacparser:0= - net-misc/curl:0=[adns] - sys-apps/attr - sys-libs/zlib:0= - client? ( - >=dev-cpp/sparsehash-1.12 - dev-libs/leveldb:0= - sys-fs/fuse:0= ) - server? ( - >=dev-python/geoip-python-1.3.1 - >=dev-cpp/tbb-4.2:0= )" - -RDEPEND="${CDEPEND} - client? ( net-fs/autofs ) - server? ( www-servers/apache[ssl] )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -src_prepare() { - sed -i -e 's/COPYING//' CMakeLists.txt || die - rm bootstrap.sh || die - sed -i \ - -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ - CMakeLists.txt || die - # hack for bundled vjson - # vjson not worth unbundling, already upstream obsolete - # upstream replaced by gason with a new api - if use server; then - sed -i \ - -e 's/g++/$(CXX)/g' \ - -e 's/-O2/$(CXXFLAGS)/g' \ - -e 's/ar/$(AR)/' \ - -e 's/ranlib/$(RANLIB)/' \ - externals/vjson/src/Makefile || die - mkdir -p "${WORKDIR}/${P}_build"/externals/build_vjson - cp externals/vjson/src/* "${WORKDIR}/${P}_build"/externals/build_vjson/ || die - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DGEOIP_BUILTIN=OFF - -DGOOGLETEST_BUILTIN=OFF - -DLEVELDB_BUILTIN=OFF - -DLIBCURL_BUILTIN=OFF - -DPACPARSER_BUILTIN=OFF - -DSPARSEHASH_BUILTIN=OFF - -DSQLITE3_BUILTIN=OFF - -DTBB_PRIVATE_LIB=OFF - -DZLIB_BUILTIN=OFF - $(cmake-utils_use debug BUILD_SERVER_DEBUG) - $(cmake-utils_use server BUILD_SERVER) - $(cmake-utils_use client BUILD_CVMFS) - $(cmake-utils_use client BUILD_LIBCVMFS) - $(cmake-utils_use client INSTALL_MOUNT_SCRIPTS) - $(cmake-utils_use test BUILD_UNITTESTS) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc; then - cd doc - doxygen cvmfs.doxy || die - fi -} - -src_install() { - cmake-utils_src_install - use doc && dohtml -r doc/html/* -} - -pkg_config() { - if use client; then - einfo "Setting up CernVM-FS client" - cvmfs_config setup - einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local and run" - einfo " ${EROOT%/}/usr/init.d/autofs restart" - fi -} diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml index 086177bc0ae..ec2d91c8fb8 100644 --- a/net-fs/cvmfs/metadata.xml +++ b/net-fs/cvmfs/metadata.xml @@ -16,8 +16,10 @@ SHA-1 keys. </longdescription> <use> + <flag name='aufs'>Use AUFS instead of OverlayFS for the server</flag> <flag name="client">Install the cvmfs client programs and init script</flag> <flag name="server">Install the cvmfsd program and init script</flag> + <flag name='test-programs'>Install unit test programs</flag> </use> <upstream> <remote-id type="github">cvmfs/cvmfs</remote-id>
