Version bump, EAPI3, add missing pyqt4 dep

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

3 files changed, 12 insertions, 41 deletions

diff --git a/media-sound/frescobaldi/ChangeLog b/media-sound/frescobaldi/ChangeLog
index e15ea529ad44..ba9b4a916961 100644
--- a/media-sound/frescobaldi/ChangeLog
+++ b/media-sound/frescobaldi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/frescobaldi
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/ChangeLog,v 1.5 2011/01/13 03:14:43 tampakrap Exp $
+
+*frescobaldi-1.2.0 (13 Jan 2011)
+
+  13 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -frescobaldi-1.0.2.ebuild, -frescobaldi-1.0.3.ebuild,
+  +frescobaldi-1.2.0.ebuild:
+  Version bump, EAPI3, add missing pyqt4 dep
 
 *frescobaldi-1.0.3 (03 Jan 2011)
 
diff --git a/media-sound/frescobaldi/frescobaldi-1.0.2.ebuild b/media-sound/frescobaldi/frescobaldi-1.0.2.ebuild
deleted file mode 100644
index 2453c47f9562..000000000000
--- a/media-sound/frescobaldi/frescobaldi-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-1.0.2.ebuild,v 1.1 2010/05/26 07:49:52 scarabeus 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}
-
-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 {} +
-}
diff --git a/media-sound/frescobaldi/frescobaldi-1.0.3.ebuild b/media-sound/frescobaldi/frescobaldi-1.2.0.ebuild
index e112a48f9fed..02f664d9c0a0 100644
--- a/media-sound/frescobaldi/frescobaldi-1.0.3.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-1.2.0.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-1.2.0.ebuild,v 1.1 2011/01/13 03:14:43 tampakrap Exp $
 
-EAPI="2"
+EAPI="3"
 
 KDE_LINGUAS="cs de es fr gl it nl pl ru tr"
 PYTHON_DEPEND="2"
@@ -18,14 +18,13 @@ SLOT="4"
 IUSE="+handbook"
 
 DEPEND="
+	dev-python/PyQt4[examples]
 	>=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
@@ -33,5 +32,5 @@ pkg_setup() {
 
 src_install() {
 	kde4-base_src_install
-	find "${D}" -type f -name '*.pyc' -exec rm -f {} +
+	find "${ED}" -type f -name '*.pyc' -exec rm -f {} +
 }