Version bump.

Package-Manager: portage-2.1.3.19

6 files changed, 178 insertions, 5 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 8e473597ecf0..c82361ca6604 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.47 2007/07/02 15:18:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.48 2007/12/23 12:56:26 carlo Exp $
+
+*rosegarden-1.6.1 (23 Dec 2007)
+
+  23 Dec 2007; Carsten Lohrke <carlo@gentoo.org>
+  +files/rosegarden-1.6.1-asneeded.patch,
+  +files/rosegarden-1.6.1.desktop.diff, +rosegarden-1.6.1.ebuild:
+  Version bump.
 
   02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Hand to newly-born proaudio herd.
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index c198c56de46c..45462b64e1fe 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -2,9 +2,18 @@ AUX rosegarden-1.5.1-asneeded.patch 834 RMD160 bdd1e4177c631d093edb0b52341d3f131
 MD5 e872c00f821c86f46f5f6217cda6f295 files/rosegarden-1.5.1-asneeded.patch 834
 RMD160 bdd1e4177c631d093edb0b52341d3f13122844fd files/rosegarden-1.5.1-asneeded.patch 834
 SHA256 be83e291c7d3378542170450b2902ffe288efeddabcf54d4a1653a4fef8098d6 files/rosegarden-1.5.1-asneeded.patch 834
+AUX rosegarden-1.6.1-asneeded.patch 1021 RMD160 e4ad1f3cc6edc15dcada9b5801d40f09ad358d82 SHA1 b5f1fb6063716376679f82fb7461de5fea3d8398 SHA256 40a1297b6cc982a193a8c639451ca04e05c6c9978aabee6fb549293a531e4129
+MD5 efd977d2dcb4b27204c53ddc4def10ce files/rosegarden-1.6.1-asneeded.patch 1021
+RMD160 e4ad1f3cc6edc15dcada9b5801d40f09ad358d82 files/rosegarden-1.6.1-asneeded.patch 1021
+SHA256 40a1297b6cc982a193a8c639451ca04e05c6c9978aabee6fb549293a531e4129 files/rosegarden-1.6.1-asneeded.patch 1021
+AUX rosegarden-1.6.1.desktop.diff 617 RMD160 c86918100fbec8962e46d17d8c943ab0e65218c6 SHA1 a70562ad84dd6666731049b907da704b59e115da SHA256 70a1e0151db9bc5374e46ebbf90dc0e12cfb14ae5fdfbcd80f5d4b1ab4437785
+MD5 c558c43fec3b56d5038d215188c11e36 files/rosegarden-1.6.1.desktop.diff 617
+RMD160 c86918100fbec8962e46d17d8c943ab0e65218c6 files/rosegarden-1.6.1.desktop.diff 617
+SHA256 70a1e0151db9bc5374e46ebbf90dc0e12cfb14ae5fdfbcd80f5d4b1ab4437785 files/rosegarden-1.6.1.desktop.diff 617
 DIST rosegarden-1.2.4.tar.bz2 5422509 RMD160 71849d9a2491b146d7cc5e32ca1d4d5b1febd974 SHA1 ac788ebd5e8cb439643a4238fe808d752481fc83 SHA256 104f9590a10cf74182806f64a4daab24893d0ac45d166da12396354cf0067879
 DIST rosegarden-1.4.0.tar.bz2 6052571 RMD160 6f21b6b3d7bcfde02372a50f527a68901e8df376 SHA1 60382f50c728a4b41f5d9e5e6a0780111b8ccb2f SHA256 1e35a229f64e31b9ae1ec9bc20095010db5c9c464faf292ef4c1b79f5a9de2ca
 DIST rosegarden-1.5.1.tar.bz2 6137509 RMD160 dfddce14494fe0a8bdd89e08eb84929a899ea687 SHA1 59b387ca936fe315db234487556f7f0f23c748f4 SHA256 bac5c3e6af0bbf3fa950a5b155591e13460717c32c14a9f841a9bef699f123ae
+DIST rosegarden-1.6.1.tar.bz2 6952370 RMD160 0efd9dea8719dcaaadef36843d66532dd3c88b71 SHA1 8af8f778c59c794e06c3ee34e9fc5efb7746bc7b SHA256 3375f3ffd409b9270f6de03aa39537e9a8477d181825b732abfe72204fec28ce
 EBUILD rosegarden-1.2.4.ebuild 1320 RMD160 31779c14af4caca6dcec9eef8444b5390cb503d8 SHA1 d9911968123810e27e1c1c68dc286e2e99ad5929 SHA256 a102b6ceec12d12345a4053034b702c7b1e2050dde7c0772b45d8ec248b8a3a3
 MD5 55a431cdc50f2de3504723824ea1ca53 rosegarden-1.2.4.ebuild 1320
 RMD160 31779c14af4caca6dcec9eef8444b5390cb503d8 rosegarden-1.2.4.ebuild 1320
@@ -17,10 +26,14 @@ EBUILD rosegarden-1.5.1.ebuild 2262 RMD160 caa755043d30e11c464eb8e1df89d1c8847a4
 MD5 1572603529e2732f3d3c036bd4766b30 rosegarden-1.5.1.ebuild 2262
 RMD160 caa755043d30e11c464eb8e1df89d1c8847a4370 rosegarden-1.5.1.ebuild 2262
 SHA256 4efedfb9bcd37e9ccef88bb6b883d6a7369d780b9ffcf48b7d57edb5bc04d40a rosegarden-1.5.1.ebuild 2262
-MISC ChangeLog 7570 RMD160 a1e3048848e236dc5f510bc182298b8484bea3c2 SHA1 6d93dacb49e76c5bf101a6f7cc2a20025c98599f SHA256 3e91744dfdfbf41f77da3f323a1f6ac88c6f6777e75e85c816f89f9666eeee34
-MD5 2d6adce90b9197433e978fd2aa201dac ChangeLog 7570
-RMD160 a1e3048848e236dc5f510bc182298b8484bea3c2 ChangeLog 7570
-SHA256 3e91744dfdfbf41f77da3f323a1f6ac88c6f6777e75e85c816f89f9666eeee34 ChangeLog 7570
+EBUILD rosegarden-1.6.1.ebuild 2327 RMD160 e4451711c8a354b06847adf32ae0f1657c858168 SHA1 2cc8013308095637bad29013dc604588704ce56c SHA256 f94255aa26ba95dc72c40dabdf64970024abe5d21e98fe7b039637748b22804a
+MD5 f41d961e9cccb84a76fd899834016107 rosegarden-1.6.1.ebuild 2327
+RMD160 e4451711c8a354b06847adf32ae0f1657c858168 rosegarden-1.6.1.ebuild 2327
+SHA256 f94255aa26ba95dc72c40dabdf64970024abe5d21e98fe7b039637748b22804a rosegarden-1.6.1.ebuild 2327
+MISC ChangeLog 7773 RMD160 88033bcdb549999b52fe0448c3c3400d41464782 SHA1 5c13c3d95d860690015baa6ab208ea0f084f6e20 SHA256 756ea69f98b1b6e2a0749047a525c04f1606e1cbde707c6be6b6b06761871f67
+MD5 b9a6a82a263b62530097caf7e4419103 ChangeLog 7773
+RMD160 88033bcdb549999b52fe0448c3c3400d41464782 ChangeLog 7773
+SHA256 756ea69f98b1b6e2a0749047a525c04f1606e1cbde707c6be6b6b06761871f67 ChangeLog 7773
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
@@ -34,3 +47,6 @@ SHA256 22b5feba3e8d28f934ce73539ffc7ce69738679369a8d79e99421a7dee1e429c files/di
 MD5 f04ccaf10707dd0c42d7d307c4ede610 files/digest-rosegarden-1.5.1 256
 RMD160 a5f30cb850efc22e15c2ec728472421bebe1c6bf files/digest-rosegarden-1.5.1 256
 SHA256 7c940bccb9f4acef0013ec9d9f9963e6c72ee04bfc895bbdbbb075d1c7d1adee files/digest-rosegarden-1.5.1 256
+MD5 250b2996e76c1a5e90026ebc8d254fa9 files/digest-rosegarden-1.6.1 256
+RMD160 53d636148e628933bcaa9a836268516f12d26358 files/digest-rosegarden-1.6.1 256
+SHA256 cd753de8cd8b318f6fc77d41033539b54684cc8da0252dcd3996183df63e1b00 files/digest-rosegarden-1.6.1 256
diff --git a/media-sound/rosegarden/files/digest-rosegarden-1.6.1 b/media-sound/rosegarden/files/digest-rosegarden-1.6.1
new file mode 100644
index 000000000000..110454472014
--- /dev/null
+++ b/media-sound/rosegarden/files/digest-rosegarden-1.6.1
@@ -0,0 +1,3 @@
+MD5 60efd0d0afcb3632d8188ef25082bcf9 rosegarden-1.6.1.tar.bz2 6952370
+RMD160 0efd9dea8719dcaaadef36843d66532dd3c88b71 rosegarden-1.6.1.tar.bz2 6952370
+SHA256 3375f3ffd409b9270f6de03aa39537e9a8477d181825b732abfe72204fec28ce rosegarden-1.6.1.tar.bz2 6952370
diff --git a/media-sound/rosegarden/files/rosegarden-1.6.1-asneeded.patch b/media-sound/rosegarden/files/rosegarden-1.6.1-asneeded.patch
new file mode 100644
index 000000000000..d26278837412
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-1.6.1-asneeded.patch
@@ -0,0 +1,46 @@
+--- 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
new file mode 100644
index 000000000000..45ff852877e5
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-1.6.1.desktop.diff
@@ -0,0 +1,16 @@
+--- ./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/rosegarden-1.6.1.ebuild b/media-sound/rosegarden/rosegarden-1.6.1.ebuild
new file mode 100644
index 000000000000..9b01b677cab0
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-1.6.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-1.6.1.ebuild,v 1.1 2007/12/23 12:56:26 carlo Exp $
+
+inherit eutils kde-functions
+
+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 jack dssi lirc debug"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0
+		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
+
+LANGS="ca cs cy de en_GB en es et eu fi fr it ja nl pl ru sv zh_CN"
+
+for lang in $LANGS; do
+	IUSE="${IUSE} linguas_$lang"
+done
+
+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
+
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build Rose Garden with ALSA support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/rosegarden-1.6.1-asneeded.patch" \
+		"${FILESDIR}/rosegarden-1.6.1.desktop.diff"
+}
+
+src_compile() {
+	local myconf=""
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+		-DWANT_DEBUG="$(! use debug; echo "$?")" \
+		-DWANT_FULLDBG="$(! use debug; echo "$?")" \
+		-DWANT_SOUND="$(! use alsa; echo "$?")" \
+		-DWANT_JACK="$(! use jack; echo "$?")" \
+		-DWANT_DSSI="$(! use dssi; echo "$?")" \
+		-DWANT_LIRC="$(! use lirc; echo "$?")" \
+		|| die "cmake failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" languages="$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))" || die "emake install failed"
+	dodoc ChangeLog AUTHORS README TRANSLATORS
+}