[proaudio] [1745] libclam: added 'xercesc' & 'xmlpp' USE-flags and removed 'sndfile' one.

[subversion@xxxxxxxxxxxxx]

Revision: 1745
Author:   gentoid
Date:     2010-09-03 23:47:55 +0200 (Fri, 03 Sep 2010)
Log Message:
-----------
libclam: added 'xercesc' & 'xmlpp' USE-flags and removed 'sndfile' one. Libsndfile is hard-depend now, otherwise compile fails.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libclam/ChangeLog
    trunk/overlays/proaudio/media-libs/libclam/Manifest
    trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild

Modified: trunk/overlays/proaudio/media-libs/libclam/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/ChangeLog	2010-09-02 19:55:53 UTC (rev 1744)
+++ trunk/overlays/proaudio/media-libs/libclam/ChangeLog	2010-09-03 21:47:55 UTC (rev 1745)
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Sep 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> libclam-1.4.0.ebuild:
+  Added 'xercesc' & 'xmlpp' USE-flags and removed 'sndfile' one. Libsndfile
+  is hard-depend now, otherwise compile fails.
+
   16 Jun 2010; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
   libclam-1.0.0-r1.ebuild, libclam-1.1.0.ebuild, libclam-1.2.0.ebuild,
   libclam-1.3.0.ebuild, libclam-1.4.0.ebuild, libclam-9999-r1.ebuild:

Modified: trunk/overlays/proaudio/media-libs/libclam/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/Manifest	2010-09-02 19:55:53 UTC (rev 1744)
+++ trunk/overlays/proaudio/media-libs/libclam/Manifest	2010-09-03 21:47:55 UTC (rev 1745)
@@ -7,7 +7,7 @@
 EBUILD libclam-1.1.0.ebuild 3080 RMD160 bbfd124c48210ec86ce4f73972cccd79b95290a2 SHA1 35baa9b756cdf744f6fe5ed510156398b8b5edff SHA256 ef019d67f3d26090467d111a51baf2e349b29bf5b9bad9c7076dd43617a52233
 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 3951 RMD160 3c6b8ac88b8663df0bc155f7a7c9cadbca59b0d9 SHA1 83765405b8b54911c6e42b81b12b84823e03a947 SHA256 b546c548b3d9b072b193af019a7bbd20a151615a7bc6cab5960a9688ee3e2238
+EBUILD libclam-1.4.0.ebuild 4167 RMD160 4aa612629a1365f47d99556b8096ed5fa07dc961 SHA1 dbc15ffca4fade2d48d8ad97d92520d2e68b2fde SHA256 6dd25e3b967892243510e84a7da6b60ff39c1a75ab31083f9f905241b0017cb6
 EBUILD libclam-9999-r1.ebuild 3760 RMD160 838c20c4d6fd8a3c307ff9ca3ede48f2917b9e87 SHA1 4102637e7ac1959afac854f9b99e9067c0081665 SHA256 bbb9cda3628c119ba6f8fc7c4c404dc2002530d2c67e92592d6c9bfaecbae2fe
-MISC ChangeLog 1075 RMD160 b9985156f82ea37f73cdaa55a6a99eb374bed042 SHA1 8b2e3c42171755b45e51a60901103e226565751a SHA256 9fc46fa428e29b49a48d572b8097f834c447936045d676d5ac1b125361406a4a
+MISC ChangeLog 1274 RMD160 73b2f99f86e6e8283fa0e8f4ec4f6fb89ed55835 SHA1 b3cf84d9e0a6e93a39405bd3e10a3caad4910cf8 SHA256 8f267f4765e5017e3f0de3d28536f8351e10393844458b2853c62d5b4b7e1aad
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild	2010-09-02 19:55:53 UTC (rev 1744)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild	2010-09-03 21:47:55 UTC (rev 1745)
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="2"
 
-inherit eutils qt4
+inherit eutils qt4-r2
 
 DESCRIPTION="Framework for research and application development in the Audio and Music domain"
 HOMEPAGE="http://clam-project.org/";
@@ -17,37 +17,40 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc double jack ladspa osc fftw fft alsa optimize sndfile vorbis mad portaudio"
+IUSE="doc double jack ladspa osc fftw fft alsa optimize +sndfile vorbis mad
+portaudio +xercesc xmlpp"
 # portmidi"
 
 RESTRICT="mirror"
 
-DEPEND=">=dev-util/scons-0.96.92
-	ladspa? ( media-libs/ladspa-sdk )
-	=dev-libs/xerces-c-2.8*
-	fftw? ( =sci-libs/fftw-3* )
+RDEPEND="
+	dev-util/cppunit
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/libsndfile
 	virtual/opengl
 	x11-libs/fltk
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/qt-gui:4
+	ladspa? ( media-libs/ladspa-sdk )
+	xercesc? ( <dev-libs/xerces-c-3 )
+	xmlpp? ( dev-cpp/libxmlpp:2.6 )
+	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	vorbis? ( media-libs/libvorbis
-	    media-libs/libogg )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	mad? ( media-libs/id3lib )
-	portaudio? ( =media-libs/portaudio-19* )
-	media-libs/jpeg
+			  media-libs/libogg )
+	mad? ( media-libs/libmad
+		   media-libs/id3lib )
+	media-libs/libsndfile
+	portaudio? ( >=media-libs/portaudio-19 )
 	alsa? ( media-libs/alsa-lib )
-	media-libs/libpng
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	|| ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl )
-			>=x11-libs/qt-4.4:4 )
-	app-doc/doxygen
-	dev-util/cppunit
 	osc? ( media-libs/oscpack )"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	app-doc/doxygen"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -101,6 +104,19 @@
 	if ! use alsa; then
 	    myconf="${myconf} with_alsa=no"
 	fi
+	if use xercesc; then
+		if use xmlpp; then
+			myconf+=" xmlbackend=both"
+		else
+			myconf+=" xmlbackend=xercesc"
+		fi
+	else
+		if use xmlpp; then
+			myconf+=" xmlbackend=xmlpp"
+		else
+			myconf+=" xmlbackend=none"
+		fi
+	fi
 	scons configure ${myconf} || die "configuration failed"
 	scons --help
 	scons || die "compilation failed"