[proaudio] [2147] various fixes in Voice2MIDI

[subversion@xxxxxxxxxxxxx]

Revision: 2147
Author:   dominique
Date:     2012-06-17 16:19:13 +0200 (Sun, 17 Jun 2012)
Log Message:
-----------
various fixes in Voice2MIDI

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog
    trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest
    trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild
    trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog	2012-06-17 13:50:33 UTC (rev 2146)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog	2012-06-17 14:19:13 UTC (rev 2147)
@@ -2,8 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  17 Jun 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
-  Voice2MIDI-9999.ebuild: fixed livclam DEPEND
+  17+18 Jun 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  Voice2MIDI-9999.ebuild: fixed libclam DEPEND + new URI
+  9999 + 0.3.8: fixed python setup
 
   20 Jan 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
   Voice2MIDI-0.3.6-r1.ebuild, Voice2MIDI-0.3.7.ebuild, Voice2MIDI-0.3.8.ebuild,

Modified: trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest	2012-06-17 13:50:33 UTC (rev 2146)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest	2012-06-17 14:19:13 UTC (rev 2147)
@@ -5,7 +5,7 @@
 EBUILD Voice2MIDI-0.3.10.ebuild 1662 RMD160 ddda98252b80c3770ebe94686d9188ebdd481a91 SHA1 83dab7e5ca6b5ded07a5bbbad06da160337fe5cd SHA256 c4811f0b060e12e5e5f75a4443f40954fa2ab2a3f99cbbbd8367bd20a40e5fa7
 EBUILD Voice2MIDI-0.3.6-r1.ebuild 1038 RMD160 7a28609df5ccd7248b0d779bcc6375c46a9f5c36 SHA1 150245824d76bb8babcf958624236f703308281a SHA256 8015829c16217b93038d97c211d0101bc8fad88b15a18271eb1e42c923804933
 EBUILD Voice2MIDI-0.3.7.ebuild 1658 RMD160 257be23d81fe14ce514c187603acc10656454638 SHA1 37d3283b7ac855d4284f16cf9dc24be0bbde5f49 SHA256 6cb15c2bd599b0d8552263309c21f9b995532edd0d5a1212f4591c280bc23609
-EBUILD Voice2MIDI-0.3.8.ebuild 1662 RMD160 4da36a83f1eb1af21cd9f286251598d38f018129 SHA1 0779eb2837c251f647a0004db62a73d51ca9b3e1 SHA256 7f85610dc5fdcec8789ccc63e109e33cc36e6fe57c98ad52379ff1600f13cdd5
-EBUILD Voice2MIDI-9999.ebuild 1657 RMD160 22f08071f2ebd503850c1927ca29dd3bf9ddaf9d SHA1 52754821866a88f89027a9cedf2501327b71d2cd SHA256 34a52c33f1762e18feb0afae8bfa2aaad52f2455247121cec54ea5233ac4c734
-MISC ChangeLog 915 RMD160 55c132d94a52e20cd6c32e406a299ffa825d22cd SHA1 7e10cc37d61d98b8cce5ba9a2850a3464d0f14b2 SHA256 2c9db15faf262ac4d7be8588b6a98b69867c46d2495846612a8b34eec74110c1
+EBUILD Voice2MIDI-0.3.8.ebuild 1720 RMD160 9015cad209d4e0a7bc9c33ac2f5bcfc52bd23956 SHA1 b422bab1d108acf66ef3db931849b61d02e1755b SHA256 62d621f1c2f09873933a69c7c97c841ab6d552345490e4292a0055a88231c4a2
+EBUILD Voice2MIDI-9999.ebuild 1834 RMD160 987ac3c287324da36ea75a386a0add0bb729678c SHA1 f4dbc878c48f3bb26b77e80bc8f39cd10b73b1d8 SHA256 a39cc76d77d13f69816e1eaffbcd822e88bf6ad599c23075b8646a1aad470727
+MISC ChangeLog 963 RMD160 a2e35ba276e800223d73124190e993aa8ea45727 SHA1 266792e34c7d7d8908bbdf87d27822ed47f7d0b0 SHA256 5b14d7aa57764325b0dac07d61629485696a510fcbe6ebb51f23c5de4c897a08
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild	2012-06-17 13:50:33 UTC (rev 2146)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild	2012-06-17 14:19:13 UTC (rev 2147)
@@ -4,7 +4,7 @@
 
 EAPI=1
 
-inherit eutils qt4
+inherit eutils python qt4
 
 DESCRIPTION="CLAM Voice2MIDI extracts the melody as a MIDI or XML file from monophonic audio files"
 HOMEPAGE="http://clam-project.org/index.html";
@@ -17,6 +17,8 @@
 IUSE=""
 RESTRICT="mirror"
 
+PYTHON_DEPEND="2:7"
+
 DEPEND="dev-util/scons
 	>=media-libs/libclam-1.2.0
 	<media-libs/libclam-9999
@@ -37,6 +39,8 @@
 		eerror "You need to build qt4 with qt3support support to have it in ${PN}"
 		die "Enabling qt3support for $PN requires qt4 to be built with qt3support support"
 	fi
+
+	python_set_active_version 2
 }
 
 src_compile() {

Modified: trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-9999.ebuild	2012-06-17 13:50:33 UTC (rev 2146)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-9999.ebuild	2012-06-17 14:19:13 UTC (rev 2147)
@@ -4,13 +4,14 @@
 
 EAPI=1
 
-inherit eutils subversion
+inherit eutils python subversion qt4
 
 DESCRIPTION="CLAM Voice2MIDI extracts the melody as a MIDI or XML file from monophonic audio files"
 HOMEPAGE="http://clam-project.org/index.html";
 
 SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/Voice2MIDI";
+ESVN_REPO_URI="http://clam-project.org/clam/trunk";
+ESVN_PROJECT="clam"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,16 +19,23 @@
 IUSE=""
 RESTRICT="mirror"
 
+PYTHON_DEPEND="2:7"
+
 DEPEND="dev-util/scons
 	>=media-libs/libclam-9999
  	|| ( ( x11-libs/qt-core x11-libs/qt-gui 
- 		x11-libs/qt-qt3support x11-libs/qt-opengl )
+ 		x11-libs/qt-xmlpatterns x11-libs/qt-opengl
+ 		x11-libs/qt-svg )
  		>=x11-libs/qt-4:4 )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
 
-S="${WORKDIR}/Voice2MIDI"
+QTDIR=""
 
+S="${WORKDIR}/${PN}"
+MY_S="${S}/${PN}"
+
 pkg_setup() {
 	if ! has_version x11-libs/qt-opengl && ! built_with_use =x11-libs/qt-4* opengl; then
 		eerror "You need to build qt4 with opengl support to have it in ${PN}"
@@ -37,20 +45,25 @@
 		eerror "You need to build qt4 with qt3support support to have it in ${PN}"
 		die "Enabling qt3support for $PN requires qt4 to be built with qt3support support"
 	fi
+
+	python_set_active_version 2
 }
 
+src_unpack() {
+	subversion_src_unpack
+}
 
 src_compile() {
 	# required for scons to "see" intermediate install location
 	mkdir -p ${D}/usr
 	addpredict /usr/share/clam/sconstools
 
-	cd ${S}
-	scons clam_prefix=/usr DESTDIR="${D}/usr" install_prefix="${D}/usr" release=yes || die "Build failed"
+	cd ${MY_S} || die
+	scons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" release=yes || die "Build failed"
 }
 
 src_install() {
-	cd ${S}
+	cd ${MY_S}
 	dodir /usr
 	addpredict /usr/share/clam/sconstools