[app-misc/kupfer] switch to python-single-r1

With miscellaneous fixes.
This commit is contained in:
Sławomir Nizio
2015-06-27 22:04:14 +02:00
parent f5959dd422
commit 6d3bbfb33e
6 changed files with 95 additions and 100 deletions
+1 -1
View File
@@ -1 +1 @@
DIST kupfer-v208.tar.xz 638484 SHA256 65de8fe23e4b91a25910969ae11f32a98ed44714a460c64dfc71a85d20289c04
DIST kupfer-v208.tar.xz 638484 SHA256 65de8fe23e4b91a25910969ae11f32a98ed44714a460c64dfc71a85d20289c04 SHA512 95939326f99f9b007df9d4435d43c0302e6bda71464535d2423ff491b5a8bf4d19fdbc3cc1fa10ff58abdcbfa019a00ae8f04d0e63cb06315a69277db505a01b WHIRLPOOL d740ed2384634a3112f46a86c6aa44f7361db735a11e221fdf3501858b721acd5562fcd9b36a14cef45316fde81896ca1faa861d13682bbc4c859e835b99b699
@@ -1,15 +0,0 @@
diff -ur kupfer-206.original/work//kupfer-v206/kupfer/plugin/core/alternatives.py kupfer-206/work//kupfer-v206/kupfer/plugin/core/alternatives.py
--- kupfer-206.original/work//kupfer-v206/kupfer/plugin/core/alternatives.py 2011-04-14 16:00:04.000000000 -0400
+++ kupfer-206/work//kupfer-v206/kupfer/plugin/core/alternatives.py 2011-05-24 11:32:45.173788075 -0400
@@ -20,9 +20,9 @@
plugin_support.register_alternative(__name__, 'terminal', 'xfce4-terminal',
**{
'name': _("XFCE Terminal"),
- 'argv': ['xfce4-terminal'],
+ 'argv': ['Terminal'],
'exearg': '-x',
- 'desktopid': "xfce4-terminal.desktop",
+ 'desktopid': "Terminal.desktop",
'startup_notify': True,
})
@@ -0,0 +1,14 @@
Remove 'errcheck' usage because as it cannot be found and thus causes
a failure.
--- kupfer-v208/waflib/Options.py
--- kupfer-v208/waflib/Options.py
@@ -240,9 +240,6 @@
if options.destdir:
options.destdir = os.path.abspath(os.path.expanduser(options.destdir))
- if options.verbose >= 1:
- self.load('errcheck')
-
def execute(self):
"""
See :py:func:`waflib.Context.Context.execute`
+78
View File
@@ -0,0 +1,78 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
# Kupfer itself may work with Python 3 but at least dev-python/pygtk
# doesn't support it.
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads(+)" # threads for waf
inherit eutils fdo-mime gnome2-utils python-single-r1 waf-utils
DESCRIPTION="Kupfer, a convenient command and access tool"
HOMEPAGE="http://engla.github.io/kupfer"
SRC_URI="mirror://github/engla/kupfer/kupfer-v208.tar.xz"
LICENSE="Apache-2.0 GPL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+keybinder doc nautilus"
COMMON_DEPEND="${PYTHON_DEPS}
dev-python/pygtk[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/libwnck-python[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:2[${PYTHON_USEDEP}]
dev-python/libgnome-python[${PYTHON_USEDEP}]"
DEPEND="${COMMON_DEPEND}
dev-python/docutils[${PYTHON_USEDEP}]
doc? ( app-text/gnome-doc-utils[${PYTHON_USEDEP}] )
dev-util/intltool"
RDEPEND="${COMMON_DEPEND}
keybinder? ( dev-libs/keybinder[python,${PYTHON_USEDEP}] )
nautilus? ( gnome-base/nautilus )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
S="${WORKDIR}/${PN}-v${PV}"
src_prepare() {
epatch "${FILESDIR}/${P}-remove-errcheck.patch"
if ! use doc; then
sed -i -e 's/bld.env\["XML2PO"\]/False/' help/wscript || die
fi
}
src_configure() {
local myopts=""
use nautilus || myopts="--no-install-nautilus-extension"
waf-utils_src_configure --no-update-mime --nopyc ${myopts}
}
src_compile() {
waf-utils_src_compile
}
src_install() {
waf-utils_src_install
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}
-83
View File
@@ -1,83 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
PYTHON_DEPEND="2:2.6"
inherit eutils fdo-mime gnome2-utils python waf-utils
DESCRIPTION="Kupfer, a convenient command and access tool"
HOMEPAGE="http://kaizer.se/wiki/kupfer/"
MY_P="${PN}-v${PV}"
SRC_URI="http://kaizer.se/publicfiles/${PN}/${MY_P}.tar.xz"
LICENSE="Apache-2.0 GPL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+keybinder doc nautilus"
COMMON_DEPEND="dev-python/pygtk
dev-python/pyxdg
dev-python/dbus-python
dev-python/libwnck-python
dev-python/pycairo
dev-python/pygobject:2
dev-python/libgnome-python"
# dev-python/gnome-keyring-python doesn't work well with Kupfer
# dev-python/gnome-keyring-python
DEPEND="${COMMON_DEPEND}
dev-python/docutils
doc? ( app-text/gnome-doc-utils )
dev-util/intltool"
RDEPEND="${COMMON_DEPEND}
keybinder? ( dev-libs/keybinder[python] )
nautilus? ( gnome-base/nautilus )"
S=${WORKDIR}/${MY_P}
src_prepare() {
# don't try to fix them with sed
# it will cause Kupfer doesn't bother importing gnomekeyring module
# dev-python/gnome-keyring-python doesn't work well with Kupfer
# sed -i "s/keyring/gnomekeyring/" wscript || die
# sed -i "s/import keyring/import gnomekeyring as keyring/" \
# kupfer/plugin_support.py || \
# die "Error: src_prepare failed!"
# recognise Xfce terminal installation in Gentoo
epatch "${FILESDIR}/${PN}-206-xfce4-terminal.patch"
if ! use doc; then
sed -i -e 's/bld.env\["XML2PO"\]/False/' help/wscript || die
fi
}
src_configure() {
local myopts=""
use nautilus || myopts="--no-install-nautilus-extension"
waf-utils_src_configure --no-update-mime --nopyc $myopts || \
die "Error: configure failed!"
}
src_install() {
waf-utils_src_install || die "Error: install failed!"
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
python_mod_optimize /usr/share/${PN}
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
python_mod_cleanup /usr/share/${PN}
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}
+2 -1
View File
@@ -2,9 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>poczta-sn@gazeta.pl</email>
<email>slawomir.nizio@sabayon.org</email>
</maintainer>
<use>
<flag name='doc'>Generate and install documentation files for Gnome.</flag>
<flag name='nautilus'>Install Nautilus extension.</flag>
<flag name='keybinder'>Include keybinder for global key bindings.</flag>
</use>