Version bump, remove old.

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

12 files changed, 168 insertions, 152 deletions

diff --git a/net-misc/csync/ChangeLog b/net-misc/csync/ChangeLog
index 253a309edb33..6c4e6ca62d9d 100644
--- a/net-misc/csync/ChangeLog
+++ b/net-misc/csync/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/csync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.8 2012/11/16 19:39:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/ChangeLog,v 1.9 2012/12/14 17:18:48 creffett Exp $
+
+*csync-0.60.3 (14 Dec 2012)
+
+  14 Dec 2012; Chris Reffett <creffett@gentoo.org> +csync-0.60.3.ebuild,
+  +files/csync-0.60.2-automagicness.patch,
+  +files/csync-0.60.2-removebadtest.patch, -csync-0.50.8.ebuild,
+  -csync-0.60.0-r1.ebuild:
+  Version bump, remove old.
 
 *csync-0.60.1 (16 Nov 2012)
 
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 5f0cfabd2da5..63042b62a580 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX csync-0.60.2-automagicness.patch 3549 SHA256 8a7a2d6cef0a6edd1691976f678cdd345112c711183327cb7b725a71df96f388 SHA512 55e533326ce7c44973189b6d49fac1edb75263f5d1c7d1a41461578757e685cd5b170dac920a3d2bbcb721f52a7fb23c975679cd47bed96c5d9a1f03eb4578c2 WHIRLPOOL 291b989b81a7dc99c78b66933ca65af4c469ac71a3777381ca66184820af0e27c727526e61652a5acffe399f843f865794380b7323703a49f7fa0ae3fc825972
+AUX csync-0.60.2-removebadtest.patch 549 SHA256 4a25b6a123d67bdf71175baedf382fae93c51d2a578dc50648fde79a322f9c90 SHA512 ac66409b68160d7e0af269707cb35f4a3de0eebcb8c114fa355e2dad18a28e0e11906d1b2cedce1e2c54e1f222db081c0574a36421390cdfb4b89e08c63579f1 WHIRLPOOL 0f9118824c220d154fedd49bb5503d43697646b9c9c6a48315da0ab6d155aeba48b979b45921533f1ee661fc6b08c8bcba6a62a58261ef83bf59a61710246099
 AUX csync-automagicness.patch 4705 SHA256 6129f07257a42ad9e2440aeac7222279f10734cbe99cf5ef7c3ae1edbc260fc6 SHA512 5d974b5e79ac0ee4421982235b8b1e4ad2b303d5fdaf889db3bf1c4bf01e78e2dae36a7c364008141abf9fffca43ff5325720bbdfe607c2a23fbb6b35a1d1924 WHIRLPOOL 8acefc7cdf83cfa5a367fe02d47cb0aff0bc2fc165db8bbe93f6b3119ede9cd20aa7219b40853fa43cb0befdf981992b5cc703c3041eb51267a4eabf493b4d57
-DIST csync-0.50.8.tar.bz2 1332970 SHA256 878be8a78fd7f1e1482d5d40d584ffadcd8cefb5106726f1a70b07ce0daee2cf SHA512 e185b385e5b257953678687e40ad7dc49ac5c6265c50715e519e63f96b1c6e4900201ad5b85542f47a778fc601e52ed692aebfbc2cff0eed4adcee3100ca3f87 WHIRLPOOL 7a4ecc329fed80edda381e4799fbd64da75a2dd02b1cb6bc40975104dc793e154c6bd9cc898ff1e69335a90f139af72bf2526f7177b3bc40e8ee2ed41d464db0
-DIST ocsync-0.60.0.tar.bz2 2065335 SHA256 3f43d4d349bd46fe8c80c27073bd578ce1931fa9c4e8cc7aaa1eb204d9c2a2a6 SHA512 aadbdd9d70827557eb83b7eb325b68be8399293409886a23b54aae5b5b55b74eb7c6ab79c043f2a1ea8a49633692a1bdc0829847125f4a45910869f2e5b079f9 WHIRLPOOL 824cf9835b5e03dc71d07c21308adc0f33473bec3be4d3f648edfb506402ab11e08c5ce822fe8055acf8adb8b7a4a947962c29d1c140c7bab789eb810c3b4e8d
 DIST ocsync-0.60.1.tar.bz2 2101539 SHA256 8ef3ecd717030fab2bf1a5b94d9145de755454334bf97bd0929cec1997ad82d6 SHA512 59e0304121799509edba8b81a468515dab53ff96d680a8c32480e82817c17d364d6c9806b4ec3c5c9984df0b03d2cca290df5a3244a92d9e6c5fd6afa32e335e WHIRLPOOL 243ed110a67ec3d08d5dbeba5b8a3bdd013df5b491dfc3af2e626146c7a761071a5ad4032998d5363fdc9c02faba8ae2a8e4fbfa166884bed4699b955ead138b
-EBUILD csync-0.50.8.ebuild 1341 SHA256 22e99ffb77f3552c3c67c0b1ef13beb015a44e4337e19bc4497fb0044cffe382 SHA512 3f76affd70748015ff97717f7a55a08274ce1d85d0d7c72fe6b5835ef13b53fa74e22f3bcf5df69dd86a477c4d91949326bc03e58a1f5141bc9fe741d47d7cda WHIRLPOOL 808da41bda72ac4f9e5a9ae5ca70213807da94d825b20dc0b11092e315b03c4345d704dfd5257cfa35741a53e78de47106dce266b8d92cf7da0dcb78726981f1
-EBUILD csync-0.60.0-r1.ebuild 1458 SHA256 41dda5d4cfd01549f4f7d994514f1ef20be5f2d5af613b3242fd121136b2095a SHA512 e6dda184adbc2f9c32e1cc14e399d781ed66d2005e17b316c78892be6e47c84c77670762509d3808d2a14c5ff080d31455211ab6f2933a416ef118a57b81823e WHIRLPOOL 7200d3d14b141f80208ed9dec266bd18001f302fb97dfb672fe26b949df7787ec732bddab66891740e1133207913034b297f3a04c748e7c0260c6f42830522b9
+DIST ocsync-0.60.3.tar.bz2 2102126 SHA256 86d431f33207d6b082c2f0ddad8b0880461b37c938c927802408867e87928fad SHA512 1ec324ded7a7bda08f3d6a4f68335b478797cf5497b7df4bfec45c2c5c4ce8faf62331559a1e940bda93e5e40724266670ff11fccc84753b0f8fcdf8f5bf4ce7 WHIRLPOOL 36afd7a26fd62bfee0f0912d4c892079854a39fea020e1a36fa059b6be6e9a68e0e632d2dafcfe4ce99a563f03a4af18664f6e338154264e4d10a111f3bd8964
 EBUILD csync-0.60.1.ebuild 1546 SHA256 05250dadf43f6b0a9165201604a294931d6c90d693f82a807df062c3f2063051 SHA512 9a560a9c50bd3f17ea17be7fc0cae3eedf37a48ca049bb0632237774a968a3d1562981060e9b0f2272ba97e23ff7d90adbd26e2443127cd207174cf4586e0da0 WHIRLPOOL 34570be2626817a4eac1da176b5d58fb60072fc96fcf7405af4eb1166c154a9ecfac5d8c4f27b0a4f3cc77724ee884900f971d22eb7feae7c6e52035441ce1a8
-MISC ChangeLog 1243 SHA256 47f7fb7628590671fc90eb38af5867917cc261f0553f8dcf21c35e5708e4e859 SHA512 4ed30d7059e0ff85aead9f77a53e931ffb5c06171b67cc76bd9ce3bf14a6fab635789d8cabe9cd22f9855b9185a2afb4320685940f1f927d28b6b1295fdde9dd WHIRLPOOL 308c5419f36e89cea685be5261cefc02beb593c6f51d29a7ee3d69f13203991dbaacfa10bfd9d1234abc2fa419b6339b9227e5d50cb2e10abafd8db562270b2d
+EBUILD csync-0.60.3.ebuild 1470 SHA256 be7005d5142d475f0aa73e19819dda2d9a9301cc34dfc1e44d737c115fe7564e SHA512 864e9e0596c9de9339d9fafd4bb524a1d241fa38060bc8d219ca16541ec4fab65dc5b901244db211b79708e39ea00eab7ac8f535938c78ad2b2e5517e40b57a4 WHIRLPOOL 4029974ecdbfc2ab2b23f55fc42bc0bb84bef739ffc28c901247983f1e71dd6514aa3daca6ba27d13545d24a4b61363c2dbaec59b9ac7a3e49c7254e0ce8042c
+MISC ChangeLog 1513 SHA256 477ea769b0273c42e4b3079a038da1be73b6b85538859531c961eff2e9920947 SHA512 6eff73ca6ea93a1bd29d7de38602dac2368733e2b8541cbd13a880eaacebedee90929da8e7cc1510d41ffd66f596ed11773335814a6ff6f7827a2fa1cbb29ec8 WHIRLPOOL 14d827639594035531062154445d0384d0a4b27c37865e2523f76f5a344f8514c4c03d756a0a38cb380bab90b4e71e85347085847c2bfaec2f2564b09e2cbe91
 MISC metadata.xml 430 SHA256 464dc5e0f521a67ea4e9d9caa6fb7b39ab5087c8477abc3ef1f9479c0ccf8cb5 SHA512 54c512f14aa6640a6e59fe5d7d55079a0457fc14301bb85afc0eb32629daf482f4aed5f9583d4709dcc3ed6cb7e22b00d3af5ae0fde7dbf82296109afd87a0a0 WHIRLPOOL f0b55789474b16a29f27382e1c69df224633264e81d69b7c7c77c7efe0ebd673e625a08b78da748b13b3d1f2d5ae49b461f387e06873872e4d820e055fdc73c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQpqTsAAoJEO+t9ga+3I3axEoIAIx4vJ6Dvx3uNJyfJIrsZQpF
-doatsinOBFkD4PoYDnwQ8NtjNXyaxQbcwhRC2xMRqeZ4x63Shglh0MrH2uhxJO0Q
-g8DGkEnK2W0vb7ovYcJM74/wSVAdyh8er8rogq58D+6Qiwb/Jnppnk/4tWTqb4Sc
-ohCRPEn9lJubQQlAqe6iEgkwosF3tDNhtbN+t6RWk4hiFJDXSmZrW96c0gGicyL0
-EVfm+zLH4959Qheo7RsydQB5PXyy8xu6o60dcdGpBv5zKgeKXSTm8wlCXaVsK/6F
-LfSe6FwA2H1BU1XFIKEmo8FmMtymzm/C+qCjGMF5WyzVt7/uEQdM2hrgSIO7ZT4=
-=HVSB
+iEYEAREIAAYFAlDLX3IACgkQ23laikJhg1TxEQCbBIhIQ3/PdnyYsgl/+RCj10T0
+nP0Ani9uwA+2Oq3bNDfMAaUDDtsR6vbS
+=M0Ax
 -----END PGP SIGNATURE-----
diff --git a/net-misc/csync/csync-0.50.8.ebuild b/net-misc/csync/csync-0.50.8.ebuild
deleted file mode 100644
index b27f1cd34e04..000000000000
--- a/net-misc/csync/csync-0.50.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.50.8.ebuild,v 1.4 2012/08/28 13:21:00 scarabeus Exp $
-
-EAPI=4
-
-inherit base cmake-utils
-
-DESCRIPTION="A file synchronizer especially designed for you, the normal user"
-HOMEPAGE="http://csync.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc log samba +sftp test +webdav"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/iniparser-3.1
-	dev-libs/openssl:0
-	log? ( dev-libs/log4c )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh )
-	webdav? ( net-libs/neon )
-"
-DEPEND="${DEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-automagicness.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# punt owncloud test as it uses weird cmocka framework
-	sed -i \
-		-e 's:add_subdirectory(ownCloud)::' \
-		tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOG_TO_CALLBACK=ON"
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_with doc APIDOC)
-		$(cmake-utils_use_with log Log4C)
-		$(cmake-utils_use_with samba Libsmbclient)
-		$(cmake-utils_use_with sftp LibSSH)
-		$(cmake-utils_use_with webdav Neon)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/csync/csync-0.60.0-r1.ebuild b/net-misc/csync/csync-0.60.3.ebuild
index c12541ce586e..77346e76c245 100644
--- a/net-misc/csync/csync-0.60.0-r1.ebuild
+++ b/net-misc/csync/csync-0.60.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.60.0-r1.ebuild,v 1.1 2012/10/17 06:30:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.60.3.ebuild,v 1.1 2012/12/14 17:18:48 creffett Exp $
 
 EAPI=4
 
@@ -27,11 +27,12 @@ RDEPEND="
 DEPEND="${DEPEND}
 	app-text/asciidoc
 	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
+	test? ( dev-util/cmocka )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-automagicness.patch"
+	"${FILESDIR}/${PN}-0.60.2-automagicness.patch"
+	"${FILESDIR}/${PN}-0.60.2-removebadtest.patch"
 )
 
 S="${WORKDIR}/o${P}"
@@ -39,10 +40,12 @@ S="${WORKDIR}/o${P}"
 src_prepare() {
 	base_src_prepare
 
-	# punt owncloud test as it uses weird cmocka framework
-	sed -i \
-		-e 's:add_subdirectory(ownCloud)::' \
-		tests/CMakeLists.txt || die
+	if ! use doc; then
+		sed -i \
+			-e 's:add_subdirectory(doc)::' \
+			CMakeLists.txt || die
+	fi
+
 	# proper docdir
 	sed -i \
 		-e "s:/doc/ocsync:/doc/${PF}:" \
diff --git a/net-misc/csync/files/csync-0.60.2-automagicness.patch b/net-misc/csync/files/csync-0.60.2-automagicness.patch
new file mode 100644
index 000000000000..426d83097e64
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.2-automagicness.patch
@@ -0,0 +1,102 @@
+--- ocsync-0.60.2/cmake/Modules/MacroOptionalFindPackage.cmake
++++ ocsync-0.60.2/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)
+
+--- ocsync-0.60.2/CMakeLists.txt
++++ ocsync-0.60.2/CMakeLists.txt
+@@ -38,8 +38,9 @@
+ # add macros
+ include(MacroAddPlugin)
+ include(MacroCopyFile)
++include(MacroOptionalFindPackage)
+ 
+-find_package(Log4C)
++macro_optional_find_package(Log4C)
+ find_package(CMocka)
+ if (CMOCKA_FOUND AND UNIT_TESTING)
+     include(AddCMockaTest)
+
+--- ocsync-0.60.2/DefineOptions.cmake
++++ ocsync-0.60.2/DefineOptions.cmake
+@@ -1,4 +1,3 @@
+-option(WITH_LOG4C "Build csync without log4c" ON)
+ option(UNIT_TESTING "Build with unit tests" OFF)
+ option(MEM_NULL_TESTS "Enable NULL memory testing" OFF)
+ option(LOG_TO_CALLBACK "Enable extended logging through a callback" OFF)
+
+--- ocsync-0.60.2/doc/CMakeLists.txt
++++ ocsync-0.60.2/doc/CMakeLists.txt
+@@ -2,7 +2,10 @@
+ # Build the documentation
+ #
+ 
+-include(UseDoxygen OPTIONAL)
++option(WITH_APIDOC "Use doxygen to generate documentation" ON)
++if (WITH_APIDOC)
++  include(UseDoxygen OPTIONAL)
++endif (WITH_APIDOC)
+ 
+ file(GLOB _manpages *.[0-9].txt)
+ add_custom_target(man
+
+--- ocsync-0.60.2/modules/CMakeLists.txt
++++ ocsync-0.60.2/modules/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ project(modules C)
+ 
+-find_package(Libsmbclient)
+-find_package(LibSSH 0.4.0)
+-find_package(Neon)
++macro_optional_find_package(Libsmbclient)
++macro_optional_find_package(LibSSH 0.4.0)
++macro_optional_find_package(Neon)
+ 
+ set(PLUGIN_VERSION_INSTALL_DIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
+ 
diff --git a/net-misc/csync/files/csync-0.60.2-removebadtest.patch b/net-misc/csync/files/csync-0.60.2-removebadtest.patch
new file mode 100644
index 000000000000..5b8a3a6e96b1
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.2-removebadtest.patch
@@ -0,0 +1,9 @@
+--- a/tests/vio_tests/check_vio.c
++++ b/tests/vio_tests/check_vio.c
+@@ -505,7 +505,6 @@
+         unit_test_setup_teardown(check_csync_vio_mkdirs_some_exist, setup_dir, teardown),
+         unit_test_setup_teardown(check_csync_vio_rmdir, setup, teardown),
+         unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown),
+-        unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown),
+         unit_test(check_csync_vio_closedir_null),
+         unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown),
diff --git a/net-misc/mirall/ChangeLog b/net-misc/mirall/ChangeLog
index da34913a0a7a..62bf1bc64891 100644
--- a/net-misc/mirall/ChangeLog
+++ b/net-misc/mirall/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2012/11/30 06:02:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/ChangeLog,v 1.11 2012/12/14 17:23:18 creffett Exp $
+
+*mirall-1.1.2 (14 Dec 2012)
+
+  14 Dec 2012; Chris Reffett <creffett@gentoo.org> +mirall-1.1.2.ebuild,
+  -mirall-1.0.5.ebuild, -mirall-1.1.0.ebuild, -mirall-1.1.1-r1.ebuild,
+  metadata.xml:
+  Version bump, remove old.
 
   30 Nov 2012; Chris Reffett <creffett@gentoo.org> mirall-1.1.1-r1.ebuild:
   Make the USEs enabled by default in the csync ebuild enabled by default here
diff --git a/net-misc/mirall/Manifest b/net-misc/mirall/Manifest
index 4f772d365cf5..02e665e33fc1 100644
--- a/net-misc/mirall/Manifest
+++ b/net-misc/mirall/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mirall-1.0.5.tar.bz2 789362 SHA256 07880de327f7f377c19521064bda466bbc26cad6c73848f7ce369a22c059ba41 SHA512 926b77a3c51b5f72c874853ee742aaea6f7debb0df48a614d04ba1e7eb016261a80abc8d4e59f67da6a96533bbfe5a0352bfd5f5f0fe67ff60c6202438a70936 WHIRLPOOL d9f53e45c04bc0b721a4a20a063a43efc9cc943f67b94d0cd29621c523296fb40850d3f620fdc43a50e4521b4cce7e770ffdd9982b4f2384c8123ada4b8051d6
-DIST mirall-1.1.0.tar.bz2 833165 SHA256 69d2f3ff300303b5055b08713a8104cbd6afaf80fc82ccdcf2260097cf5166a3 SHA512 7fedd190244c90f5572aa48d4e4c0161e659b8d35d60ab9bd10c6f56c0b1908d2217ca0ac1e742c2e48209b070746887052a976a580066358d0574cc4cbc4a08 WHIRLPOOL a213e82008c893704eb9ca6f920f3d36ad4fae48265758749f092d83d8a3fb627c0e4af7040f47f17eb944a8c3c85c5e76bb6d77ef842d53d33c85b7ac8bc32e
-DIST mirall-1.1.1.tar.bz2 920900 SHA256 c3989084a820134c042f7825e86d6296e2b226c9048193dd5edfdd3c387c4d30 SHA512 3fe794ba915bd72fb0e7c7895111e6dd76cc8235fc397786b015b0fd7ebdd7a92d250be334a6584787fea1fdfa63780c95d6fc2abf0bb0f8f2ed9586c4695a01 WHIRLPOOL bcfad964fc4dd6851739610ee540daa493aeb863ebd39e2b5c7fbfab13aac3aa1242ec7d69a931a19cee15a903b1a119227ce683d2fa0adcf5282fb1cc4bfec0
-EBUILD mirall-1.0.5.ebuild 596 SHA256 412e03e40b26a8c3d6666d969247f2e3bc086fb277fe528dfeddea522cc35c9a SHA512 9f6fd033431de9ecccd86dfff99d6c05ae262ade4a57e70302bcd349632adfbd9a88a401d2b23519f5ba339a32e3f0844b92c980453fa77a76085c10ca1a8d80 WHIRLPOOL 9e9c5e8de7afa806d6418dca28d244bfcdce0b21493d85b8c96be36ce5faa47f2b35cd6c443bc9cfb30b7a026602b528968e4442ff201167944892c5153b1008
-EBUILD mirall-1.1.0.ebuild 703 SHA256 013d88d5765aa5b9d7eccdb5cea7e01543dfa0122c9084b09d79b2565441fcc1 SHA512 38d54e5d8072aac7acebaf5048ec8029baeaf5933eef9ffa40ab4a70c99f195d59af3c2a17191cc08c316b97d630ff43cb2d0ed1ded3b65c1e1456e8fff24a0b WHIRLPOOL 4f5ad41f38c734cef385b012b7776bb2886339d6d80c9745ef86c5ac27b9d9e2d6972d4d014b387b29fd6842107895b3ca1cd590e052b4bb7f1eb9cc51c55989
-EBUILD mirall-1.1.1-r1.ebuild 1127 SHA256 abd50881472135c5dcbd0ff9752a199303620a8854891a313743f89c5bf55640 SHA512 8a1af0482563fac1710ca6bedf95639727d0fbe793f560be12b0ad4fcd62781d041f3f26892afb9f591d79a010ebce996945e580fe619c8f7eafdba8e9290583 WHIRLPOOL 255af39f77fb6591fc37e17c9a48a1228e89b4cecb7cc21567b1bfb56168218b8dba84e7307ad10b58bfde3ae92bb3b90d3ca5eec39aac45b7213d2c3397078d
-MISC ChangeLog 1563 SHA256 d2bca473ca2bfbb83138fdb971908ac52168f756a14b684ebe3ff8fdde59f738 SHA512 c8b62d1979cdf5b464760a9d871b404f8fd899c566b5e9161138e9ebcd794fdd5d2acc899816802cb789c157d9b5ec60b6fa8eac0941a851569feee40a161c9b WHIRLPOOL 74dc78b9094aa26be408f597a71299496e605839936c2687579e34aed8e21958c888350037696efa65b32087d7b3d9d9cee3133b8d1acb136c5bffc4258fd0e3
-MISC metadata.xml 352 SHA256 f6ca180f2ea94951e366da2b328a48df69d82bbaf74cd96404dff84a5bff1950 SHA512 78f53ea7f362c94b9f9e3715e70930ad5905794e11105b2b66c79093c09b7a84c225eae6dc48c9d99fcbd7149434cb2bddc565c10c13e34fe5b453e30caad312 WHIRLPOOL 687328c7921368077c66318fbc56710a1d0863afb509175e308e6fcd7a37bec139ad4bf12d344ad0effaf4230f8316ab4f5f007849536a7110e6ad908500cc57
+DIST mirall-1.1.2.tar.bz2 940514 SHA256 da9665dd49d5741b7632a0f320ff0cb2ccadbb336ee68fe128dfae90fffa0ee9 SHA512 bb4d237c01c204bfdf7feb8f7af6abfe69adcce33823a34ace963ae584294eb6d7e5811cbeeeffef033ba8a4a7d835707833b3c16eb2ae09d2a5f96adb6f2f31 WHIRLPOOL 8fa573acf7be489bd61958c801725237e164b2c9c3b3e2f86092fe6c1ae443c2455107bdc736b39459863eb1bab2e0a4e92a01ae79ab8cfd5f7275fc253dcae4
+EBUILD mirall-1.1.2.ebuild 1271 SHA256 e1740f0ccbe43e6782f4948cc953395ff0cf238b9d1a4af8c95e9bd0250eb84d SHA512 9213729f7a0bf7285220bbdb86d4c4ce87061b2e9154ddea5229b1562851b16df04c894cd61afd739bc6d5e761074a39b65d54a6b57a9755e973c82ef94d0d58 WHIRLPOOL d54dd12249f78207e511c1c493d996825ddf03f809d3a7149eb452b209d841317a36a7237d87ba4b613d4625fea7f23a2817e5fbe7626d658fe3cf4ff57df979
+MISC ChangeLog 1781 SHA256 3b86546fb1dc72ec2c3d0b5f8e192abbcdf7d9fb620cafa71aade2d4bcf3f23c SHA512 9c5096dbab4a7aaea001fb9469c49792a4a7e906a10d2fa11688ab774162a5531b36ef9d598cf3b88b5626cdaa45acf3fe7adffbe47d8dc8f53504a828a47f65 WHIRLPOOL 9e086e96f8c45985a795de195a0b8e5b5cf1410cc6c0cadd50e31537ab732f87a0715ac68faa36e2c2164a96d58f9d3c575fe063e676753dc66b9f10ea1acfa2
+MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC4S/YACgkQ23laikJhg1QG4ACZAbxNNDlBSoEakA5NZKCyCBLe
-wQIAn2bl+GXToXk9v3ZGkMbX7L1reQdW
-=HOa8
+iEYEAREIAAYFAlDLYIAACgkQ23laikJhg1RzogCeJo26ur/c352YEH/g9xu8Djwt
+z7AAn1ZDOhcdQgV0ydb7RvZS92v62niH
+=o5Jg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mirall/metadata.xml b/net-misc/mirall/metadata.xml
index c228c6403977..a23f444b67d6 100644
--- a/net-misc/mirall/metadata.xml
+++ b/net-misc/mirall/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
-		<flag name="webdav">Adds support for HTTP/dav content via <pkg>net-libs/neon</pkg></flag>
-	</use>
-
 </pkgmetadata>
diff --git a/net-misc/mirall/mirall-1.0.5.ebuild b/net-misc/mirall/mirall-1.0.5.ebuild
deleted file mode 100644
index 541f0928063e..000000000000
--- a/net-misc/mirall/mirall-1.0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.0.5.ebuild,v 1.4 2012/10/09 14:14:43 scarabeus Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronization of your folders with another computers"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/csync[sftp,samba,webdav]
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-test:4
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/mirall/mirall-1.1.0.ebuild b/net-misc/mirall/mirall-1.1.0.ebuild
deleted file mode 100644
index aea3ff0ced39..000000000000
--- a/net-misc/mirall/mirall-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.0.ebuild,v 1.2 2012/10/15 08:19:54 scarabeus Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronization of your folders with another computers"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-misc/csync-0.60.0[sftp,samba,webdav]
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-test:4
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Yay for fcked detection.
-	export CSYNC_DIR="${EPREFIX}/usr/include/ocsync/"
-}
diff --git a/net-misc/mirall/mirall-1.1.1-r1.ebuild b/net-misc/mirall/mirall-1.1.2.ebuild
index 70b951fdad48..f3b2cbc38a5d 100644
--- a/net-misc/mirall/mirall-1.1.1-r1.ebuild
+++ b/net-misc/mirall/mirall-1.1.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.1-r1.ebuild,v 1.2 2012/11/30 06:02:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.2.ebuild,v 1.1 2012/12/14 17:23:18 creffett Exp $
 
-EAPI=4
+EAPI=5
 
 LANG_DIR="translations"
-PLOCALES="af ar ar_SA bg_BG ca cs_CZ da de el en eo es es_AR et_EE eu eu_ES fa fi fi_FI fr gl he hi hr hu_HU hy ia id id_ID it ja_JP ko lb lt_LT lv mk nb_NO nl nn_NO oc pl pl_PL pt_BR pt_PT ro ru ru_RU sk_SK sl sr sr@latin sv tr uk vi zh_CN zh_TW"
+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
 
 DESCRIPTION="Synchronization of your folders with another computers"
@@ -15,10 +16,10 @@ SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="samba +sftp +webdav"
+IUSE=""
 
 RDEPEND="
-	>=net-misc/csync-0.60.0[sftp=,samba=,webdav=]
+	>=net-misc/csync-0.60.2
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-test:4
@@ -36,3 +37,12 @@ src_prepare() {
 		fi
 	done
 }
+
+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
+}