Added a patch to fix build on amd64 thanks to <malc@gentoo.org>.

Package-Manager: portage-2.1.1_pre5-r3

5 files changed, 114 insertions, 5 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index efd92a3140f4..f18cd963bb65 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.37 2006/08/18 23:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.38 2006/08/25 17:00:23 metalgod Exp $
+
+*rosegarden-4.1.0-r2 (25 Aug 2006)
+
+  25 Aug 2006; Luis Medinas <metalgod@gentoo.org> +files/4.1.0-amd64.patch,
+  +rosegarden-4.1.0-r2.ebuild:
+  Added a patch to fix build on amd64 thanks to <malc@gentoo.org>.
 
 *rosegarden-1.2.4 (18 Aug 2006)
 
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 3c9a70618210..1ee31817e3ca 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.1.0-amd64.patch 871 RMD160 9944f80c9636cd0f14e783b6ecb81d5dc2b9d955 SHA1 a18231f97d5f764c7c9e6c5650a3cafaa78917d2 SHA256 f4bc4409a3a36aa9fc79e0badb80e958263cb161006cde738c6fa7a2bf5db2a8
+MD5 a04a1918256e656d88888f7c1c2f2232 files/4.1.0-amd64.patch 871
+RMD160 9944f80c9636cd0f14e783b6ecb81d5dc2b9d955 files/4.1.0-amd64.patch 871
+SHA256 f4bc4409a3a36aa9fc79e0badb80e958263cb161006cde738c6fa7a2bf5db2a8 files/4.1.0-amd64.patch 871
 AUX 4.1.0-dssi.patch 514 RMD160 153137231a373fa9fa3f37fdd80baca61f6b7fb9 SHA1 db0a00d488b526e3320d7f2897c9c3825d78cf7e SHA256 95d678919a9e02598d08f31a31e7528c15f311cd54fb6e3c338c9509f7a1cca2
 MD5 a59eb89ba41ea479834ca5694b0f5192 files/4.1.0-dssi.patch 514
 RMD160 153137231a373fa9fa3f37fdd80baca61f6b7fb9 files/4.1.0-dssi.patch 514
@@ -20,10 +27,14 @@ EBUILD rosegarden-4.1.0-r1.ebuild 1650 RMD160 9e1412ddb846ad039ee2d6b0e75a43fffe
 MD5 27b43ee5ad73f7e881cf34046f90beff rosegarden-4.1.0-r1.ebuild 1650
 RMD160 9e1412ddb846ad039ee2d6b0e75a43fffe3fedfb rosegarden-4.1.0-r1.ebuild 1650
 SHA256 0213aa6d15ffe0f8a4481ea2be4591ae5a60f45d44713ef90388f620dcbba1de rosegarden-4.1.0-r1.ebuild 1650
-MISC ChangeLog 5888 RMD160 318688debdb71770687a6448781bd1aedb1bfe07 SHA1 e0846a8f32a305d52c8c99d05fd754fb60ab5fc7 SHA256 424c65b39c691511d653799f42db42f8dabdc14a647593345ead1dd944341d93
-MD5 b9056cabe5e38a7d05eced3c52d8d4a1 ChangeLog 5888
-RMD160 318688debdb71770687a6448781bd1aedb1bfe07 ChangeLog 5888
-SHA256 424c65b39c691511d653799f42db42f8dabdc14a647593345ead1dd944341d93 ChangeLog 5888
+EBUILD rosegarden-4.1.0-r2.ebuild 1679 RMD160 5726b476ef1bf75e1507d9b03d6762567f8b2fc0 SHA1 dc01a4578854b2fbcb503067b960bed2852a997c SHA256 42c63c51f3df72b5fe13e193919cd89174bcae58d2a23e8f5e7914256273a3d2
+MD5 b876a4b7742e0c0f0ca64ee4ad64d091 rosegarden-4.1.0-r2.ebuild 1679
+RMD160 5726b476ef1bf75e1507d9b03d6762567f8b2fc0 rosegarden-4.1.0-r2.ebuild 1679
+SHA256 42c63c51f3df72b5fe13e193919cd89174bcae58d2a23e8f5e7914256273a3d2 rosegarden-4.1.0-r2.ebuild 1679
+MISC ChangeLog 6102 RMD160 aa4af6dbf1b47aac75d8a002307b38d507e6258b SHA1 bd8d742439b19d88932f2437f9b97b23e6a5fa4d SHA256 3a5708f91e0a0cc88b99b9a8f3828503fac757e380dbc7e9acda16f4e250f3df
+MD5 a456866af985a01d6e267dff77f36c2c ChangeLog 6102
+RMD160 aa4af6dbf1b47aac75d8a002307b38d507e6258b ChangeLog 6102
+SHA256 3a5708f91e0a0cc88b99b9a8f3828503fac757e380dbc7e9acda16f4e250f3df ChangeLog 6102
 MISC metadata.xml 256 RMD160 367512faa50c0a9063cdaf9c431b6b96702693bd SHA1 eb5bc0dfca8bb810133f67e6c1cdcee1af48aa86 SHA256 39ff8ce405ca57695d8567fb7e3485ec3f54937e548223c9244f5a68d9a633ab
 MD5 c88092184926549fd28a504c79731af2 metadata.xml 256
 RMD160 367512faa50c0a9063cdaf9c431b6b96702693bd metadata.xml 256
@@ -34,3 +45,13 @@ SHA256 2934b1adf7fd4568faa6a0cda6593a2bbe1fe26bd0174130c94cd66b0c24be8e files/di
 MD5 7a3f4c704f7473f726463abe0776a3a2 files/digest-rosegarden-4.1.0-r1 256
 RMD160 3524ecf32d6be4da60d73063196662a4cf447baa files/digest-rosegarden-4.1.0-r1 256
 SHA256 4862fd53c7de3ad3c07a0e360f792e38776d5350d268edc94517beccd11c35bf files/digest-rosegarden-4.1.0-r1 256
+MD5 7a3f4c704f7473f726463abe0776a3a2 files/digest-rosegarden-4.1.0-r2 256
+RMD160 3524ecf32d6be4da60d73063196662a4cf447baa files/digest-rosegarden-4.1.0-r2 256
+SHA256 4862fd53c7de3ad3c07a0e360f792e38776d5350d268edc94517beccd11c35bf files/digest-rosegarden-4.1.0-r2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE7zr+wUpWvClEHQoRAspVAJ9ko8q2AcstrJp8FfjDFqiyYChbcQCeLllq
+O2jBllN45NsqHZj0vT3MR8c=
+=D0rP
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rosegarden/files/4.1.0-amd64.patch b/media-sound/rosegarden/files/4.1.0-amd64.patch
new file mode 100644
index 000000000000..10fb3ddcabfa
--- /dev/null
+++ b/media-sound/rosegarden/files/4.1.0-amd64.patch
@@ -0,0 +1,22 @@
+--- gui/segmentcanvas.cpp	2005-02-08 14:56:26.000000000 +0000
++++ gui/segmentcanvas.cpp	2006-08-21 21:29:03.000000000 +0100
+@@ -444,7 +444,7 @@
+     if (e->type() == QEvent::User + 1) {
+ 	QCustomEvent *ev = dynamic_cast<QCustomEvent *>(e);
+ 	if (ev) {
+-	    int token = (int)ev->data();
++	    int token = (int)(long)ev->data();
+ 	    AudioPreviewThread &thread = m_parent.getDocument()->getAudioPreviewThread();
+ 
+ 	    RG_DEBUG << "SegmentAudioPreview::token " << token << ", my token " << m_previewToken <<endl;
+--- gui/mmapper.cpp	2005-02-09 10:44:38.000000000 +0000
++++ gui/mmapper.cpp	2006-08-21 21:28:57.000000000 +0100
+@@ -896,7 +896,7 @@
+ 
+     return QString("%1/segment_%2")
+         .arg(tmpDirs.last())
+-        .arg((unsigned int)segment, 0, 16);
++        .arg((unsigned long)segment, 0, 16);
+ }
+ 
+ QString CompositionMmapper::getSegmentFileName(Segment* s)
diff --git a/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r2 b/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r2
new file mode 100644
index 000000000000..333bc6854d6a
--- /dev/null
+++ b/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r2
@@ -0,0 +1,3 @@
+MD5 ca63f343e2a6240a0f64d32e362bf436 rosegarden-4-1.0.tar.bz2 5471903
+RMD160 80d2afeb7064a46e3725c427dfc9aa63451fdd9c rosegarden-4-1.0.tar.bz2 5471903
+SHA256 5cc20e7d72fb6e3e30a199051d07b0825f3cc7a98e4bdc939c80d830958858e4 rosegarden-4-1.0.tar.bz2 5471903
diff --git a/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild b/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild
new file mode 100644
index 000000000000..d041ed096ee5
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-4.1.0-r2.ebuild
@@ -0,0 +1,57 @@
+# 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-r2.ebuild,v 1.1 2006/08/25 17:00:23 metalgod Exp $
+
+inherit kde eutils flag-o-matic
+
+IUSE="arts jack"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+DEPEND="arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
+	!arts? ( media-libs/alsa-lib
+		jack? ( media-sound/jack-audio-connection-kit )
+		>=media-libs/ladspa-sdk-1.0
+		>=media-libs/ladspa-cmt-1.14 )"
+need-kde 3
+
+PATCHES="${FILESDIR}/4.1.0-dssi.patch
+	${FILESDIR}/4.1.0-gcc4.diff
+	${FILESDIR}/4.1.0-includehints.patch
+	${FILESDIR}/4.1.0-amd64"
+
+pkg_setup() {
+	echo
+	if use arts ; then
+		einfo "aRts support enabled"
+		ewarn "ALSA support disabled, USE=-arts enables ALSA"
+		built_with_use kde-base/arts jack && einfo "aRts was built with Jack support" \
+					|| ewarn "aRts wasn't built with Jack support"
+	else
+		einfo "ALSA support enabled"
+		use jack && einfo "Jack support enabled" || ewarn "Jack support disabled"
+	fi
+	echo
+}
+
+src_compile() {
+	strip-flags -fvisibility-inlines-hidden
+	use arts && myconf="" || myconf="$(use_with jack) --with-ladspa"
+	kde_src_compile
+}
+
+pkg_postinstall() {
+	elog "The developers of Rosegarden dropped the \"4\" as major version. If you're"
+	elog "interested in the latest testing release, hard mask >=media-sound/rosegarden-4."
+}