5 files changed, 15 insertions, 64 deletions
diff --git a/sys-fs/udiskie/ChangeLog b/sys-fs/udiskie/ChangeLog
index 92afc3596299..031235cdad2f 100644
--- a/sys-fs/udiskie/ChangeLog
+++ b/sys-fs/udiskie/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udiskie
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/ChangeLog,v 1.21 2012/09/23 08:23:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/ChangeLog,v 1.22 2012/11/01 23:37:52 ssuominen Exp $
+
+  01 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -udiskie-0.3.10.ebuild,
+  -udiskie-0.4.0.ebuild:
+  old
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> udiskie-0.4.1.ebuild:
   x86 stable wrt bug #433365
diff --git a/sys-fs/udiskie/metadata.xml b/sys-fs/udiskie/metadata.xml
index 540f810e069d..40838bc36783 100644
--- a/sys-fs/udiskie/metadata.xml
+++ b/sys-fs/udiskie/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+<herd>desktop-misc</herd>
 </pkgmetadata>
diff --git a/sys-fs/udiskie/udiskie-0.3.10.ebuild b/sys-fs/udiskie/udiskie-0.3.10.ebuild
deleted file mode 100644
index 2b855c74f201..000000000000
--- a/sys-fs/udiskie/udiskie-0.3.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.3.10.ebuild,v 1.5 2012/04/17 15:13:50 mgorny Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="http://bitbucket.org/byronclark/udiskie"
-SRC_URI="mirror://bitbucket/byronclark/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python
-	dev-python/notify-python
-	dev-python/pygobject:2
-	sys-fs/udisks:0"
-DEPEND=""
diff --git a/sys-fs/udiskie/udiskie-0.4.0.ebuild b/sys-fs/udiskie/udiskie-0.4.0.ebuild
deleted file mode 100644
index 26bae451d236..000000000000
--- a/sys-fs/udiskie/udiskie-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.4.0.ebuild,v 1.1 2012/06/30 03:08:16 radhermit Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="http://bitbucket.org/byronclark/udiskie"
-SRC_URI="mirror://bitbucket/byronclark/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python
-	dev-python/notify-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	sys-fs/udisks:0"
-DEPEND=""
diff --git a/sys-fs/udiskie/udiskie-0.4.1.ebuild b/sys-fs/udiskie/udiskie-0.4.1.ebuild
index 497bcafaa57d..a308682eb67b 100644
--- a/sys-fs/udiskie/udiskie-0.4.1.ebuild
+++ b/sys-fs/udiskie/udiskie-0.4.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.4.1.ebuild,v 1.3 2012/09/23 08:23:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.4.1.ebuild,v 1.4 2012/11/01 23:37:52 ssuominen Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="2.[456] 3.*"
 
 inherit distutils
 
@@ -19,9 +19,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-python/dbus-python
-	dev-python/notify-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	sys-fs/udisks:0"
+RDEPEND=">=dev-python/dbus-python-1.1.1
+	>=dev-python/notify-python-0.1.1-r2
+	>=dev-python/pygobject-2.28.6-r50:2
+	>=dev-python/pyxdg-0.23
+	>=sys-fs/udisks-1.0.4-r2:0"
 DEPEND=""