Version bump. Dropped old.

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 24 insertions, 55 deletions

diff --git a/app-emulation/spice/ChangeLog b/app-emulation/spice/ChangeLog
index 4aaadc01f8bc..9c93fffca269 100644
--- a/app-emulation/spice/ChangeLog
+++ b/app-emulation/spice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/spice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.17 2011/09/19 10:04:46 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.18 2011/11/14 08:44:11 dev-zero Exp $
+
+*spice-0.10.0 (14 Nov 2011)
+
+  14 Nov 2011; Tiziano Müller <dev-zero@gentoo.org> +spice-0.10.0.ebuild,
+  -spice-0.6.4.ebuild, -spice-0.8.0.ebuild, metadata.xml:
+  Version bump. Dropped old.
 
 *spice-0.8.2-r1 (19 Sep 2011)
 
diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml
index d6eb288137d1..05fa93d12a4a 100644
--- a/app-emulation/spice/metadata.xml
+++ b/app-emulation/spice/metadata.xml
@@ -6,6 +6,7 @@
     <name>Tiziano Müller</name>
   </maintainer>
   <use>
+	  <flag name="client">Build the spicec client app (does not reduce dependencies at the moment).</flag>
 	  <flag name="gui">Build some GUI components (inside the guest window).</flag>
   </use>
 </pkgmetadata>
diff --git a/app-emulation/spice/spice-0.8.0.ebuild b/app-emulation/spice/spice-0.10.0.ebuild
index c417dc9b1407..09d40986a37f 100644
--- a/app-emulation/spice/spice-0.8.0.ebuild
+++ b/app-emulation/spice/spice-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.8.0.ebuild,v 1.1 2011/04/18 07:58:19 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.10.0.ebuild,v 1.1 2011/11/14 08:44:11 dev-zero Exp $
 
 EAPI=4
 
@@ -10,10 +10,10 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui static-libs"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +gui sasl static static-libs"
 
-RDEPEND="~app-emulation/spice-protocol-${PV}
+RDEPEND=">=app-emulation/spice-protocol-0.8.1
 	>=x11-libs/pixman-0.17.7
 	media-libs/alsa-lib
 	media-libs/celt:0.5.1
@@ -25,7 +25,8 @@ RDEPEND="~app-emulation/spice-protocol-${PV}
 	x11-libs/libXfixes
 	virtual/jpeg
 	sys-libs/zlib
-	gui? ( =dev-games/cegui-0.6* )"
+	client? ( gui? ( =dev-games/cegui-0.6* ) )
+	sasl? ( dev-libs/cyrus-sasl )"
 DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
@@ -35,10 +36,16 @@ DEPEND="dev-util/pkgconfig
 # * add libcacard for smartcard support
 
 src_configure() {
-	local myconf=""
-	use gui && myconf+="--enable-gui "
-	econf ${myconf} \
-		$(use_enable static-libs static)
+	local gui="$(use_enable gui)"
+	use client || gui="--disable-gui"
+	econf \
+		$(use_enable static-libs static) \
+		--disable-tunnel \
+		${gui} \
+		--disable-smartcard \
+		$(use_enable client) \
+		$(use_enable static static-linkage) \
+		$(use_with sasl)
 }
 
 src_install() {
diff --git a/app-emulation/spice/spice-0.6.4.ebuild b/app-emulation/spice/spice-0.6.4.ebuild
deleted file mode 100644
index bea498d67dc2..000000000000
--- a/app-emulation/spice/spice-0.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.6.4.ebuild,v 1.1 2011/02/17 10:28:44 dev-zero Exp $
-
-EAPI=4
-
-DESCRIPTION="SPICE server and client."
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui static-libs"
-
-RDEPEND="~app-emulation/spice-protocol-${PV}
-	>=x11-libs/pixman-0.17.7
-	media-libs/alsa-lib
-	media-libs/celt:0.5.1
-	dev-libs/openssl
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXfixes
-	virtual/jpeg
-	sys-libs/zlib
-	gui? ( =dev-games/cegui-0.6* )"
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
-
-# maintainer notes:
-# * opengl support is currently broken
-
-src_configure() {
-	local myconf=""
-	use gui && myconf+="--enable-gui "
-	econf ${myconf} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || rm "${D}"/usr/lib*/*.la
-}