Version bump, add geoip dependencies

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

11 files changed, 313 insertions, 291 deletions

diff --git a/net-fs/cvmfs/ChangeLog b/net-fs/cvmfs/ChangeLog
index 86a54f88c3c7..b1e3e9d62398 100644
--- a/net-fs/cvmfs/ChangeLog
+++ b/net-fs/cvmfs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/cvmfs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.11 2014/04/30 16:38:54 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.12 2015/07/31 20:09:57 bicatali Exp $
+
+*cvmfs-2.1.20.0_p05 (31 Jul 2015)
+
+  31 Jul 2015; Sébastien Fabbro <bicatali@gentoo.org>
+  +cvmfs-2.1.20.0_p05.ebuild, +files/cvmfs-2.1.20.0_p05-cares-underlink.patch,
+  +files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch, -cvmfs-2.1.14.ebuild,
+  -cvmfs-2.1.17.ebuild, -files/FindCARes.cmake, -files/Findleveldb.cmake,
+  -files/cvmfs-2.1.10-no-config.patch, -files/cvmfs-2.1.10-openrc.patch,
+  cvmfs-2.1.19.ebuild, cvmfs-9999.ebuild:
+  Version bump, add geoip dependencies
 
 *cvmfs-2.1.19 (30 Apr 2014)
 
diff --git a/net-fs/cvmfs/cvmfs-2.1.14.ebuild b/net-fs/cvmfs/cvmfs-2.1.14.ebuild
deleted file mode 100644
index 17bc279500b4..000000000000
--- a/net-fs/cvmfs/cvmfs-2.1.14.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.14.ebuild,v 1.2 2013/09/09 16:34:54 bicatali Exp $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-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 server"
-
-CDEPEND="
-	dev-db/sqlite:3
-	dev-libs/openssl
-	net-dns/c-ares
-	net-misc/curl[adns]
-	sys-libs/zlib
-	client? (
-		dev-cpp/sparsehash
-		dev-libs/leveldb
-		sys-fs/fuse )
-	server? ( sys-libs/zlib )"
-
-RDEPEND="${CDEPEND}
-	client? ( net-fs/autofs )
-	server? ( www-servers/apache[ssl] )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.10-no-config.patch
-	"${FILESDIR}"/${PN}-2.1.10-openrc.patch
-)
-
-src_prepare() {
-	sed -i -e 's/COPYING//' CMakeLists.txt || die
-	cp "${FILESDIR}"/Find*.cmake cmake/Modules/ || die
-	rm bootstrap.sh || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCARES_BUILTIN=OFF
-		-DSQLITE3_BUILTIN=OFF
-		-DLIBCURL_BUILTIN=OFF
-		-DZLIB_BUILTIN=OFF
-		-DSPARSEHASH_BUILTIN=OFF
-		-DLEVELDB_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_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.1.19.ebuild b/net-fs/cvmfs/cvmfs-2.1.19.ebuild
index 7510a9178dc2..bf9689cddddc 100644
--- a/net-fs/cvmfs/cvmfs-2.1.19.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.1.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.19.ebuild,v 1.1 2014/04/30 16:38:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.19.ebuild,v 1.2 2015/07/31 20:09:57 bicatali Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE="+client debug doc test server"
 CDEPEND="
 	dev-cpp/gtest
 	dev-db/sqlite:3=
-	dev-libs/openssl
+	dev-libs/openssl:0
 	net-libs/pacparser:0=
 	net-misc/curl:0=[adns]
 	sys-apps/attr
diff --git a/net-fs/cvmfs/cvmfs-2.1.17.ebuild b/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild
index 934e153a5179..79e6f31ef5ce 100644
--- a/net-fs/cvmfs/cvmfs-2.1.17.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild,v 1.1 2015/07/31 20:09:57 bicatali Exp $
 
 EAPI=5
 
 inherit cmake-utils
 
+MYP=${PN}-${PV/_p/-fix}
+
 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"
+SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,32 +20,41 @@ IUSE="+client debug doc test server"
 
 CDEPEND="
 	dev-cpp/gtest
-	dev-db/sqlite:3
-	dev-libs/openssl
-	net-libs/pacparser
-	net-misc/curl[adns]
+	dev-db/sqlite:3=
+	dev-libs/openssl:0
+	net-libs/pacparser:0=
+	net-misc/curl:0=[adns]
 	sys-apps/attr
-	sys-libs/zlib
+	sys-libs/zlib:0=
 	client? (
-		dev-cpp/sparsehash
-		dev-libs/leveldb
-		sys-fs/fuse )
-	server? ( >=dev-cpp/tbb-4.2 )"
+		>=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] )"
+	client? ( net-fs/autofs )"
+#	server? ( www-servers/apache[ssl] )"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
+S="${WORKDIR}/${PN}-${MYP}"
+
 src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-geoip-missing-cmake.patch \
+		"${FILESDIR}"/${P}-cares-underlink.patch
+	# gentoo stuff
 	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
@@ -54,14 +65,15 @@ src_prepare() {
 			-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
+		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
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index e9b5d0d0186e..fbb7573227b1 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -1,40 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.3 2014/02/05 18:00:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-9999.ebuild,v 1.4 2015/07/31 20:09:57 bicatali Exp $
 
 EAPI=5
 
-#if LIVE
 EGIT_REPO_URI="https://github.com/cvmfs/cvmfs.git"
 EGIT_BRANCH="devel"
-inherit git-r3
-#endif
 
-inherit cmake-utils
+inherit git-r3 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"
+
+SRC_URI=
+KEYWORDS=
 
 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]
+	dev-db/sqlite:3=
+	dev-libs/openssl:0
+	net-libs/pacparser:0=
+	net-misc/curl:0=[adns]
 	sys-apps/attr
-	sys-libs/zlib
+	sys-libs/zlib:0=
 	client? (
-		dev-cpp/sparsehash
-		dev-libs/leveldb
-		sys-fs/fuse )
-	server? ( >=dev-cpp/tbb-4.2 )"
+		>=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 )
@@ -44,11 +44,6 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 src_prepare() {
 	sed -i -e 's/COPYING//' CMakeLists.txt || die
 	rm bootstrap.sh || die
@@ -65,15 +60,15 @@ src_prepare() {
 			-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
+		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
diff --git a/net-fs/cvmfs/files/FindCARes.cmake b/net-fs/cvmfs/files/FindCARes.cmake
deleted file mode 100644
index 1ed5b3291358..000000000000
--- a/net-fs/cvmfs/files/FindCARes.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- cmake -*-
-
-# - Find c-ares
-# Find the c-ares includes and library
-# This module defines
-#  CARES_INCLUDE_DIR, where to find ares.h, etc.
-#  CARES_LIBRARIES, the libraries needed to use c-ares.
-#  CARES_FOUND, If false, do not try to use c-ares.
-# also defined, but not for general use are
-#  CARES_LIBRARY, where to find the c-ares library.
-
-FIND_PATH(CARES_INCLUDE_DIR ares.h
-/usr/local/include
-/usr/include
-)
-
-SET(CARES_NAMES ${CARES_NAMES} cares)
-FIND_LIBRARY(CARES_LIBRARY
-  NAMES ${CARES_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
-    SET(CARES_LIBRARIES ${CARES_LIBRARY})
-    SET(CARES_FOUND "YES")
-ELSE (CARES_LIBRARY AND CARES_INCLUDE_DIR)
-  SET(CARES_FOUND "NO")
-ENDIF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
-
-
-IF (CARES_FOUND)
-   IF (NOT CARES_FIND_QUIETLY)
-      MESSAGE(STATUS "Found c-ares: ${CARES_LIBRARIES}")
-   ENDIF (NOT CARES_FIND_QUIETLY)
-ELSE (CARES_FOUND)
-   IF (CARES_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find c-ares library")
-   ENDIF (CARES_FIND_REQUIRED)
-ENDIF (CARES_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_CARES_INCLUDE_PATH ${CARES_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_CARES_LIB_PATH ${CARES_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  CARES_LIBRARY
-  CARES_INCLUDE_DIR
-  )
diff --git a/net-fs/cvmfs/files/Findleveldb.cmake b/net-fs/cvmfs/files/Findleveldb.cmake
deleted file mode 100644
index 755db1160f9d..000000000000
--- a/net-fs/cvmfs/files/Findleveldb.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# Try to find leveldb
-# Once done, this will define
-#
-# LEVELDB_FOUND       - system has leveldb
-# LEVELDB_INCLUDE_DIR - the leveldb include directory
-# LEVELDB_LIB_DIR     - the leveldb library directory
-#
-# LEVELDB_DIR may be defined as a hint for where to look
-# LEVELDB_LIBRARIES   - the level db library name(s)
-
-if(LEVELDB_INCLUDE_DIR AND LEVELDB_LIBRARY)
-    set(LEVELDB_FOUND_QUIETLY TRUE)
-else(LEVELDB_INCLUDE_DIR AND LEVELDB_LIBRARY)
-  find_path(LEVELDB_INCLUDE_DIR leveldb/db.h
-    HINTS
-    ${LEVELDB_INCLUDE_DIR}
-    $ENV{LEVELDB_INCLUDE_DIR}
-    /usr
-    /usr/local
-    /opt/
-    PATH_SUFFIXES include/
-    PATHS /opt
-    )
-
-  find_library(LEVELDB_LIB leveldb
-    HINTS
-    ${LEVELDB_DIR}
-    $ENV{LEVELDB_DIR}
-    /usr
-    /usr/local
-    /opt/leveldb/
-    PATH_SUFFIXES lib
-    )
-
-
-  set(LEVELDB_LIBRARIES ${LEVELDB_LIB})
-
-  get_filename_component( LEVELDB_LIB_DIR ${LEVELDB_LIB} PATH )
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(leveldb DEFAULT_MSG LEVELDB_LIB_DIR LEVELDB_INCLUDE_DIR )
-endif(LEVELDB_INCLUDE_DIR AND LEVELDB_LIBRARY)
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.10-no-config.patch b/net-fs/cvmfs/files/cvmfs-2.1.10-no-config.patch
deleted file mode 100644
index f6bbdd184673..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.1.10-no-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cvmfs-2.1.10/cvmfs/tracer.cc.orig	2013-06-11 13:39:47.469323020 -0700
-+++ cvmfs-2.1.10/cvmfs/tracer.cc	2013-06-11 13:40:04.361414919 -0700
-@@ -19,7 +19,7 @@
-  *       down on assertion.  This might be not desired behavior.
-  */
- 
--#include "config.h"
-+#include "cvmfs_config.h"
- #include "tracer.h"
- 
- #include <pthread.h>
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.10-openrc.patch b/net-fs/cvmfs/files/cvmfs-2.1.10-openrc.patch
deleted file mode 100644
index eb5a3f4b08a4..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.1.10-openrc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-simple patch to adapt cvmfs scripts for openrc
-bicatali@gentoo.org 06/2013
-
---- cvmfs/cvmfs_config.orig	2013-06-17 15:42:57.011022876 -0700
-+++ cvmfs/cvmfs_config	2013-06-17 15:46:22.395157110 -0700
-@@ -14,20 +14,23 @@
-   Linux )
-     if [ -x /sbin/service ]; then
-       service="/sbin/service"
--    else
-+    elif [ -x /usr/sbin/service ]; then
-       # Ubuntu
-       service="/usr/sbin/service"
-+    elif [ -x /sbin/rc-service ]; then
-+      # OpenRC
-+      service="/sbin/rc-service"
-     fi
-     if [ -x /sbin/pidof ]; then
-       pidof="/sbin/pidof"
-     else
--      # Ubuntu
-+      # Ubuntu, Gentoo
-       pidof="/bin/pidof"
-     fi
-     if [ -x /sbin/fuser ]; then
-       fuser="/sbin/fuser"  # RHEL
-     else
--      fuser="/bin/fuser"  # Ubuntu, SuSE
-+      fuser="/bin/fuser"  # Ubuntu, SuSE, Gentoo
-     fi
-     if [ ! -x /usr/bin/attr ]; then
-       # Fedora
---- cvmfs/cvmfs_server.orig	2013-06-17 15:42:51.426992247 -0700
-+++ cvmfs/cvmfs_server	2013-06-17 15:44:02.092381590 -0700
-@@ -38,7 +38,7 @@
- if which httpd2 >/dev/null 2>&1; then #SLES/OpenSuSE
-   APACHE_SERVICE="apache2"
-   APACHE_CONF=${APACHE_SERVICE}
--elif which apache2 >/dev/null 2>&1; then # Debian based
-+elif which apache2 >/dev/null 2>&1; then # Debian, Gentoo based
-   APACHE_SERVICE="apache2"
-   APACHE_CONF=${APACHE_SERVICE}
- else
-@@ -49,8 +49,10 @@
- # Find the service binary
- if [ -x /sbin/service ]; then
-   SERVICE_BIN="/sbin/service"
--else
-+elif [ -x /usr/sbin/service ]; then
-   SERVICE_BIN="/usr/sbin/service" # Ubuntu
-+elif [ -x /sbin/rc-service ]; then
-+  SERVICE_BIN="/sbin/rc-service" # OpenRC
- fi
- [ -z "$SERVICE_BIN" ] && die "Could not locate 'service' utility"
- 
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch
new file mode 100644
index 000000000000..0e67567b4e26
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch
@@ -0,0 +1,106 @@
+diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cmake/Modules/FindCARES.cmake cvmfs-cvmfs-2.1.20.0-fix05/cmake/Modules/FindCARES.cmake
+--- cvmfs-cvmfs-2.1.20.0-fix05.orig/cmake/Modules/FindCARES.cmake	1970-01-01 00:00:00.000000000 +0000
++++ cvmfs-cvmfs-2.1.20.0-fix05/cmake/Modules/FindCARES.cmake	2015-07-31 18:35:05.859879354 +0000
+@@ -0,0 +1,35 @@
++#
++# $Id: cvmfs-2.1.20.0_p05-cares-underlink.patch,v 1.1 2015/07/31 20:09:57 bicatali Exp $
++#
++# - Find cares
++# Find the native CARES includes and library
++#
++#  CARES_INCLUDE_DIRS - where to find cares.h, etc.
++#  CARES_LIBRARIES    - List of libraries when using cares.
++#  CARES_FOUND        - True if cares found.
++
++
++IF (CARES_INCLUDE_DIRS)
++  # Already in cache, be silent
++  SET(CARES_FIND_QUIETLY TRUE)
++ENDIF (CARES_INCLUDE_DIRS)
++
++FIND_PATH(CARES_INCLUDE_DIR ares.h)
++
++SET(CARES_NAMES cares)
++FIND_LIBRARY(CARES_LIBRARY NAMES ${CARES_NAMES} )
++
++# handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if 
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(CARES DEFAULT_MSG CARES_LIBRARY CARES_INCLUDE_DIR)
++
++IF(CARES_FOUND)
++  SET( CARES_LIBRARIES ${CARES_LIBRARY} )
++  SET( CARES_INCLUDE_DIRS ${CARES_INCLUDE_DIR} )
++ELSE(CARES_FOUND)
++  SET( CARES_LIBRARIES )
++  SET( CARES_INCLUDE_DIRS )
++ENDIF(CARES_FOUND)
++
++MARK_AS_ADVANCED( CARES_LIBRARIES CARES_INCLUDE_DIRS )
+diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/CMakeLists.txt
+--- cvmfs-cvmfs-2.1.20.0-fix05.orig/CMakeLists.txt	2015-02-23 13:51:47.000000000 +0000
++++ cvmfs-cvmfs-2.1.20.0-fix05/CMakeLists.txt	2015-07-31 18:32:34.259882076 +0000
+@@ -252,9 +252,12 @@
+   include (${CARES_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt)
+   include (${LIBCURL_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt)
+   set (CURL_LIBRARIES "")
++  set (CARES_LIBRARIES "")
+ else (LIBCURL_BUILTIN)
+   find_package (CURL REQUIRED)
++  find_package (CARES REQUIRED)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CURL_INCLUDE_DIRS})
++  set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CARES_INCLUDE_DIRS})
+   if (CURL_INCLUDE_DIRS)
+     find_program(CURL_CONFIG_EXEC NAMES curl-config)
+     if (CURL_CONFIG_EXEC)
+diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt
+--- cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt	2015-02-23 13:51:47.000000000 +0000
++++ cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt	2015-07-31 18:34:36.789879876 +0000
+@@ -271,7 +271,7 @@
+   set_target_properties (cvmfs_fuse_debug PROPERTIES VERSION ${CernVM-FS_VERSION_STRING})
+ 
+   # link the stuff (*_LIBRARIES are dynamic link libraries *_archive are static link libraries ... one of them will be empty for each dependency)
+-  set (CVMFS_FUSE_LINK_LIBRARIES ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${LEVELDB_LIBRARIES} ${OPENSSL_LIBRARIES} ${FUSE_LIBRARIES} ${LIBFUSE_ARCHIVE} ${SQLITE3_ARCHIVE} ${LIBCURL_ARCHIVE} ${PACPARSER_ARCHIVE} ${LEVELDB_ARCHIVE} ${CARES_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl)
++  set (CVMFS_FUSE_LINK_LIBRARIES ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${LEVELDB_LIBRARIES} ${OPENSSL_LIBRARIES} ${FUSE_LIBRARIES} ${LIBFUSE_ARCHIVE} ${SQLITE3_ARCHIVE} ${LIBCURL_ARCHIVE} ${PACPARSER_ARCHIVE} ${LEVELDB_ARCHIVE} ${CARES_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl)
+ 
+   target_link_libraries (cvmfs2           ${CVMFS_LOADER_LIBS} ${OPENSSL_LIBRARIES} ${LIBFUSE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl)
+   target_link_libraries (cvmfs_fuse_debug ${CVMFS2_DEBUG_LIBS} ${CVMFS_FUSE_LINK_LIBRARIES})
+@@ -331,7 +331,7 @@
+   add_dependencies (libcvmfs cvmfs_only)
+ 
+   add_executable( test_libcvmfs ${TEST_LIBCVMFS_SOURCES} )
+-  target_link_libraries( test_libcvmfs ${CMAKE_CURRENT_BINARY_DIR}/libcvmfs.a ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl )
++  target_link_libraries( test_libcvmfs ${CMAKE_CURRENT_BINARY_DIR}/libcvmfs.a ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl )
+   add_dependencies (test_libcvmfs libcvmfs)
+ 
+ endif (BUILD_LIBCVMFS)
+@@ -371,7 +371,7 @@
+   set_target_properties (cvmfs_swissknife PROPERTIES COMPILE_FLAGS "${CVMFS_SWISSKNIFE_CFLAGS}" LINK_FLAGS "${CVMFS_SWISSKNIFE_LD_FLAGS}")
+ 
+   # link the stuff (*_LIBRARIES are dynamic link libraries)
+-  target_link_libraries (cvmfs_swissknife  ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl)
++  target_link_libraries (cvmfs_swissknife  ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl)
+ 
+   if (BUILD_SERVER_DEBUG)
+     add_executable (cvmfs_swissknife_debug ${CVMFS_SWISSKNIFE_DEBUG_SOURCES})
+@@ -399,7 +399,7 @@
+       message (WARNING "Debug libraries of TBB were not found. Using the release versions instead.")
+       set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARIES})
+     endif (NOT TBB_DEBUG_LIBRARIES)
+-    target_link_libraries (cvmfs_swissknife_debug  ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${TBB_DEBUG_LIBRARIES} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl)
++    target_link_libraries (cvmfs_swissknife_debug  ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${TBB_DEBUG_LIBRARIES} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl)
+   endif (BUILD_SERVER_DEBUG)
+ endif (BUILD_SERVER)
+ 
+diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt
+--- cvmfs-cvmfs-2.1.20.0-fix05.orig/test/unittests/CMakeLists.txt.orig	2015-07-31 19:03:06.829849170 +0000
++++ cvmfs-cvmfs-2.1.20.0-fix05/test/unittests/CMakeLists.txt	2015-07-31 19:03:36.459848638 +0000
+@@ -212,7 +212,7 @@
+ endif (BUILD_UNITTESTS_DEBUG)
+ 
+ # link the stuff (*_LIBRARIES are dynamic link libraries)
+-set (UNITTEST_LINK_LIBRARIES ${GTEST_LIBRARIES} ${GOOGLETEST_ARCHIVE} ${OPENSSL_LIBRARIES}
++set (UNITTEST_LINK_LIBRARIES ${GTEST_LIBRARIES} ${GOOGLETEST_ARCHIVE} ${OPENSSL_LIBRARIES} ${CARES_LIBRARIES}
+                              ${CURL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE}
+                              ${SQLITE3_LIBRARY} ${SQLITE3_ARCHIVE} ${TBB_LIBRARIES}
+                              ${ZLIB_LIBRARIES} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES}
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch
new file mode 100644
index 000000000000..9f4ba360a509
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch
@@ -0,0 +1,144 @@
+--- /dev/null
++++ cmake/Modules/FindLibGeoIP.cmake
+@@ -0,0 +1,68 @@
++# - Try to find GeoIP headers and libraries
++#
++# Usage of this module as follows:
++#
++#     find_package(LibGeoIP)
++#
++# Variables used by this module, they can change the default behaviour and need
++# to be set before calling find_package:
++#
++#  LibGeoIP_ROOT_DIR         Set this variable to the root installation of
++#                            libGeoIP if the module has problems finding the
++#                            proper installation path.
++#
++# Variables defined by this module:
++#
++#  LIBGEOIP_FOUND                   System has GeoIP libraries and headers
++#  LibGeoIP_LIBRARY                 The GeoIP library
++#  LibGeoIP_INCLUDE_DIR             The location of GeoIP headers
++#  HAVE_GEOIP_COUNTRY_EDITION_V6    Whether the API support IPv6 country edition
++#  HAVE_GEOIP_CITY_EDITION_REV0_V6  Whether the API supports IPv6 city edition
++
++find_path(LibGeoIP_ROOT_DIR
++    NAMES include/GeoIPCity.h
++)
++
++if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
++    # the static version of the library is preferred on OS X for the
++    # purposes of making packages (libGeoIP doesn't ship w/ OS X)
++    set(libgeoip_names libGeoIp.a GeoIP)
++else ()
++    set(libgeoip_names GeoIP)
++endif ()
++
++find_library(LibGeoIP_LIBRARY
++    NAMES ${libgeoip_names}
++    HINTS ${LibGeoIP_ROOT_DIR}/lib
++)
++
++find_path(LibGeoIP_INCLUDE_DIR
++    NAMES GeoIPCity.h
++    HINTS ${LibGeoIP_ROOT_DIR}/include
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LibGeoIP DEFAULT_MSG
++    LibGeoIP_LIBRARY
++    LibGeoIP_INCLUDE_DIR
++)
++
++if (LIBGEOIP_FOUND)
++    include(CheckCXXSourceCompiles)
++    set(CMAKE_REQUIRED_INCLUDES ${LibGeoIP_INCLUDE_DIR})
++    check_cxx_source_compiles("
++    #include <GeoIPCity.h>
++    int main() { GEOIP_COUNTRY_EDITION_V6; return 0; }
++    " HAVE_GEOIP_COUNTRY_EDITION_V6)
++    check_cxx_source_compiles("
++    #include <GeoIPCity.h>
++    int main() { GEOIP_CITY_EDITION_REV0_V6; return 0; }
++    " HAVE_GEOIP_CITY_EDITION_REV0_V6)
++    set(CMAKE_REQUIRED_INCLUDES)
++endif ()
++
++mark_as_advanced(
++    LibGeoIP_ROOT_DIR
++    LibGeoIP_LIBRARY
++    LibGeoIP_INCLUDE_DIR
++)
+\ No newline at end of file
+diff --git a/cmake/Modules/FindPythonModule.cmake b/cmake/Modules/FindPythonModule.cmake
+new file mode 100644
+index 0000000..1a29315
+--- /dev/null
++++ cmake/Modules/FindPythonModule.cmake
+@@ -0,0 +1,24 @@
++# Find if a Python module is installed
++# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html
++# To use do: find_python_module(PyQt4 REQUIRED)
++function(find_python_module module)
++	string(TOUPPER ${module} module_upper)
++	if(NOT PYTHON_${module_upper})
++		include (FindPythonInterp)
++		if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")
++			set(PY_${module}_FIND_REQUIRED TRUE)
++		endif()
++		# A module's location is usually a directory, but for binary modules
++		# it's a .so file.
++		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" 
++			"import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
++			RESULT_VARIABLE _${module}_status 
++			OUTPUT_VARIABLE _${module}_location
++			ERROR_QUIET 
++			OUTPUT_STRIP_TRAILING_WHITESPACE)
++		if(${_${module}_status} EQUAL 0)
++			set(PYTHON_${module_upper} ${_${module}_location} CACHE STRING "Location of Python module ${module}")
++		endif(${_${module}_status} EQUAL 0)
++	endif(NOT PYTHON_${module_upper})
++	find_package_handle_standard_args(PY_${module} DEFAULT_MSG PYTHON_${module_upper})
++endfunction(find_python_module)
+\ No newline at end of file
+diff --git a/cvmfs/CMakeLists.txt b/cvmfs/CMakeLists.txt
+index cb09b94..44be85e 100644
+--- cvmfs/CMakeLists.txt
++++ cvmfs/CMakeLists.txt
+@@ -347,9 +347,9 @@ if (BUILD_SERVER)
+   # create targets with corresponding sources and static link libraries
+   add_executable (cvmfs_swissknife ${CVMFS_SWISSKNIFE_SOURCES})
+   add_executable (cvmfs_suid_helper ${CVMFS_SUID_HELPER_SOURCES})
+-  add_custom_target (geoip ALL)
+ 
+   if (GEOIP_BUILTIN)
++    add_custom_target (geoip ALL)
+     add_dependencies (python-geoip libgeoip)
+     add_dependencies (geoip python-geoip)
+   endif (GEOIP_BUILTIN)
+--- CMakeLists.txt.orig	2015-02-23 13:51:47.000000000 +0000
++++ CMakeLists.txt	2015-07-31 17:57:17.019920094 +0000
+@@ -145,6 +145,12 @@
+ endif (EXISTS "${CMAKE_SOURCE_DIR}/bootstrap.sh")
+ 
+ #
++# include some common functionality
++#
++include (FindPythonModule)
++
++
++#
+ # set some default flags
+ #
+ # flags in CMAKE_C**_FLAGS are always passed to the compiler
+@@ -313,8 +319,8 @@
+   include (${LIBGEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt)
+   include (${PYTHON_GEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt)
+ else (GEOIP_BUILTIN)
+-  find_package (GeoIP REQUIRED)
+-  find_package (python-GeoIP REQUIRED)
++  find_package (LibGeoIP REQUIRED)
++  find_python_module (GeoIP REQUIRED)
+ endif (GEOIP_BUILTIN)
+ 
+ # required libraries for client and libcvmfs