Version bump, changed repository and branch to upstream for live ebuild

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 130 insertions, 8 deletions

diff --git a/net-fs/cvmfs/ChangeLog b/net-fs/cvmfs/ChangeLog
index 81ce5690987d..cb6969d11517 100644
--- a/net-fs/cvmfs/ChangeLog
+++ b/net-fs/cvmfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/cvmfs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.9 2013/12/02 05:20:52 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.10 2014/02/05 18:00:36 bicatali Exp $
+
+*cvmfs-2.1.17 (05 Feb 2014)
+
+  05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +cvmfs-2.1.17.ebuild,
+  cvmfs-9999.ebuild:
+  Version bump, changed repository and branch to upstream for live ebuild
 
   02 Dec 2013; Patrick Lauer <patrick@gentoo.org> cvmfs-9999.ebuild:
   Whitespace
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index c491ee0a95f8..f4eb379fbfe9 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX FindCARes.cmake 1272 SHA256 fd256e7d5375f9ac65f539ae6e8ff8d0b92c7e6dbd3b9c548913ca82ea78be19 SHA512 35818e190f4861bee71f3620bcda1bbb6424587b320ee15eb9a258b04182f9b8ede316721b04622b3effcec9870981bbd245c72bb549334b3398923718a3a9c6 WHIRLPOOL 5048f07597bc411e27b816545bd6750b3ef80158f2ef429b92aff8392f439b7bfcbc74d0dae6f8bb096cc6161eb98b0ba73ec8c3ff17f1c8bd0b076e85be7165
 AUX Findleveldb.cmake 1084 SHA256 d8f123d216310d38dd7f80e2d5c4b2d599a5fca4f221332927ac26890db8404b SHA512 ad195cfc953df1fe3f32ebaad2d1b5654fc23d7080ce9d719f92b389b47fc97d8a9281a3fd8137c2f718f1bd4e1f903c334fd9c192f61e0f3414d51ef9a5b40e WHIRLPOOL 8ee612d5327faf182e735caf5b05eb9aaf193e6cde5b55e93994455c4aeb792fd6fa12533d369b905388195e9f0d55ffd8e7044634f03750b9cf3e42011a198d
 AUX cvmfs-2.1.10-no-config.patch 327 SHA256 a994212e59a22faabcbef81a0b5b11235c057dd132980513039272312b71bca1 SHA512 99642d6044f1f3cdfd3382441b0f0f7d1d61a356b0cde34fdd70bfb73e968221e011ef69211d15c862b003b7771d6a7e7bbb6e6cbe462362f21ef345476aafaa WHIRLPOOL 02281b828efb9a51ca824e4ed6764d1f0e1a511b35bda127c761b5283ac0491c7fb46826817e3c6d3c524ddd5cd2d3de022dd511d11e6af119880ec811869863
 AUX cvmfs-2.1.10-openrc.patch 1663 SHA256 fe7963d86f077320d5eacc0fd286666087bb0ca9fb09937c56bca08b53dbdfab SHA512 bba6927b93244ecf61760d41a53c82b8f286f0f8daf3e7d4677438eee9603a25a216fa4204e32d8cdc733ad37102f7d440afc6261737d490022fdc4abee04d32 WHIRLPOOL 550358e224eecfe6291a3361f35d96ea4b72b09e77b6c58926fc547ef2d85fd458737c4bb8c94b480658440eca27441821aca03dd57aa2faa8f3a355bf654c58
 DIST cvmfs-2.1.14.tar.gz 12960947 SHA256 3be0446f29d23417b3a30684d9ed73fc0a73c11952d9aecf63748ed61d5b9cd3 SHA512 e67067fdce6cef076af41959a89b44b64942ac8d87b14bcdf7c9e7920cf4303dd8dd81eaf94849c5cddb9e858d947bfa22fc185771a8dac845214b1d56e9fa89 WHIRLPOOL 83a033b28cd1fe7fb6f2e79082cf10636f351fc47a00bce5ed19299c29145b9143c9da643ac466ef3812bcad2f476040f8bcdc48754b9d52c6b151d731057fca
+DIST cvmfs-2.1.17.tar.gz 11594098 SHA256 4f8bb1cc68323534f678b83676b6c71d51324cc2665683da5872e6d44185b66f SHA512 20f78a94c90514876088cdbc03e3434bd4f5a62d36920f9ea4b37e96f195f5c8a6124922c31006a2fa871ded9f42d9e1e64527081ea6799e1ea8391f52eeac2e WHIRLPOOL 34c482750c428f91612612b1b5cf2574543200d868d535e0152cd69b2f99628344c0b7b2bd5cd399296d129350ac79244bce2aa888d0ba2ba27f683c3524a952
 EBUILD cvmfs-2.1.14.ebuild 1971 SHA256 b2b8792e5bbb2d402ba205e74d9fef4209e206ba6ba92c4761d39635455b29ca SHA512 81274d875892f91c1759b1954791300bea8bc4e2d1743d7ca519fb251dd868d93a0f0d136d79d293e528d38ff6a7b1ce89a0ebee45bb79e7f2246ba0523813b5 WHIRLPOOL 5a951052d6b82868dc201501b1426346003bd86aa97d86ffef68777fd522b91b3c82b613f82cc977a8d43cc763a6ed5b75be81c1c821f4ec2fffc4f47efaaf4f
-EBUILD cvmfs-9999.ebuild 2568 SHA256 ac5a875edbac03b0e3e29ab6d502b0cb0a445a8b5ee36359b7c8e9be7ff63097 SHA512 908f65d9815911b4ed74895fb41fe056a06b9054a11ec61347dded90cfc2230088921c19fffbb09487fdc7d84b156f19f419d6d8b0eebd49c8757d823fbf6e3e WHIRLPOOL d1172a17a95844fef3fdc7de2776b64ca639542c0ef986c29b3c08cf979ed2cf210dfd31ed5f3cb7cdebdf9f9bdf9cae4382997bcbdfc709c1177ab99bf6e775
-MISC ChangeLog 2549 SHA256 fad9fa9cb3234530aef5b0a95fa6edd3549a7cd5b73bfe2d496513dd2b549d43 SHA512 6ccc335c1193f61a33ca06445ee434eb6bf16e4295598bc7440f2ac24f44c5486d48e57fc18085ede2c12c3f2ac67529499812e02eda52886ef2914a26c9db46 WHIRLPOOL 1a632355d52476f4d17d488258ae813a9ef0ae028564a346303df6b79b3c418fbb6f73a377a6d88e023927d3d9124f622e6bce471272a955f158ec6c44b179f3
+EBUILD cvmfs-2.1.17.ebuild 2449 SHA256 9084a2bbd985fc1aa96025753d01a67c92b92851bf5fb27e835c8fcb554c6e46 SHA512 a12c759fedf2b15174d74e7447d7e21f72cbdfed17c3d9477a08b6f517e7d42d02672197f87bd3136cc692b10535aa2766fb2722a2732fa57a86c7ebc0134efa WHIRLPOOL 263279fc7cd8148a399b5d3aa605925c5239643aab3cadfff202ace1604efba5d49c2b7d0d839e4ea5a96e53bd97925704fbd7b4e309910875529d18b3346d57
+EBUILD cvmfs-9999.ebuild 2587 SHA256 c394488cf6e361f222abed9aee5578481e08312544ab12770a8bb90c8e777a00 SHA512 851464a53fff61d2cf4d939f28e3bb591e9e9588fd1c340f4f36ce51174e0fe6089e5e8a59beaedac655da6a9bbd15190d452525d9c8fcdf1dab1a7e1178348a WHIRLPOOL c90974402be9b40ecea5f7090cbcb5767d72be5a04732bcce0cee60d56443a4d1f3f5218d07439789ca12968fe26478bf5400ca14bdd8c9b7c54e034c4ce7aa6
+MISC ChangeLog 2753 SHA256 d56122fee78f8dde5d3c3595b421f597033a1bd3dded3675e3cff047168c2d94 SHA512 3d19ab8537f52c89690fab0511c7f2f0669862feb8ac59310ce6c5e3bee7115d81996c4390d5350408437388820b77fe6a042cb9661ac743dc38f44aded077f7 WHIRLPOOL fa463fd4b52a65df40660b3f0e83145269b4dc42c694cb55b20dc6475d226d2e36f06fae75da12bbdaeda67fdb77ceb349179c20b36d90332b794443293c162b
 MISC metadata.xml 962 SHA256 8e663c6e3488bdb8cf49d7a3f03549fe093597522e25dd61a4cdde390ccc0091 SHA512 ad7ae2a380fabb7a3d65d04318e084f2e19310e6a4c22abf2f23ecf90cffd8be762fc93e26e3f4d7ddd05a168baca4cf903d7bff7f87d0dbe7dfc5c57b303b9d WHIRLPOOL bfd28004471a97a1a708ad42b84bd0aad99a9eb94fb200dc39986d3eaacfccf767fda17712533a217e623031dca0f1fb2e5bf3ba2ced122d9014d7cd11c8f7fc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlLyfGgACgkQ1ycZbhPLE2A0ogCgiH0lfCGXjgx9kGu7hJlNUIhk
+RiQAoI3v77yyX1Kg25xnhtjzJU5bGRwz
+=pPxN
+-----END PGP SIGNATURE-----
diff --git a/net-fs/cvmfs/cvmfs-2.1.17.ebuild b/net-fs/cvmfs/cvmfs-2.1.17.ebuild
new file mode 100644
index 000000000000..934e153a5179
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.1.17.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.17.ebuild,v 1.1 2014/02/05 18:00:36 bicatali Exp $
+
+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
+	net-libs/pacparser
+	net-misc/curl[adns]
+	sys-apps/attr
+	sys-libs/zlib
+	client? (
+		dev-cpp/sparsehash
+		dev-libs/leveldb
+		sys-fs/fuse )
+	server? ( >=dev-cpp/tbb-4.2 )"
+
+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-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index f9f950e619c7..e9b5d0d0186e 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-9999.ebuild,v 1.2 2013/12/02 05:20:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-9999.ebuild,v 1.3 2014/02/05 18:00:36 bicatali Exp $
 
 EAPI=5
 
 #if LIVE
-EGIT_REPO_URI="https://github.com/sfabbro/cvmfs.git"
+EGIT_REPO_URI="https://github.com/cvmfs/cvmfs.git"
+EGIT_BRANCH="devel"
 inherit git-r3
 #endif
 
@@ -27,7 +28,7 @@ CDEPEND="
 	dev-libs/openssl
 	net-libs/pacparser
 	net-misc/curl[adns]
-	sys-libs/attr
+	sys-apps/attr
 	sys-libs/zlib
 	client? (
 		dev-cpp/sparsehash