[proaudio] CLAM: =libclam-9999 and =NetworkEditor-9999 patch

[Natanael Olaiz <nolaiz@xxxxxxxxx>]

Hi,


Here is a patch for =media-libs/libclam-9999 (-r1) and
=media-sound/NetworkEditor-9999

I'm a CLAM developer since a few years, but I'm a pretty new using
Gentoo, so probably the ebuilds are not very good...  but at least: I
made libclam and NetworkEditor live ebuilds works!

See attached changelogs for the changes.


One of these days I'll check the release versions of the ebuilds, and
the SMSTools, Annotator, Voice2MIDI and chordata... Meanwhile, all
suggestions are welcome (I'm learning about the ebuilds and the portage
system).


And last but not least: thank you all for your work with the overlay!


Best regards,
Natanael.

Index: media-sound/NetworkEditor/NetworkEditor-9999.ebuild
===================================================================
--- media-sound/NetworkEditor/NetworkEditor-9999.ebuild	(revision 1853)
+++ media-sound/NetworkEditor/NetworkEditor-9999.ebuild	(working copy)
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI=2
 
-inherit subversion qt4
+inherit subversion
+#inherit qt4
 
 DESCRIPTION="CLAM's visual builder"
-HOMEPAGE="http://clam.iua.upf.edu/index.html";
+HOMEPAGE="http://clam-project.org";
 
 SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/${PN}";
+ESVN_REPO_URI="http://clam-project.org/clam/trunk/NetworkEditor";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,15 +19,15 @@
 IUSE=""
 RESTRICT="mirror"
 
-DEPEND="dev-util/scons
+RDEPEND="dev-util/scons
 	=media-libs/libclam-9999
  	|| ( ( x11-libs/qt-core x11-libs/qt-gui 
  		x11-libs/qt-xmlpatterns x11-libs/qt-opengl 
 		x11-libs/qt-svg )
  		>=x11-libs/qt-4:4 )"
 
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick"
+DEPEND="${RDEPEND}
+	media-gfx/imagemagick[png]"
 
 QTDIR=""
 
@@ -45,7 +46,7 @@
 	addpredict /usr/share/clam/sconstools
 
 	cd ${S}
-	scons clam_prefix=/usr DESTDIR="${D}/usr" install_prefix="${D}/usr" \
+	scons clam_prefix=/usr DESTDIR="${D}/usr" prefix_for_packaging="${D}/usr" \
 		qt_plugins_install_path="/lib/qt4/plugins/designer" || die "Build failed"
 	convert -resize 48x48 -colors 24 src/images/NetworkEditor-icon.png clam-networkeditor.xpm || die "convert NE icon failed"
 	convert -resize 48x48 -colors 24 src/images/Prototyper-icon.png clam-prototyper.xpm || die "convert P icon failed"
Index: media-sound/NetworkEditor/Manifest
===================================================================
--- media-sound/NetworkEditor/Manifest	(revision 1853)
+++ media-sound/NetworkEditor/Manifest	(working copy)
@@ -8,6 +8,6 @@
 EBUILD NetworkEditor-1.2.0.ebuild 1677 RMD160 a855507a63f4b3c7a99de36f636f037bdf38397a SHA1 ad074b7c637be9ab8c93a32bf8970e6e11cee45f SHA256 ee924205de59bac040fe3170bb75ac61375bbc8cc6f02ff673445c14ae17d272
 EBUILD NetworkEditor-1.3.0.ebuild 1680 RMD160 6cf4f7cabd3e9aa7d7ee11a988c2d5661494d076 SHA1 953b3e75d259e6f5fd9666067e4e593fa9361152 SHA256 14a693bb596cbd7d8592b3b7c99b0e9d4f0460983310b6c35d9af0c1192bb436
 EBUILD NetworkEditor-1.4.0.ebuild 1671 RMD160 d8b528c8fdbb3e6f579d51d251c6f8b38196cf96 SHA1 4cd769316bad007f9caa7e7931fe673071193590 SHA256 5b5e9198e722c74c0562c850824613324185713189acb11b3ed9253528f7c810
-EBUILD NetworkEditor-9999.ebuild 1673 RMD160 2e14fb553ba043a597dda2888673fa6dc59dc81f SHA1 0d8569533b2faffb7f4e1ae6d47bfa17a52f9a2a SHA256 70371b4c15822d7493c171a4c44606eee2d42610763e9c4287cab677da3cbc89
-MISC ChangeLog 935 RMD160 93fdaa1742ace97461cee180a7d86bba5143c775 SHA1 54528b14f6dcea2a5d53cad6f5262e0da1403cf8 SHA256 4c8615d3916db1dbdbeea72fcf606250db5a555ae5d5544bed858b51b331c152
+EBUILD NetworkEditor-9999.ebuild 1686 RMD160 d5cc0158d9f1094956049906e5a30ffadb6b43f4 SHA1 f9de777a0da470dca940aca1b797caf363a8a1ff SHA256 50e79a94487c674fd6997b1631d09cf32bb8a539d11874c9f994fecb96391149
+MISC ChangeLog 1092 RMD160 1a9c571b6aa8150eddfa4d34cedadd64241615c9 SHA1 13aeea985758eb2e5859ebce79e122432b5b9875 SHA256 2694b9c4a25793729603552555a0176842d00c29d04e655ed7bb2534ed1669b8
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Index: media-sound/NetworkEditor/ChangeLog
===================================================================
--- media-sound/NetworkEditor/ChangeLog	(revision 1853)
+++ media-sound/NetworkEditor/ChangeLog	(working copy)
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Jan 2011; Natanael Olaiz <nolaiz@xxxxxxxxx>;
+  NetworkEditor-9999.ebuild: 
+  fixed dependencies check (using EAPI2 now)
+  fixed URL for SVN repository
+
 *NetworkEditor-1.4.0 (05 Apr 2010)
 
   05 Apr 2010; Viktor Lazarev <taurus101v@xxxxxxxxx>
Index: media-libs/libclam/Manifest
===================================================================
--- media-libs/libclam/Manifest	(revision 1853)
+++ media-libs/libclam/Manifest	(working copy)
@@ -8,6 +8,6 @@
 EBUILD libclam-1.2.0.ebuild 3891 RMD160 a0f1c2b88bb68ed63da611b3430b6a2ca5079cc3 SHA1 867ef8b7c3de944d69a1948748cd14fc6dd03c19 SHA256 7414092b71f0cc628ede5be70dc44c8cab4387614299d1a68ef6001dd7a6473a
 EBUILD libclam-1.3.0.ebuild 3891 RMD160 a0f1c2b88bb68ed63da611b3430b6a2ca5079cc3 SHA1 867ef8b7c3de944d69a1948748cd14fc6dd03c19 SHA256 7414092b71f0cc628ede5be70dc44c8cab4387614299d1a68ef6001dd7a6473a
 EBUILD libclam-1.4.0.ebuild 4067 RMD160 02b1b7896778904101ade974c57ea3068842111b SHA1 5ac064fa253e4ae2d6b93c6e3e99401fec87161b SHA256 1d55e15ed8f0c71faad55f51a03c23d2130f6102099a70012553197cf47dcfc2
-EBUILD libclam-9999-r1.ebuild 3760 RMD160 838c20c4d6fd8a3c307ff9ca3ede48f2917b9e87 SHA1 4102637e7ac1959afac854f9b99e9067c0081665 SHA256 bbb9cda3628c119ba6f8fc7c4c404dc2002530d2c67e92592d6c9bfaecbae2fe
-MISC ChangeLog 1385 RMD160 be91597be887a4276f0c75ab4429479c11cab928 SHA1 32b0614fc11b0d6104a42d4262ad6c98b9001bec SHA256 844e75ffeabdeb75e596092be08065c8ba902f9a0e85f805e494904930de5533
+EBUILD libclam-9999.ebuild 2683 RMD160 acc1362fb6015821e8690451b7ac3b69a7aa29e0 SHA1 78126e6df23dbfc5fb2a24bc3e361fec8b35b400 SHA256 ffb28c76b97a398f8a6a3353f0ac25d1bad87053c231063d0be8d5552a571a1a
+MISC ChangeLog 1805 RMD160 afdd665f8639ed85c0b8028052ed2e651888cda4 SHA1 951840bdc97ceca4f4bdd73fab407550e2569066 SHA256 18fc6da5f355bd3e352b9b92f88fe9c25e27c80eb0bd774ae6c4a8e444d38072
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Index: media-libs/libclam/ChangeLog
===================================================================
--- media-libs/libclam/ChangeLog	(revision 1853)
+++ media-libs/libclam/ChangeLog	(working copy)
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Jan 2011; Natanael Olaiz <nolaiz@xxxxxxxxx> +libclam-9999.ebuild:
+  Added (replacement of libclam-9999-r1). Changes: URL corrected. 
+  Fixed dependencies, examples installation, bad paths and compilation
+  flags. Removed non-existing examples and added new ones.
+
+  20 Jan 2011; Natanael Olaiz <nolaiz@xxxxxxxxx> -libclam-9999-r1.ebuild:
+  Removed (renamed to libclam-9999, now compatible with NetworkEditor-9999)
+
   09 Oct 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> libclam-1.4.0.ebuild:
   Set xmlpp as default XML backend
 
Index: media-libs/libclam/libclam-9999-r1.ebuild
===================================================================
--- media-libs/libclam/libclam-9999-r1.ebuild	(revision 1853)
+++ media-libs/libclam/libclam-9999-r1.ebuild	(working copy)
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit subversion
-#scons-ccache
-
-DESCRIPTION="Framework for research and application development in the Audio and Music domain"
-HOMEPAGE="http://clam.iua.upf.edu/index.html";
-
-MY_PN="CLAM"
-
-SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/CLAM";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc double jack ladspa osc fftw fft alsa qt3 sndfile vorbis mad id3 portaudio"
-RESTRICT="mirror"
-
-DEPEND="dev-util/scons
-	ladspa? ( media-libs/ladspa-sdk )
-	>=dev-libs/xerces-c-2.7
-	fftw? ( =sci-libs/fftw-3* )
-	virtual/opengl
-	x11-libs/fltk
-	jack? ( media-sound/jack-audio-connection-kit )
-	vorbis? ( media-libs/libvorbis
-	    media-libs/libogg )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	id3? ( media-libs/id3lib )
-	portaudio? ( =media-libs/portaudio-19* )
-	media-libs/jpeg
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	qt3? ( =x11-libs/qt-3* )
-	app-doc/doxygen
-	dev-util/cppunit
-	osc? ( media-libs/oscpack )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	# required for scons to "see" intermediate install location
-	mkdir -p "${D}"/usr
-
-	cd "${S}"/scons/libs
-
-	local myconf="DESTDIR=${D}/usr prefix=/usr install_prefix=${D}/usr"
-	if use double; then
-	    myconf="${myconf} double=yes"
-	fi
-	if ! use ladspa; then
-	    myconf="${myconf} with_ladspa_support=no"
-	fi
-	if use osc; then
-	    myconf="${myconf} with_osc_support=yes"
-	fi
-	if ! use jack; then
-	    myconf="${myconf} with_jack_support=no"
-	fi
-	if ! use fftw; then
-	    myconf="${myconf} with_fftw=no"
-	    else
-		myconf="${myconf} with_fftw=no with_fftw3=yes"
-	fi
-	if ! use fft; then
-	    myconf="${myconf} with_nr_fft=no"
-	fi
-	if ! use sndfile; then
-	    myconf="${myconf} with_sndfile=no"
-	fi
-	if ! use vorbis; then
-	    myconf="${myconf} with_oggvorbis=no"
-	fi
-	if ! use mad; then
-	    myconf="${myconf} with_mad=no"
-	fi
-	if ! use id3; then
-	    myconf="${myconf} with_id3=no"
-	fi
-	if ! use portaudio; then
-	    myconf="${myconf} with_portaudio=no"
-	fi
-	if ! use alsa; then
-	    myconf="${myconf} with_alsa=no"
-	fi
-	scons configure ${myconf} KSI=0 || die "configuration failed"
-	scons --help configure
-	scons || die "compilation failed"
-}
-
-src_install() {
-	cd "${S}"/scons/libs
-	dodir /usr
-
-	scons install || die "scons install failed"
-	cd "${S}"
-	dodoc CHANGES
-
-	if use doc; then
-		docinto examples/CLAMRemoteController
-		dodoc "${S}"/examples/CLAMRemoteController/*
-		docinto examples/CLT
-		dodoc "${S}"/examples/CLT/*
-		docinto examples/ControlArrayExamples
-		dodoc "${S}"/examples/ControlArrayExamples/*
-		docinto examples/MIDI_Synthesizer_example
-		dodoc "${S}"/examples/MIDI_Synthesizer_example/*
-		docinto examples/NetworkLADSPAPlugin
-		dodoc "${S}"/examples/NetworkLADSPAPlugin/*
-		docinto examples/PortsAndControlsUsageExample
-		dodoc "${S}"/examples/PortsAndControlsUsageExample/*
-		docinto examples/PortsExamples
-		dodoc "${S}"/examples/PortsExamples/*
-#		docinto examples/QtDesignerPlugins
-#		dodoc "${S}"/examples/QtDesignerPlugins/*
-		docinto examples/QtPlots/BPFEditorExample
-		dodoc "${S}"/examples/QtPlots/BPFEditorExample/*
-		docinto examples/QtPlots/DirectPlotsExamples
-		dodoc "${S}"/examples/QtPlots/DirectPlotsExamples/*
-		docinto examples/QtPlots/ListPlotExample
-		dodoc "${S}"/examples/QtPlots/ListPlotExample/*
-		docinto examples/QtPlots/QtPlotsExamples
-		dodoc "${S}"/examples/QtPlots/QtPlotsExamples/*
-		docinto examples/QtPlots/SegmentEditorExample
-		dodoc "${S}"/examples/QtPlots/SegmentEditorExample/*
-		docinto examples/QtPlots/utils
-		dodoc "${S}"/examples/QtPlots/utils/*
-		docinto examples/Tutorial
-		dodoc "${S}"/examples/Tutorial/*
-	fi
-}
Index: media-libs/libclam/libclam-9999.ebuild
===================================================================
--- media-libs/libclam/libclam-9999.ebuild	(revision 1850)
+++ media-libs/libclam/libclam-9999.ebuild	(working copy)
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,22 +6,24 @@
 #scons-ccache
 
 DESCRIPTION="Framework for research and application development in the Audio and Music domain"
-HOMEPAGE="http://clam.iua.upf.edu/index.html";
+HOMEPAGE="http://clam-project.org/index.html";
 
 MY_PN="CLAM"
 
 SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/CLAM";
+ESVN_REPO_URI="http://clam-project.org/clam/trunk/CLAM";
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc double jack ladspa osc fftw fft alsa qt3 sndfile vorbis mad id3 portaudio"
+IUSE="doc double jack ladspa fftw fft alsa sndfile vorbis mad id3 portaudio xercesc lv2"
 RESTRICT="mirror"
 
 DEPEND="dev-util/scons
 	ladspa? ( media-libs/ladspa-sdk )
-	>=dev-libs/xerces-c-2.7
+	lv2? ( media-libs/lv2core )
+	xercesc? ( >=dev-libs/xerces-c-3.1 )
+	!xercesc? ( dev-cpp/libxmlpp )
 	fftw? ( =sci-libs/fftw-3* )
 	virtual/opengl
 	x11-libs/fltk
@@ -38,10 +40,9 @@
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXi
-	qt3? ( =x11-libs/qt-3* )
 	app-doc/doxygen
 	dev-util/cppunit
-	osc? ( media-libs/oscpack )"
+	"
 
 RDEPEND="${DEPEND}"
 
@@ -51,20 +52,20 @@
 	# required for scons to "see" intermediate install location
 	mkdir -p "${D}"/usr
 
-	cd "${S}"/scons/libs
+	cd "${S}"
 
-	local myconf="DESTDIR=${D}/usr prefix=/usr install_prefix=${D}/usr"
+	local myconf="DESTDIR=${D}/usr prefix=/usr prefix_for_packaging=${D}/usr"
 	if use double; then
 	    myconf="${myconf} double=yes"
 	fi
 	if ! use ladspa; then
-	    myconf="${myconf} with_ladspa_support=no"
+	    myconf="${myconf} with_ladspa=no"
 	fi
-	if use osc; then
-	    myconf="${myconf} with_osc_support=yes"
+	if ! use lv2; then
+	    myconf="${myconf} with_lv2=no"
 	fi
 	if ! use jack; then
-	    myconf="${myconf} with_jack_support=no"
+	    myconf="${myconf} with_jack=no"
 	fi
 	if ! use fftw; then
 	    myconf="${myconf} with_fftw=no"
@@ -92,13 +93,19 @@
 	if ! use alsa; then
 	    myconf="${myconf} with_alsa=no"
 	fi
+	if ! use xercesc; then
+		myconf="${myconf} xmlbackend=xercesc"
+		else
+		myconf="${myconf} xmlbackend=xmlpp"
+	fi
+		
 	scons configure ${myconf} KSI=0 || die "configuration failed"
 	scons --help configure
 	scons || die "compilation failed"
 }
 
 src_install() {
-	cd "${S}"/scons/libs
+	cd "${S}"
 	dodir /usr
 
 	scons install || die "scons install failed"
@@ -106,35 +113,9 @@
 	dodoc CHANGES
 
 	if use doc; then
-		docinto examples/CLAMRemoteController
-		dodoc "${S}"/examples/CLAMRemoteController/*
-		docinto examples/CLT
-		dodoc "${S}"/examples/CLT/*
-		docinto examples/ControlArrayExamples
-		dodoc "${S}"/examples/ControlArrayExamples/*
-		docinto examples/MIDI_Synthesizer_example
-		dodoc "${S}"/examples/MIDI_Synthesizer_example/*
-		docinto examples/NetworkLADSPAPlugin
-		dodoc "${S}"/examples/NetworkLADSPAPlugin/*
-		docinto examples/PortsAndControlsUsageExample
-		dodoc "${S}"/examples/PortsAndControlsUsageExample/*
-		docinto examples/PortsExamples
-		dodoc "${S}"/examples/PortsExamples/*
-#		docinto examples/QtDesignerPlugins
-#		dodoc "${S}"/examples/QtDesignerPlugins/*
-		docinto examples/QtPlots/BPFEditorExample
-		dodoc "${S}"/examples/QtPlots/BPFEditorExample/*
-		docinto examples/QtPlots/DirectPlotsExamples
-		dodoc "${S}"/examples/QtPlots/DirectPlotsExamples/*
-		docinto examples/QtPlots/ListPlotExample
-		dodoc "${S}"/examples/QtPlots/ListPlotExample/*
-		docinto examples/QtPlots/QtPlotsExamples
-		dodoc "${S}"/examples/QtPlots/QtPlotsExamples/*
-		docinto examples/QtPlots/SegmentEditorExample
-		dodoc "${S}"/examples/QtPlots/SegmentEditorExample/*
-		docinto examples/QtPlots/utils
-		dodoc "${S}"/examples/QtPlots/utils/*
-		docinto examples/Tutorial
-		dodoc "${S}"/examples/Tutorial/*
+		find examples/ -type d | grep -v .svn | while read dir; do
+			docinto "${dir}"
+			dodoc "${S}/${dir}"/*
+		done
 	fi
 }