Version bump, remove old.

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

6 files changed, 30 insertions, 75 deletions

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
+}