Version bump, remove old.

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

5 files changed, 23 insertions, 64 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/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
+}