>=colord-0.1.24 supports scanners via udev. Add some subslot operators. Drop old.

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

4 files changed, 20 insertions, 52 deletions

diff --git a/media-gfx/simple-scan/ChangeLog b/media-gfx/simple-scan/ChangeLog
index be836e00dc2e..817668b7f988 100644
--- a/media-gfx/simple-scan/ChangeLog
+++ b/media-gfx/simple-scan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/simple-scan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/ChangeLog,v 1.21 2012/12/16 12:50:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/ChangeLog,v 1.22 2012/12/20 05:29:52 tetromino Exp $
+
+  20 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -simple-scan-3.2.1.ebuild, simple-scan-3.4.2.ebuild,
+  simple-scan-3.6.0.ebuild:
+  >=colord-0.1.24 supports scanners via udev. Add some subslot operators. Drop
+  old.
 
 *simple-scan-3.6.0 (16 Dec 2012)
 
diff --git a/media-gfx/simple-scan/simple-scan-3.2.1.ebuild b/media-gfx/simple-scan/simple-scan-3.2.1.ebuild
deleted file mode 100644
index a237035e2550..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.2.1.ebuild,v 1.7 2012/12/11 11:14:21 ssuominen Exp $
-
-EAPI="4"
-
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=media-gfx/sane-backends-1.0.20
-	virtual/jpeg
-	virtual/udev[gudev]
-	>=sys-libs/zlib-1.2.3.1
-	x11-libs/cairo
-	>=x11-libs/gtk+-3:3
-	x11-misc/colord[scanner]
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	x11-themes/gnome-icon-theme"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	dev-lang/vala:0.14
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF} VALAC=$(type -p valac-0.14)"
-}
diff --git a/media-gfx/simple-scan/simple-scan-3.4.2.ebuild b/media-gfx/simple-scan/simple-scan-3.4.2.ebuild
index e34861bfcd57..fc54135b9ded 100644
--- a/media-gfx/simple-scan/simple-scan-3.4.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.4.2.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/media-gfx/simple-scan/simple-scan-3.4.2.ebuild,v 1.4 2012/12/11 11:14:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.4.2.ebuild,v 1.5 2012/12/20 05:29:52 tetromino Exp $
 
 EAPI="4"
 
@@ -25,7 +25,9 @@ COMMON_DEPEND="
 	>=sys-libs/zlib-1.2.3.1
 	x11-libs/cairo
 	>=x11-libs/gtk+-3:3
-	x11-misc/colord[scanner]
+	|| (
+		>=x11-misc/colord-0.1.24[udev]
+		x11-misc/colord[scanner] )
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils
diff --git a/media-gfx/simple-scan/simple-scan-3.6.0.ebuild b/media-gfx/simple-scan/simple-scan-3.6.0.ebuild
index 703029f7a04c..fe418472b74e 100644
--- a/media-gfx/simple-scan/simple-scan-3.6.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.6.0.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/media-gfx/simple-scan/simple-scan-3.6.0.ebuild,v 1.1 2012/12/16 12:50:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.6.0.ebuild,v 1.2 2012/12/20 05:29:52 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,13 +18,15 @@ IUSE=""
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.28:2
-	>=media-gfx/sane-backends-1.0.20
-	>=sys-libs/zlib-1.2.3.1
-	virtual/jpeg
-	virtual/udev[gudev]
-	x11-libs/cairo
+	>=media-gfx/sane-backends-1.0.20:=
+	>=sys-libs/zlib-1.2.3.1:=
+	virtual/jpeg:=
+	virtual/udev:=[gudev]
+	x11-libs/cairo:=
 	>=x11-libs/gtk+-3:3
-	x11-misc/colord[scanner]
+	|| (
+		>=x11-misc/colord-0.1.24:=[udev]
+		x11-misc/colord:=[scanner] )
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils