amd64 stable wrt #298440

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

8 files changed, 9 insertions, 240 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 34d7866e0a2e..0b21d12dbbac 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.68 2009/12/29 19:56:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.69 2009/12/29 20:03:26 ssuominen Exp $
+
+  29 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  rosegarden-10.02_beta.ebuild:
+  amd64 stable wrt #298440
 
   29 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
   rosegarden-10.02_beta.ebuild:
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 98a79b72ce31..b08178452ad7 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,24 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rosegarden-1.5.1-asneeded.patch 834 RMD160 bdd1e4177c631d093edb0b52341d3f13122844fd SHA1 88b0ee8a48a52f1f5145e5620a949f2aa7545470 SHA256 be83e291c7d3378542170450b2902ffe288efeddabcf54d4a1653a4fef8098d6
-AUX rosegarden-1.6.1-asneeded.patch 1021 RMD160 e4ad1f3cc6edc15dcada9b5801d40f09ad358d82 SHA1 b5f1fb6063716376679f82fb7461de5fea3d8398 SHA256 40a1297b6cc982a193a8c639451ca04e05c6c9978aabee6fb549293a531e4129
-AUX rosegarden-1.6.1.desktop.diff 617 RMD160 c86918100fbec8962e46d17d8c943ab0e65218c6 SHA1 a70562ad84dd6666731049b907da704b59e115da SHA256 70a1e0151db9bc5374e46ebbf90dc0e12cfb14ae5fdfbcd80f5d4b1ab4437785
-AUX rosegarden-10.02_alpha2-qt-4.6.0.patch 1153 RMD160 0209600ed450cac4078532efa76b27f1abbd3d40 SHA1 47da8397e1aeb01a629a8c15d5d590303166fcbf SHA256 e4daaeabedb9496a73f3b7b090b74fda9a295ae196500757bd16a5c6578953d8
 DIST rosegarden-1.5.1.tar.bz2 6137509 RMD160 dfddce14494fe0a8bdd89e08eb84929a899ea687 SHA1 59b387ca936fe315db234487556f7f0f23c748f4 SHA256 bac5c3e6af0bbf3fa950a5b155591e13460717c32c14a9f841a9bef699f123ae
-DIST rosegarden-1.7.3.tar.bz2 7593543 RMD160 dcc8481c328cfd7a30a3b401f12e69995c3e1491 SHA1 367537830df2ee553a3cc5c520dd5bf29d40e09f SHA256 78fd26557a43c3f071f25ba59fa635a71084103738e59176e8eb9692d631a11b
-DIST rosegarden-10.02-alpha2.tar.bz2 5511059 RMD160 d2e68e8762841422d700fe3cdd007519559331d5 SHA1 e2e0a006a90d2617b2c5a27cfe6ceec52ae2b7d5 SHA256 0b310fdd24c847c995e0539070fa003ac6ffe55a8caeec417fb7f5e9bb088d53
 DIST rosegarden-10.02-beta.tar.bz2 6117980 RMD160 d4c4494477cd3bc9274273313c8be6eb1e442bc7 SHA1 979920acd8d88f8e7301c733b10b7ea256d00168 SHA256 af6387a8266699902ce5899df927d519a87689ce7f03f25ec5328252d47ab1eb
 EBUILD rosegarden-1.5.1.ebuild 1965 RMD160 1bee475513234fc62c1a00e80442b892bc168db1 SHA1 475c4ac1f299a34dddccc9a83d2e9552cd054c0c SHA256 c193b3d76aa651cbe2e283e93b51f212ff7a941c4a71cb72670795bb3eeb0959
-EBUILD rosegarden-1.7.3.ebuild 1822 RMD160 0fd48804c33fbb07d47c5df37a3f409bc7bc339c SHA1 99ec6b5fcdca2595e9f25534bf47f4996a526444 SHA256 c52f3ea46220513bb1c52bb6a9c5762e39d124827a7821abf3c2c8fc764d59a1
-EBUILD rosegarden-10.02_alpha2-r1.ebuild 1284 RMD160 bc2c9164a452e8bfb244735bb4c142e8415d056e SHA1 ff958479bf0cd816e3e7cdb1d160bd64ba687e7d SHA256 89cd693a1d9d289fa7f1528bf5f782ace7664e28f1dd531f80f7c467ea23cd6d
-EBUILD rosegarden-10.02_beta.ebuild 1224 RMD160 66ea9153e0411c2e5d28509abf801f9f931889c4 SHA1 9abc41b43b72e6f9959a91084c9bb2bf2468a0f1 SHA256 ff081b3b9d0f5e1cec94218e63d0e00218c7584727c662aa58e73df4a4121c05
-MISC ChangeLog 10741 RMD160 f1a9e05f5dfd20e82adba8055eac35538e1db76d SHA1 cf54b542bdb29ed3e0cf1b8abb8e0550ec191ae4 SHA256 5a5c9c44c2e1fa6e055d2c75eedf6deefd96798a9e83e8ff01fd8e7efb8e62c3
+EBUILD rosegarden-10.02_beta.ebuild 1227 RMD160 9132e604abc9e4a90cb92da14cbecabf8279267c SHA1 8e361fd4569dd44b3b1cbe33f2c41a9568b27521 SHA256 7ae54a406a98ee302a5e205fd17cf436a87cd36b8baf699dbf5c8990d29e5bb6
+MISC ChangeLog 10859 RMD160 ccfb69715ae593e2a50ad4a03320cbeb9ac352ce SHA1 1f39860dd40c3f171ed7935b6f5b3d11159390dc SHA256 aee821045eb0394271e441a63c5a968e8abebf99676ef95b55ab961d9d0dfafa
 MISC metadata.xml 254 RMD160 0e6229a76ca60d7951ddefe1509ebb5e9698c55d SHA1 5d414f4ea0693462ea668e21d4ecd5465f65d35d SHA256 e88e25fd62d27e9e94642efca820e019701543e9c5b98a4cb01f4e9b4ffb6fba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks6XwsACgkQNQqtfCuFneMD1QCeLkUsLOt+dvICmM98QGugeUla
-GIIAni/AZiIW9gpZZK+l7w+8hQ11go6i
-=KzkD
------END PGP SIGNATURE-----
diff --git a/media-sound/rosegarden/files/rosegarden-1.6.1-asneeded.patch b/media-sound/rosegarden/files/rosegarden-1.6.1-asneeded.patch
deleted file mode 100644
index d26278837412..000000000000
--- a/media-sound/rosegarden/files/rosegarden-1.6.1-asneeded.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/CMakeLists.txt.old	2007-12-23 03:23:48.000000000 +0100
-+++ src/CMakeLists.txt	2007-12-23 03:25:36.000000000 +0100
-@@ -73,15 +73,15 @@
-     ADD_DEPENDENCIES(rosegardensequencer precompiled_headers)
- ENDIF(USE_PCH)
- 
--TARGET_LINK_LIBRARIES(rosegardensequencer 
--    ${QT_AND_KDECORE_LIBS} 
--    ${ALSA_LIBS} 
-+TARGET_LINK_LIBRARIES(rosegardensequencer
-+    RosegardenCommon
-+    ${QT_AND_KDECORE_LIBS}
-+    ${ALSA_LIBS}
-     ${JACK_LIBS}
-     ${LIBLO_LIBS}
-     ${LRDF_LIBS}
-     ${FFTW3F_LIBS}
-     kdeui
--    RosegardenCommon
- )
- 
- # gui executable
-@@ -135,7 +135,11 @@
- ENDIF(USE_PCH)
- 
- TARGET_LINK_LIBRARIES(rosegarden
--    ${QT_AND_KDECORE_LIBS} 
-+    RosegardenExtended
-+    RosegardenSegmentCanvas
-+    RosegardenCommands
-+    RosegardenCommon
-+    ${QT_AND_KDECORE_LIBS}
-     ${LIBLO_LIBS}
-     ${LRDF_LIBS}
-     ${FFTW3F_LIBS}
-@@ -145,10 +149,6 @@
-     kio
-     kdeui
-     kdeprint
--    RosegardenExtended
--    RosegardenSegmentCanvas
--    RosegardenCommands
--    RosegardenCommon
- )
- 
- # Install targets
diff --git a/media-sound/rosegarden/files/rosegarden-1.6.1.desktop.diff b/media-sound/rosegarden/files/rosegarden-1.6.1.desktop.diff
deleted file mode 100644
index 45ff852877e5..000000000000
--- a/media-sound/rosegarden/files/rosegarden-1.6.1.desktop.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./data/desktop/rosegarden.desktop.old	2007-12-22 22:55:32.000000000 +0100
-+++ ./data/desktop/rosegarden.desktop	2007-12-22 22:56:13.000000000 +0100
-@@ -1,11 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
- Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
- Exec=rosegarden -caption "%c" %i %m
--MimeType=audio/x-rosegarden;audio/x-rosegarden-device
-+MimeType=audio/x-rosegarden;audio/x-rosegarden-device;
- X-KDE-NativeMimeType=audio/x-rosegarden
--Icon=rosegarden.png
-+Icon=rosegarden
- DocPath=rosegarden/index.html
- Comment=MIDI and Audio Sequencer and Editor
- Terminal=false
diff --git a/media-sound/rosegarden/files/rosegarden-10.02_alpha2-qt-4.6.0.patch b/media-sound/rosegarden/files/rosegarden-10.02_alpha2-qt-4.6.0.patch
deleted file mode 100644
index 6b902ab94124..000000000000
--- a/media-sound/rosegarden/files/rosegarden-10.02_alpha2-qt-4.6.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur rosegarden-10.02-alpha2.orig/src/gui/widgets/Led.cpp rosegarden-10.02-alpha2/src/gui/widgets/Led.cpp
---- rosegarden-10.02-alpha2.orig/src/gui/widgets/Led.cpp	2009-12-02 04:31:41.000000000 +0200
-+++ rosegarden-10.02-alpha2/src/gui/widgets/Led.cpp	2009-12-07 07:29:06.000000000 +0200
-@@ -202,7 +202,7 @@
-         width /= 3;
-         i = i.smoothScale(width, width);
-         delete tmpMap;
--        dest = new QPixmap(i);
-+        dest = new QPixmap(QPixmap::fromImage(i));
-         paint.begin(this);
-         paint.drawPixmap(0, 0, *dest);
-         paint.end();
-diff -ur rosegarden-10.02-alpha2.orig/src/gui/widgets/Rotary.cpp rosegarden-10.02-alpha2/src/gui/widgets/Rotary.cpp
---- rosegarden-10.02-alpha2.orig/src/gui/widgets/Rotary.cpp	2009-12-02 04:31:41.000000000 +0200
-+++ rosegarden-10.02-alpha2/src/gui/widgets/Rotary.cpp	2009-12-07 07:29:21.000000000 +0200
-@@ -295,7 +295,7 @@
-     paint.end();
- 
-     QImage i = map.convertToImage().smoothScale(m_size, m_size);
--    m_pixmaps[index] = QPixmap(i);
-+    m_pixmaps[index] = QPixmap::fromImage(i);
-     paint.begin(this);
-     paint.drawPixmap(0, 0, m_pixmaps[index]);
-     paint.end();
diff --git a/media-sound/rosegarden/rosegarden-1.7.3.ebuild b/media-sound/rosegarden/rosegarden-1.7.3.ebuild
deleted file mode 100644
index 0f796bc506cf..000000000000
--- a/media-sound/rosegarden/rosegarden-1.7.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-1.7.3.ebuild,v 1.3 2009/10/10 11:04:49 maekke Exp $
-
-EAPI=2
-
-inherit eutils kde-functions cmake-utils
-
-MY_PV="${PV/_rc*/}"
-#MY_PV="${MY_PV/4./}"
-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 x86"
-IUSE="alsa debug jack dssi lirc"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib
-		jack? ( >=media-sound/jack-audio-connection-kit-0.77 )
-	)
-	>=media-libs/ladspa-sdk-1.0
-	>=media-libs/ladspa-cmt-1.14
-	dssi? ( >=media-libs/dssi-0.4 )
-	lirc? ( >=app-misc/lirc-0.7 )
-	>=media-libs/liblrdf-0.3
-	>=sci-libs/fftw-3.0.0
-	>=media-libs/liblo-0.7"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15
-	>=dev-util/cmake-2.4.2"
-
-need-kde 3.5
-
-pkg_setup() {
-	if ! use alsa && use jack; then
-		ewarn "If you want JACK support you also need to enable"
-		ewarn "ALSA support, or the whole sound support will be"
-		ewarn "disabled."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/rosegarden-1.6.1-asneeded.patch" \
-		"${FILESDIR}/rosegarden-1.6.1.desktop.diff"
-}
-
-src_configure() {
-	tc-export CC CXX LD
-
-	# cmake is stupid, very very stupid.
-	sed -i -e 's:CMAKE_CXX_FLAGS_\(RELEASE\|RELWITHDEBINFO\|DEBUG\).*".*"):CMAKE_CXX_FLAGS_\1 "'"${CXXFLAGS}"'"):' \
-		CMakeLists.txt || die "unable to sanitise CXXFLAGS"
-
-	mycmakeargs="$(cmake-utils_use_want alsa SOUND)
-		$(cmake-utils_use_want jack JACK)
-		$(cmake-utils_use_want dssi DSSI)
-		$(cmake-utils_use_want lirc LIRC)"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS README TRANSLATORS
-}
diff --git a/media-sound/rosegarden/rosegarden-10.02_alpha2-r1.ebuild b/media-sound/rosegarden/rosegarden-10.02_alpha2-r1.ebuild
deleted file mode 100644
index 7467073fd56a..000000000000
--- a/media-sound/rosegarden/rosegarden-10.02_alpha2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.02_alpha2-r1.ebuild,v 1.1 2009/12/07 05:46:17 ssuominen Exp $
-
-EAPI=2
-inherit eutils fdo-mime multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="http://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-gui:4[qt3support]
-	media-libs/ladspa-sdk
-	x11-libs/libSM
-	app-misc/lirc
-	media-sound/jack-audio-connection-kit
-	media-libs/alsa-lib
-	media-libs/dssi
-	media-libs/liblo
-	media-libs/liblrdf
-	=sci-libs/fftw-3*
-	media-libs/libsamplerate[sndfile]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e 's:update-mime-database:true:g' Makefile.in || die
-
-	epatch "${FILESDIR}"/${P}-qt-4.6.0.patch
-}
-
-src_configure() {
-	local myconf
-	use debug && myconf="--enable-debug"
-
-	econf \
-		--with-qtdir=/usr \
-		--with-qtlibdir=/usr/$(get_libdir)/qt4 \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CONTRIBUTING README
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-10.02_beta.ebuild b/media-sound/rosegarden/rosegarden-10.02_beta.ebuild
index 2bcb976069a4..9fd0e1b4c508 100644
--- a/media-sound/rosegarden/rosegarden-10.02_beta.ebuild
+++ b/media-sound/rosegarden/rosegarden-10.02_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.02_beta.ebuild,v 1.2 2009/12/29 19:56:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.02_beta.ebuild,v 1.3 2009/12/29 20:03:26 ssuominen Exp $
 
 EAPI=2
 inherit fdo-mime multilib
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
 DEPEND="x11-libs/qt-gui:4[qt3support]