Version bump, adding patch for python 2.7 (bug 348219)

Package-Manager: portage-2.1.9.26/cvs/Linux i686

4 files changed, 63 insertions, 3 deletions

diff --git a/media-sound/frescobaldi/ChangeLog b/media-sound/frescobaldi/ChangeLog
index 10f4e9384f05..e15ea529ad44 100644
--- a/media-sound/frescobaldi/ChangeLog
+++ b/media-sound/frescobaldi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/frescobaldi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/ChangeLog,v 1.3 2010/05/26 07:49:51 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/ChangeLog,v 1.4 2011/01/03 20:28:43 dilfridge Exp $
+
+*frescobaldi-1.0.3 (03 Jan 2011)
+
+  03 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +frescobaldi-1.0.3.ebuild, +files/frescobaldi-1.0.3-python27.patch:
+  Version bump, adding patch for python 2.7 (bug 348219)
 
 *frescobaldi-1.0.2 (26 May 2010)
 
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 4d86ef1c7e1e..cda2ecc5897d 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,4 +1,7 @@
+AUX frescobaldi-1.0.3-python27.patch 698 RMD160 89ed821900e5fd66995c2257f6b83498fbf45e9c SHA1 06e8cf196201d39dfdee5953551169354ba01c1d SHA256 bdbe749af7fec3ed97b694a298c056f592cc45157dce202b8cad104062ef433b
 DIST frescobaldi-1.0.2.tar.gz 814202 RMD160 5dad8076b5a69db702e9957d5c8092d58923a365 SHA1 76b2f16df055bcd456cf34fadd251d97bbc7bb17 SHA256 45b6aca563f1cf299f3d8f7193b000efd9072df45a393e1edb8c8bec151c5573
+DIST frescobaldi-1.0.3.tar.gz 832242 RMD160 eb8c398a933036fb9f7a66da1624417147831105 SHA1 870c17d850721adcfd68e03745900a78ce0b3640 SHA256 fd9ad987e732bccff2c7a395d780cf610aece865fdcf8206432a1a1e1eaf3319
 EBUILD frescobaldi-1.0.2.ebuild 823 RMD160 c189b698a5bc81cde1e2df732faed909c97208d9 SHA1 986b5df450fc769a3b0763827f458dc3c96310ae SHA256 abc1c124fd3772f9a1a36b1297eb66321b38d24e689a8193c5c586859f303144
-MISC ChangeLog 659 RMD160 c3a3c8035691b17f1e9dc72700859fb5eb96c372 SHA1 e74f8bfc2a89cdb8fee3f1491467461cfb22dd67 SHA256 ce947e72f4a4f4e32bb9bf785199dc40568b6acd41b218acb52efa77bdc7a4f9
+EBUILD frescobaldi-1.0.3.ebuild 869 RMD160 ffef907d7b88316d2623077f7f769eccb913d9a5 SHA1 489e35e0d2992f51adbdb3cd9a912c05fc53b502 SHA256 7555d996823e7dce48f72dc17ff5d054f95e907219fc2dec5aff0de2220b6f05
+MISC ChangeLog 878 RMD160 a87094b89e9852271aba2098b9dc24e02a3284fa SHA1 171e6cdbddf259416ec1e8cd08c3fe293b4a7d1c SHA256 cfa68e69e4ab03702cb54a94a7b1a934cf7fca08ccc263cc4ce0e54af4ed321a
 MISC metadata.xml 179 RMD160 b883f5c6912f84aca19da8e3feb822cb6b617bb3 SHA1 780a3d3818c6d10b571275c76277de6eefde2807 SHA256 d00a9b479ff6574e2d3defd7122eb87842cf188a309349c98d2a56e39695364e
diff --git a/media-sound/frescobaldi/files/frescobaldi-1.0.3-python27.patch b/media-sound/frescobaldi/files/frescobaldi-1.0.3-python27.patch
new file mode 100644
index 000000000000..155214c902ee
--- /dev/null
+++ b/media-sound/frescobaldi/files/frescobaldi-1.0.3-python27.patch
@@ -0,0 +1,14 @@
+diff -r -u frescobaldi-1.0.3.orig/checkmodules.py frescobaldi-1.0.3/checkmodules.py
+--- frescobaldi-1.0.3.orig/checkmodules.py	2009-12-13 08:36:46.000000000 +0100
++++ frescobaldi-1.0.3/checkmodules.py	2010-12-12 19:50:40.000000000 +0100
+@@ -31,8 +31,8 @@
+ mkver = lambda major, minor, release: major * 65536 + minor * 256 + release
+     
+ # versions
+-if sys.version_info[:2] not in ((2,4), (2,5), (2,6)):
+-    errors.append("Python version %s.%s.%s found, but need 2.4, 2.5 or 2.6." %
++if not (2, 4) <= sys.version_info[:2] < (3, 0):
++    errors.append("Python version %s.%s.%s found, but need 2.4, 2.5, 2.6 or 2.7." %
+         sys.version_info[:3])
+         
+ if sip.SIP_VERSION < mkver(4, 7, 7):
diff --git a/media-sound/frescobaldi/frescobaldi-1.0.3.ebuild b/media-sound/frescobaldi/frescobaldi-1.0.3.ebuild
new file mode 100644
index 000000000000..e112a48f9fed
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-1.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-1.0.3.ebuild,v 1.1 2011/01/03 20:28:43 dilfridge Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="cs de es fr gl it nl pl ru tr"
+PYTHON_DEPEND="2"
+inherit python kde4-base
+
+DESCRIPTION="a LilyPond sheet music text editor for KDE"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="http://lilykde.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="+handbook"
+
+DEPEND="
+	>=kde-base/pykde4-${KDE_MINIMAL}
+	media-gfx/imagemagick
+	media-sound/lilypond
+"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}/${P}"-python27.patch )
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+}
+
+src_install() {
+	kde4-base_src_install
+	find "${D}" -type f -name '*.pyc' -exec rm -f {} +
+}