Updated to version 2.8.0 as per bug #99305 (and masked because it crashes here). Also applied GCC4 patch as per bug #99988.

(Portage version: 2.0.53_rc6)

6 files changed, 127 insertions, 14 deletions

diff --git a/media-sound/noteedit/ChangeLog b/media-sound/noteedit/ChangeLog
index 61945c71c556..8c7215336aa7 100644
--- a/media-sound/noteedit/ChangeLog
+++ b/media-sound/noteedit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/noteedit
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.15 2005/08/04 15:04:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.16 2005/10/30 15:12:41 flameeyes Exp $
+
+*noteedit-2.8.0 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/noteedit-gcc4.patch, +files/noteedit-2.8.0-qt-3.3.5.patch,
+  +noteedit-2.8.0.ebuild:
+  Updated to version 2.8.0 as per bug #99305 (and masked because it crashes
+  here). Also applied GCC4 patch as per bug #99988.
 
   04 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> noteedit-2.7.4.ebuild:
   Narrowed down kde-meta dependencies.
diff --git a/media-sound/noteedit/Manifest b/media-sound/noteedit/Manifest
index 76dba17da5c2..9a2d31f73cc3 100644
--- a/media-sound/noteedit/Manifest
+++ b/media-sound/noteedit/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7278c57429e445d9a7a0cccb6af3f6e2 ChangeLog 2190
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 dbd15ba893dc4b59e18cb6d4b43c2f22 noteedit-2.6.2.ebuild 966
-MD5 7f117de227b731663c575d9cd8d57571 noteedit-2.7.4.ebuild 830
 MD5 872c8c5d5228329ce0f644c2b5a542da files/digest-noteedit-2.6.2 64
 MD5 59bc45abcb4453ffe5b57bc2ff83c3a8 files/digest-noteedit-2.7.4 67
+MD5 60892ba74f680cb83f554f7ee038b017 files/digest-noteedit-2.8.0 67
 MD5 e4d9e7d1a9ceafde0c6cbe9a7c9692b7 files/noteedit-2.6.2-gcc34.patch 2142
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8i6ej5H05b2HAEkRAscUAJ9U6s6PTIziijP1fanuMEIfrfoCMgCfVTiR
-BxQSd/83cPnqudgvwSDw2kw=
-=KiQK
------END PGP SIGNATURE-----
+MD5 8603574c7dbc5adece13799217772f3d files/noteedit-gcc4.patch 1067
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 dbd15ba893dc4b59e18cb6d4b43c2f22 noteedit-2.6.2.ebuild 966
+MD5 7f117de227b731663c575d9cd8d57571 noteedit-2.7.4.ebuild 830
+MD5 6e2f42cd1adc1765ffa3cec43db49a66 noteedit-2.8.0.ebuild 858
diff --git a/media-sound/noteedit/files/digest-noteedit-2.8.0 b/media-sound/noteedit/files/digest-noteedit-2.8.0
new file mode 100644
index 000000000000..0d4ff6a468d7
--- /dev/null
+++ b/media-sound/noteedit/files/digest-noteedit-2.8.0
@@ -0,0 +1 @@
+MD5 c707a0c67254784b912dabc6545e8125 noteedit-2.8.0.tar.gz 2618858
diff --git a/media-sound/noteedit/files/noteedit-2.8.0-qt-3.3.5.patch b/media-sound/noteedit/files/noteedit-2.8.0-qt-3.3.5.patch
new file mode 100644
index 000000000000..b6903ce8fd54
--- /dev/null
+++ b/media-sound/noteedit/files/noteedit-2.8.0-qt-3.3.5.patch
@@ -0,0 +1,32 @@
+Index: noteedit-2.8.0/noteedit/staffProps.ui
+===================================================================
+--- noteedit-2.8.0.orig/noteedit/staffProps.ui
++++ noteedit-2.8.0/noteedit/staffProps.ui
+@@ -542,14 +542,4 @@
+     <slot>slotPropertyChanged()</slot>
+ </slots>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-</includehints>
+ </UI>
+Index: noteedit-2.8.0/noteedit/timesigDia.ui
+===================================================================
+--- noteedit-2.8.0.orig/noteedit/timesigDia.ui
++++ noteedit-2.8.0/noteedit/timesigDia.ui
+@@ -356,8 +356,4 @@
+     <slot>slot_68()</slot>
+ </slots>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>nscaleedit.h</includehint>
+-    <includehint>nscaleedit.h</includehint>
+-</includehints>
+ </UI>
diff --git a/media-sound/noteedit/files/noteedit-gcc4.patch b/media-sound/noteedit/files/noteedit-gcc4.patch
new file mode 100644
index 000000000000..c0de1effc239
--- /dev/null
+++ b/media-sound/noteedit/files/noteedit-gcc4.patch
@@ -0,0 +1,38 @@
+--- noteedit/configure.in.in	2005/07/04 19:44:25	263
++++ noteedit/configure.in.in	2005/07/28 18:53:19	284
+@@ -91,20 +91,22 @@
+ then
+ 	AC_DEFINE(GCC_MAJ_VERS, 2, [main version number of gcc])
+ 	rm -f compvers.cc compvers.o compvers
++elif test "X$ccversion" = "X3"
++then
++	AC_DEFINE(GCC_MAJ_VERS, 3, [main version number of gcc])
++	rm -f compvers.cc compvers.o compvers
++elif test "X$ccversion" = "X4"
++then
++	AC_DEFINE(GCC_MAJ_VERS, 4, [main version number of gcc])
++	rm -f compvers.cc compvers.o compvers
+ else
+-	if test "X$ccversion" = "X3"
+-	then
+-		AC_DEFINE(GCC_MAJ_VERS, 3, [main version number of gcc])
+-		rm -f compvers.cc compvers.o compvers
+-	else
+-		echo ""
+-		echo "Cannot determine g++ version"
+-		echo "Check your compiler installation or"
+-		echo "try to find out why \"./compvers\" doesn't"
+-		echo "supply \"2\" or \"3\"!"
+-		echo ""
+-		exit
+-	fi
++	echo ""
++	echo "Cannot determine g++ version"
++	echo "Check your compiler installation or"
++	echo "try to find out why \"./compvers\" doesn't"
++	echo "supply \"2\", \"3\" or \"4\"!"
++	echo ""
++	exit
+ fi
+  
+ 
diff --git a/media-sound/noteedit/noteedit-2.8.0.ebuild b/media-sound/noteedit/noteedit-2.8.0.ebuild
new file mode 100644
index 000000000000..89961f921a54
--- /dev/null
+++ b/media-sound/noteedit/noteedit-2.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.8.0.ebuild,v 1.1 2005/10/30 15:12:41 flameeyes Exp $
+
+IUSE=""
+
+inherit kde-functions kde eutils flag-o-matic
+
+DESCRIPTION="Musical score editor (for Linux)."
+HOMEPAGE="http://noteedit.berlios.de/"
+SRC_URI="http://download.berlios.de/noteedit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="|| ( kde-base/kmid kde-base/kdemultimedia )
+	kde-base/arts
+	media-libs/tse3"
+
+need-kde 3
+
+pkg_setup() {
+	append-flags -fpermissive
+}
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-qt-3.3.5.patch"
+	
+	# Force rebuilding configure for the patch above
+	rm configure
+}
+
+src_install() {
+	kde_src_install
+	dodoc FAQ FAQ.de examples
+	docinto examples
+	dodoc noteedit/examples/*
+}