GCC 4 fix, thanks to Thomas Chik, bug #123042. Version bump.

(Portage version: 2.0.54)

6 files changed, 104 insertions, 21 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index d177a6b75aff..2fc91bfa1f03 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rosegarden
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.32 2005/07/07 10:23:17 herbs Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.33 2006/02/21 18:15:35 carlo Exp $
+
+*rosegarden-4.1.2.3 (21 Feb 2006)
+
+  21 Feb 2006; Carsten Lohrke <carlo@gentoo.org> +files/4.1.0-gcc4.diff,
+  rosegarden-4.1.0-r1.ebuild, +rosegarden-4.1.2.3.ebuild:
+  GCC 4 fix, thanks to Thomas Chik, bug #123042. Version bump.
 
   07 Jul 2005; Herbie Hopkins <herbs@gentoo.org> rosegarden-4.1.0-r1.ebuild:
   Stable on amd64 wrt bug #96462.
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 60c30257210d..264c07ed1315 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9571d59a6a60cebeb4a5759f9320f3a0 ChangeLog 5062
+MD5 cc0e97c654fd9ead9f0f539416ad04bc ChangeLog 5292
 MD5 a59eb89ba41ea479834ca5694b0f5192 files/4.1.0-dssi.patch 514
+MD5 d13f4fe7a88cdb80fcfcc11f422e912f files/4.1.0-gcc4.diff 1490
 MD5 3cc3d030f6a95056ab3ece40cd427077 files/digest-rosegarden-4.1.0-r1 70
+MD5 506f29c7a6014313376c270f33ba36c8 files/digest-rosegarden-4.1.2.3 72
 MD5 c88092184926549fd28a504c79731af2 metadata.xml 256
-MD5 e2e971028a8082859d444083115c160c rosegarden-4.1.0-r1.ebuild 1424
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1RydI1lqEGTUzyQRAkiFAKCkaY2crrgWSmxdZ5ihabOqlcbcNwCfcGTy
-JwKMBngROFwKV5NJrBjWPv0=
-=Sl34
------END PGP SIGNATURE-----
+MD5 6bbdaac7ae77b8e32c3ef9a8547eb480 rosegarden-4.1.0-r1.ebuild 1421
+MD5 06db7a5405b3395025eeeb49b7a7ec17 rosegarden-4.1.2.3.ebuild 1363
diff --git a/media-sound/rosegarden/files/4.1.0-gcc4.diff b/media-sound/rosegarden/files/4.1.0-gcc4.diff
new file mode 100644
index 000000000000..177fc2bad65d
--- /dev/null
+++ b/media-sound/rosegarden/files/4.1.0-gcc4.diff
@@ -0,0 +1,36 @@
+diff -r -u foo/rosegarden-4-1.0/base/Colour.C rosegarden-4-1.0/base/Colour.C
+--- foo/rosegarden-4-1.0/base/Colour.C	2005-02-08 14:55:22.000000000 +0000
++++ rosegarden-4-1.0/base/Colour.C	2005-10-08 15:06:06.000000000 +0100
+@@ -163,7 +163,7 @@
+ // Generic Colour routines:
+ 
+ Colour
+-Rosegarden::getCombinationColour(const Colour &input1, const Colour &input2)
++getCombinationColour(const Colour &input1, const Colour &input2)
+ {
+     Colour ret((input1.getRed()+input2.getRed())/2,
+                 (input1.getGreen()+input2.getGreen())/2,
+diff -r -u foo/rosegarden-4-1.0/gui/qcanvasgroupableitem.h rosegarden-4-1.0/gui/qcanvasgroupableitem.h
+--- foo/rosegarden-4-1.0/gui/qcanvasgroupableitem.h	2005-02-08 14:56:08.000000000 +0000
++++ rosegarden-4-1.0/gui/qcanvasgroupableitem.h	2005-10-08 15:16:10.000000000 +0100
+@@ -24,6 +24,8 @@
+ 
+ #include <qcanvas.h>
+ 
++class QCanvasItemGroup;
++
+ /**
+  * This class is meant to be inherited by QCanvasItem children to make
+  * them groupable.
+diff -r -u foo/rosegarden-4-1.0/gui/segmenttool.h rosegarden-4-1.0/gui/segmenttool.h
+--- foo/rosegarden-4-1.0/gui/segmenttool.h	2005-02-08 14:56:27.000000000 +0000
++++ rosegarden-4-1.0/gui/segmenttool.h	2005-10-08 15:43:59.000000000 +0100
+@@ -41,6 +41,8 @@
+ 
+ namespace Rosegarden { class RulerScale; }
+ 
++class SegmentToolBox;
++
+ //////////////////////////////////////////////////////////////////////
+ //                 Segment Tools
+ //////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/media-sound/rosegarden/files/digest-rosegarden-4.1.2.3 b/media-sound/rosegarden/files/digest-rosegarden-4.1.2.3
new file mode 100644
index 000000000000..97a919b0bc1e
--- /dev/null
+++ b/media-sound/rosegarden/files/digest-rosegarden-4.1.2.3
@@ -0,0 +1 @@
+MD5 e7fb7ebcb21ac6841ac5cfd6683f5fb2 rosegarden-4-1.2.3.tar.bz2 5445637
diff --git a/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild b/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild
index e521f1b27865..135e4c383f2d 100644
--- a/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild
+++ b/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild,v 1.6 2005/07/13 13:52:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild,v 1.7 2006/02/21 18:15:35 carlo Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -26,6 +26,8 @@ DEPEND="arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
 		>=media-libs/ladspa-cmt-1.14 )"
 need-kde 3
 
+PATCHES="${FILESDIR}/4.1.0-dssi.patch
+	${FILESDIR}/4.1.0-gcc4.diff"
 pkg_setup() {
 	echo
 	if use arts ; then
@@ -40,11 +42,6 @@ pkg_setup() {
 	echo
 }
 
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${PV}-dssi.patch
-}
-
 src_compile() {
 	strip-flags -fvisibility-inlines-hidden
 	use arts && myconf="" || myconf="$(use_with jack) --with-ladspa"
diff --git a/media-sound/rosegarden/rosegarden-4.1.2.3.ebuild b/media-sound/rosegarden/rosegarden-4.1.2.3.ebuild
new file mode 100644
index 000000000000..5ba0c3f6f04d
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-4.1.2.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.1.2.3.ebuild,v 1.1 2006/02/21 18:15:35 carlo Exp $
+
+inherit kde eutils flag-o-matic
+
+MY_PV="${PV/_rc*/}"
+MY_PV="${MY_PV/./-}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="MIDI and audio sequencer and notation editor."
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/rosegarden/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lirc"
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	media-libs/ladspa-sdk
+	>=media-libs/ladspa-cmt-1.14
+	media-libs/liblrdf
+	media-libs/dssi"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+need-kde 3.4
+
+LANGS="ca cs cy de en_GB en es et fr it ja nl ru sv zh_CN"
+
+PATCHES="${FILESDIR}/rosegarden-4.1.2.3-kde.py.diff"
+
+src_compile() {
+	[ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
+	addpredict "$QTDIR/etc/settings"
+
+	local myconf="kdeincludes=$(kde-config --prefix)/include prefix=${ROOT}/usr"
+	use amd64 && myconf="${myconf} libsuffix=64"
+	use lirc || myconf="${myconf} nolirc=1"
+
+	scons configure ${myconf} || die "configure failed"
+	scons ${MAKEOPTS} languages="${LANGS// /:}" || die "scons failed"
+}
+
+src_install() {
+	scons install DESTDIR="${D}" languages="$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))"
+	dodoc AUTHORS README TRANSLATORS
+}