Fix bug #134121, thanks to Christian Becke.

(Portage version: 2.1.1_pre5-r2)

5 files changed, 29 insertions, 3 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index ab92e1662174..ed472478a922 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2006/02/22 16:06:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.36 2006/08/18 23:34:58 carlo Exp $
+
+  18 Aug 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/4.1.0-includehints.patch, rosegarden-4.1.0-r1.ebuild:
+  Fix bug #134121, thanks to Christian Becke.
 
   22 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
   +files/rosegarden-4.1.2.3-kde.py.diff:
diff --git a/media-sound/rosegarden/files/4.1.0-includehints.patch b/media-sound/rosegarden/files/4.1.0-includehints.patch
new file mode 100644
index 000000000000..c35fd1c83390
--- /dev/null
+++ b/media-sound/rosegarden/files/4.1.0-includehints.patch
@@ -0,0 +1,11 @@
+--- gui/rosegardentransport.ui.orig	2006-07-30 00:16:37.000000000 +0200
++++ gui/rosegardentransport.ui	2006-07-30 00:16:50.000000000 +0200
+@@ -4308,8 +4308,4 @@
+     <tabstop>FfwdEndButton</tabstop>
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>rosegardenlabel.h</includehint>
+-    <includehint>rosegardenlabel.h</includehint>
+-</includehints>
+ </UI>
diff --git a/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r1 b/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r1
index 492de4c1abd1..333bc6854d6a 100644
--- a/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r1
+++ b/media-sound/rosegarden/files/digest-rosegarden-4.1.0-r1
@@ -1 +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/files/digest-rosegarden-4.1.2.3 b/media-sound/rosegarden/files/digest-rosegarden-4.1.2.3
index 97a919b0bc1e..6a7a5f303d49 100644
--- a/media-sound/rosegarden/files/digest-rosegarden-4.1.2.3
+++ b/media-sound/rosegarden/files/digest-rosegarden-4.1.2.3
@@ -1 +1,3 @@
 MD5 e7fb7ebcb21ac6841ac5cfd6683f5fb2 rosegarden-4-1.2.3.tar.bz2 5445637
+RMD160 81756c0c18115fa73235114a84d286a17f87a983 rosegarden-4-1.2.3.tar.bz2 5445637
+SHA256 1206356b590b1ee057f68993af321cda4420b18aad4ccc9f5ee3f8e523277ff6 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 135e4c383f2d..48bc4483215c 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-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.7 2006/02/21 18:15:35 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.1.0-r1.ebuild,v 1.8 2006/08/18 23:34:58 carlo Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -27,7 +27,9 @@ DEPEND="arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
 need-kde 3
 
 PATCHES="${FILESDIR}/4.1.0-dssi.patch
-	${FILESDIR}/4.1.0-gcc4.diff"
+	${FILESDIR}/4.1.0-gcc4.diff
+	${FILESDIR}/4.1.0-includehints.patch"
+
 pkg_setup() {
 	echo
 	if use arts ; then
@@ -47,3 +49,8 @@ src_compile() {
 	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."
+}
\ No newline at end of file