summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-06-01 14:07:54 +0000
committerJeroen Roovers <jer@gentoo.org>2013-06-01 14:07:54 +0000
commitc65196f318ecbaa8ccc00dd0abe5bbde073958b6 (patch)
tree9ffcc7608b9cd0b3dd0873043de452ab799b5de8 /x11-plugins
parentEAPI bump wrt bug 460572 (diff)
downloadgentoo-2-c65196f318ecbaa8ccc00dd0abe5bbde073958b6.tar.gz
gentoo-2-c65196f318ecbaa8ccc00dd0abe5bbde073958b6.tar.bz2
gentoo-2-c65196f318ecbaa8ccc00dd0abe5bbde073958b6.zip
Sort RDEPEND. Do not strip .po from $lingua twice.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/screenlets/ChangeLog5
-rw-r--r--x11-plugins/screenlets/screenlets-0.1.6.ebuild16
2 files changed, 13 insertions, 8 deletions
diff --git a/x11-plugins/screenlets/ChangeLog b/x11-plugins/screenlets/ChangeLog
index cbdc0cecd2f6..a6555e551af7 100644
--- a/x11-plugins/screenlets/ChangeLog
+++ b/x11-plugins/screenlets/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/screenlets
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/ChangeLog,v 1.5 2013/06/01 13:45:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/ChangeLog,v 1.6 2013/06/01 14:07:54 jer Exp $
+
+ 01 Jun 2013; Jeroen Roovers <jer@gentoo.org> screenlets-0.1.6.ebuild:
+ Sort RDEPEND. Do not strip .po from $lingua twice.
*screenlets-0.1.6 (01 Jun 2013)
diff --git a/x11-plugins/screenlets/screenlets-0.1.6.ebuild b/x11-plugins/screenlets/screenlets-0.1.6.ebuild
index eee0d6216d9e..1dd12142f56b 100644
--- a/x11-plugins/screenlets/screenlets-0.1.6.ebuild
+++ b/x11-plugins/screenlets/screenlets-0.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/screenlets-0.1.6.ebuild,v 1.1 2013/06/01 13:45:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/screenlets-0.1.6.ebuild,v 1.2 2013/06/01 14:07:54 jer Exp $
EAPI=5
@@ -18,14 +18,16 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+svg"
-RDEPEND="dev-python/dbus-python
- svg? ( dev-python/librsvg-python )
- dev-python/libwnck-python
+RDEPEND="
+ dev-python/beautifulsoup:python-2
+ dev-python/dbus-python
dev-python/gnome-keyring-python
+ dev-python/libwnck-python
dev-python/pyxdg
+ svg? ( dev-python/librsvg-python )
x11-libs/libnotify
x11-misc/xdg-utils
- dev-python/beautifulsoup:python-2"
+"
src_prepare() {
# this is tricky because screenlets translations do not always have -manager
@@ -36,14 +38,14 @@ src_prepare() {
lingua=${pofile/$PN*\/}
lingua=${lingua/.po}
- if ! has ${lingua/.po} ${LINGUAS}; then
+ if ! has ${lingua} ${LINGUAS}; then
rm -f ${PN}/${lingua}.po
rm -f ${PN}-manager/${lingua}.po
fi
done
distutils-r1_src_prepare
- python_fix_shebang src
+ python_fix_shebang src/
sed -i $(find src/ -type f) -e 's|exec python|&2|g;s|python -u|python2 -u|g' || die
sed -i desktop-menu/screenlets-{daemon,manager}.desktop -e 's|> .*||g' || die
}