summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2010-02-20 19:01:38 +0000
committerAndrey Grozin <grozin@gentoo.org>2010-02-20 19:01:38 +0000
commit79c6bcbcabfe6f9325a40680d2f4a3d3034cd5be (patch)
tree0fa0ed1dc1bb104c0824952fc0550ac74ca15a7e
parentVersion bump. (diff)
downloadgentoo-2-79c6bcbcabfe6f9325a40680d2f4a3d3034cd5be.tar.gz
gentoo-2-79c6bcbcabfe6f9325a40680d2f4a3d3034cd5be.tar.bz2
gentoo-2-79c6bcbcabfe6f9325a40680d2f4a3d3034cd5be.zip
Fixed a bug: resources were not installed
(Portage version: 2.2_rc63/cvs/Linux i686)
-rw-r--r--dev-python/pygui/ChangeLog8
-rw-r--r--dev-python/pygui/files/pygui-2.2-resources.patch8
-rw-r--r--dev-python/pygui/pygui-2.2-r1.ebuild (renamed from dev-python/pygui/pygui-2.2.ebuild)8
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-python/pygui/ChangeLog b/dev-python/pygui/ChangeLog
index 1fce563fefa2..b98a52229f68 100644
--- a/dev-python/pygui/ChangeLog
+++ b/dev-python/pygui/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/pygui
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/ChangeLog,v 1.1 2010/02/19 18:22:59 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/ChangeLog,v 1.2 2010/02/20 19:01:38 grozin Exp $
+
+*pygui-2.2-r1 (21 Feb 2010)
+
+ 21 Feb 2010; Andrey Grozin <grozin@gentoo.org> -pygui-2.2.ebuild,
+ +pygui-2.2-r1.ebuild, +files/pygui-2.2-resources.patch:
+ Fixed a bug: resources were not installed
*pygui-2.2 (20 Feb 2010)
diff --git a/dev-python/pygui/files/pygui-2.2-resources.patch b/dev-python/pygui/files/pygui-2.2-resources.patch
new file mode 100644
index 000000000000..dbf3f3fdf7fa
--- /dev/null
+++ b/dev-python/pygui/files/pygui-2.2-resources.patch
@@ -0,0 +1,8 @@
+diff -r -U1 PyGUI-2.2.orig/setup.py PyGUI-2.2/setup.py
+--- PyGUI-2.2.orig/setup.py 2009-04-12 07:36:14.000000000 +0200
++++ PyGUI-2.2/setup.py 2010-02-21 00:52:21.000000000 +0100
+@@ -15,3 +15,3 @@
+ dst_rsrc_dir = os.path.join(dst_gui_dir, "Resources", "cursors")
+-src_rsrc_files = glob(os.path.join("GUI", "Resources", "Cursors", "*"))
++src_rsrc_files = glob(os.path.join("GUI", "Resources", "cursors", "*"))
+
diff --git a/dev-python/pygui/pygui-2.2.ebuild b/dev-python/pygui/pygui-2.2-r1.ebuild
index 1076c3662b5c..ce975b9f4e8e 100644
--- a/dev-python/pygui/pygui-2.2.ebuild
+++ b/dev-python/pygui/pygui-2.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/pygui-2.2.ebuild,v 1.1 2010/02/19 18:22:59 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/pygui-2.2-r1.ebuild,v 1.1 2010/02/20 19:01:38 grozin Exp $
EAPI=3
PYTHON_DEPEND=2
RESTRICT_PYTHON_ABIS="3.*"
@@ -27,19 +27,23 @@ src_prepare() {
# "as" is a keyword
epatch "${FILESDIR}"/${P}-python-2.6.patch
+
+ # Fixing a typo in setup.py
+ epatch "${FILESDIR}"/${P}-resources.patch
}
src_install() {
distutils_src_install
if use doc; then
- dohtml Doc/*
+ dohtml Doc/* || die "Installing html documentation failed"
fi
if use examples; then
pushd Tests
insinto /usr/share/doc/${PF}/examples
doins *.py *.tiff *.jpg || die "Installing examples failed"
+ doins -r ../Demos/* || die "Installing demos failed"
popd
fi
}