Version bump. Add patch to fix some automagicness.

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 42618354)

3 files changed, 144 insertions, 2 deletions

diff --git a/net-misc/mirall/ChangeLog b/net-misc/mirall/ChangeLog
index 7bd1948767b2..e641f7fafadf 100644
--- a/net-misc/mirall/ChangeLog
+++ b/net-misc/mirall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mirall
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/ChangeLog,v 1.12 2012/12/21 13:32:30 creffett Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/ChangeLog,v 1.13 2013/01/22 20:55:01 creffett Exp $
+
+*mirall-1.2.0_beta2 (22 Jan 2013)
+
+  22 Jan 2013; Chris Reffett <creffett@gentoo.org>
+  +files/mirall-1.2.0_beta2-automagicness.patch, +mirall-1.2.0_beta2.ebuild:
+  Version bump. Add patch to fix some automagicness.
 
 *mirall-1.1.4 (21 Dec 2012)
 
diff --git a/net-misc/mirall/files/mirall-1.2.0_beta2-automagicness.patch b/net-misc/mirall/files/mirall-1.2.0_beta2-automagicness.patch
new file mode 100644
index 000000000000..6ee917008b80
--- /dev/null
+++ b/net-misc/mirall/files/mirall-1.2.0_beta2-automagicness.patch
@@ -0,0 +1,73 @@
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-if(SPHINX_FOUND)
++macro_optional_find_package(Sphinx)
++if(WITH_SPHINX AND SPHINX_FOUND)
+ 
+     # Sphinx cache with pickled ReST documents
+     set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
+@@ -63,1 +64,1 @@
+-endif(SPHINX_FOUND)
++endif(WITH_SPHINX AND SPHINX_FOUND)
+--- a/cmake/modules/MacroOptionalFindPackage.cmake
++++ b/cmake/modules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,47 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# This is just a helper macro to set a bunch of variables empty.
++# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
++macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
++   if(DEFINED ${_name}_${_var})
++      set(${_name}_${_var} "")
++   endif(DEFINED ${_name}_${_var})
++
++   string(TOUPPER ${_name} _nameUpper)
++   if(DEFINED ${_nameUpper}_${_var})
++      set(${_nameUpper}_${_var}  "")
++   endif(DEFINED ${_nameUpper}_${_var})
++endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++   option(WITH_${_name} "Search for ${_name} package" ON)
++   if (WITH_${_name})
++      find_package(${_name} ${ARGN})
++   else (WITH_${_name})
++      string(TOUPPER ${_name} _nameUpper)
++      set(${_name}_FOUND FALSE)
++      set(${_nameUpper}_FOUND FALSE)
++
++      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
++      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
++      _mofp_set_empty_if_defined(${_name} INCLUDES)
++      _mofp_set_empty_if_defined(${_name} LIBRARY)
++      _mofp_set_empty_if_defined(${_name} LIBRARIES)
++      _mofp_set_empty_if_defined(${_name} LIBS)
++      _mofp_set_empty_if_defined(${_name} FLAGS)
++      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
++   endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ project(mirall)
+ set(PACKAGE "mirall")
+ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
++include(MacroOptionalFindPackage)
+ 
+ if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
+      include ( ${OEM_THEME_DIR}/OEM.cmake )
diff --git a/net-misc/mirall/mirall-1.2.0_beta2.ebuild b/net-misc/mirall/mirall-1.2.0_beta2.ebuild
new file mode 100644
index 000000000000..6bce2af75c77
--- /dev/null
+++ b/net-misc/mirall/mirall-1.2.0_beta2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.2.0_beta2.ebuild,v 1.1 2013/01/22 20:55:01 creffett Exp $
+
+EAPI=5
+
+LANG_DIR="translations"
+PLOCALES="ca cs_CZ da de el en eo es es_AR et_EE eu fa fi_FI fr gl he hr hu_HU it ja_JP ko lb lt_LT mk
+nb_NO nl oc pl pt_BR pt_PT ro ru ru_RU sk_SK sl sr@latin sv ta_LK tr uk vi zh_CN zh_TW"
+inherit cmake-utils l10n
+
+MY_P="${PN}-${PV/_/}"
+
+DESCRIPTION="Synchronization of your folders with another computers"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/download/testing/${MY_P}.tar.bz2"
+
+LICENSE="CCPL-Attribution-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=net-misc/csync-0.70.1
+	sys-fs/inotify-tools
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-test:4
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx virtual/latex-base )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Yay for fcked detection.
+	export CSYNC_DIR="${EPREFIX}/usr/include/ocsync/"
+
+	local lang
+	for lang in ${PLOCALES} ; do
+		if ! use linguas_${lang} ; then
+			rm ${LANG_DIR}/${PN}_${lang}.ts
+		fi
+	done
+	epatch "${FILESDIR}/${PN}-1.2.0_beta2-automagicness.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		${cmake-utils_use_with doc SPHINX}
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! has_version net-misc/csync[samba]; then
+		elog "For samba support, build net-misc/csync with USE=samba"
+	fi
+	if ! has_version net-misc/csync[sftp]; then
+		elog "For sftp support, build net-misc/csync with USE=sftp"
+	fi
+}