summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/udiskie/ChangeLog6
-rw-r--r--sys-fs/udiskie/udiskie-0.6.2.ebuild10
2 files changed, 13 insertions, 3 deletions
diff --git a/sys-fs/udiskie/ChangeLog b/sys-fs/udiskie/ChangeLog
index 203d87e4d202..991f81cddfcc 100644
--- a/sys-fs/udiskie/ChangeLog
+++ b/sys-fs/udiskie/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udiskie
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/ChangeLog,v 1.29 2014/03/04 19:57:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/ChangeLog,v 1.30 2014/03/14 17:27:21 ssuominen Exp $
+
+ 14 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> udiskie-0.6.2.ebuild:
+ Document the command for installing selected SLOT of sys-fs/udisks using
+ readme.gentoo.eclass wrt #504600 by Kai Wüstermann
04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> udiskie-0.6.2.ebuild:
Stable for x86, wrt bug #502934
diff --git a/sys-fs/udiskie/udiskie-0.6.2.ebuild b/sys-fs/udiskie/udiskie-0.6.2.ebuild
index aa925248ff7f..cc07eea4514d 100644
--- a/sys-fs/udiskie/udiskie-0.6.2.ebuild
+++ b/sys-fs/udiskie/udiskie-0.6.2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.6.2.ebuild,v 1.5 2014/03/04 19:57:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.6.2.ebuild,v 1.6 2014/03/14 17:27:21 ssuominen Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils
+inherit distutils-r1 gnome2-utils readme.gentoo
DESCRIPTION="An automatic disk mounting service using udisks"
HOMEPAGE="http://pypi.python.org/pypi/udiskie http://github.com/coldfix/udiskie"
@@ -23,6 +23,10 @@ RDEPEND="dev-python/dbus-python
DEPEND="app-text/asciidoc
dev-python/setuptools"
+DOC_CONTENTS="You have to select which sys-fs/udisks SLOT you want to use:\n
+# emerge --noreplace 'sys-fs/udisks:0' (for UDisks 1.0.4+)\nor\n
+# emerge --noreplace 'sys-fs/udisks:2' (for UDisks 2.0.0+)"
+
src_prepare() {
sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
distutils-r1_src_prepare
@@ -36,6 +40,7 @@ src_compile() {
src_install() {
distutils-r1_src_install
doman doc/${PN}.8
+ readme.gentoo_src_install
}
pkg_preinst() {
@@ -44,6 +49,7 @@ pkg_preinst() {
pkg_postinst() {
gnome2_icon_cache_update
+ readme.gentoo_pkg_postinst
}
pkg_postrm() {