Re: [proaudio] [2160] depend on lv2core or >=lv2-1.0.0

[Natanael Olaiz <nolaiz@xxxxxxxxx>]

Patches for the same lv2 mess. I stil have two dependency problems, 
solved by this patch.


- media-libs/lilv. lv2 vs lv2core collision

(media-libs/lv2-1.0.0::gentoo, ebuild scheduled for merge) pulled in by
    media-libs/lv2 required by (media-libs/sratom-0.2.0::gentoo, ebuild 
scheduled for merge)
    media-libs/lv2 required by (media-plugins/mda-lv2-1.0.0::gentoo, 
installed)
    media-libs/lv2 required by 
(media-sound/linuxsampler-9999::proaudio, installed)

  (media-libs/lv2core-6.0::gentoo, installed) pulled in by
    >=media-libs/lv2core-6 required by (media-libs/lilv-9999::proaudio, 
ebuild scheduled for merge)
    media-libs/lv2core required by @selected

================================

dev-libs/sord. There is no media-libs/serd, but dev-libs/serd:

emerge: there are no ebuilds to satisfy ">=media-libs/serd-0.1.0".
(dependency required by "dev-libs/sord-9999" [ebuild])
(dependency required by "media-libs/lilv-9999" [ebuild])
(dependency required by "media-sound/ardour-3.9999[lv2]" [ebuild])
(dependency required by "media-sound/ardour:3" [argument])
[...]
$ eix serd
* dev-libs/serd
     Available versions:  (~)0.5.0{tbz2} (~)0.14.0 (**)9999^m{tbz2}[1] 
{{debug doc static-libs test}}
     Homepage:            http://drobilla.net/software/serd/
     Description:         Library for RDF syntax which supports reading 
and writing Turtle and NTriples


Best regards,
Natanael.





El 06/22/2012 12:46 PM, subversion@xxxxxxxxxxxxx escribió:
> Revision: 2160
> Author:   evermind
> Date:     2012-06-22 12:46:20 +0200 (Fri, 22 Jun 2012)
> Log Message:
> -----------
> depend on lv2core or >=lv2-1.0.0
>
> Modified Paths:
> --------------
>      trunk/overlays/proaudio/media-plugins/calf/ChangeLog
>      trunk/overlays/proaudio/media-plugins/calf/Manifest
>      trunk/overlays/proaudio/media-plugins/calf/calf-0.0.18.6-r1.ebuild
>      trunk/overlays/proaudio/media-plugins/calf/calf-9999.ebuild
>      trunk/overlays/proaudio/media-plugins/lv2fil/ChangeLog
>      trunk/overlays/proaudio/media-plugins/lv2fil/Manifest
>      trunk/overlays/proaudio/media-plugins/lv2fil/lv2fil-2.0.ebuild

Index: media-sound/qjackctl/Manifest
===================================================================
--- media-sound/qjackctl/Manifest	(revision 2162)
+++ media-sound/qjackctl/Manifest	(working copy)
@@ -1,7 +1,9 @@
 DIST qjackctl-0.2.23.tar.gz 260545 RMD160 a975e51ec6d95abaff33ea9e32430e30d8d31a46 SHA1 e44b7487ab1e436e4c1bdf909e8e96d338c059c3 SHA256 f6781aba529cd4acfa1e4278f6c65b91336684b79232364cb43aa42fcba868bc
 DIST qjackctl-0.3.3.tar.gz 268722 RMD160 fa08f02f37fb3a75ecc17471183c9aa0d4ca8e9d SHA1 27dab9f3603e1970b152dbbc8a1e02340ce8cf9c SHA256 b25fe8c64deba03140722c295131e6c19709562fbbdc11ad51331ded10103bfd
+DIST qjackctl-0.3.9.tar.gz 449783 RMD160 432722a9959751715b2dd19a276697995788524e SHA1 41e7e313f77fb9fd340a293740a399eeb91b9865 SHA256 5ee8d60675cc65eca8e3aea8ff42770efd6ff84293f9b0f9c2c7acd2383d9a28
 EBUILD qjackctl-0.2.23.ebuild 1008 RMD160 ea46e58370f6c0aa4996824e355afd223c2c1be7 SHA1 abb50d34102710fc125d7e3c527ea41c1d1406e3 SHA256 532b565d41ed3a655215a64c5b03075708af689e59bf14a206df2074313da124
 EBUILD qjackctl-0.3.3.ebuild 1203 RMD160 e3e143932e20c491dd42f02dd7b9168bc28fb0fe SHA1 46d7c372d6deb59fbe2da4923f40637b25b31c18 SHA256 8e2ac1e3d276e405bdaaed339790311b4e0d56acf1df9e7fd994175c47379474
+EBUILD qjackctl-0.3.9.ebuild 1203 RMD160 e3e143932e20c491dd42f02dd7b9168bc28fb0fe SHA1 46d7c372d6deb59fbe2da4923f40637b25b31c18 SHA256 8e2ac1e3d276e405bdaaed339790311b4e0d56acf1df9e7fd994175c47379474
 EBUILD qjackctl-9999.ebuild 1442 RMD160 e897ac9baa05ba2565b5bc4121f3933d391550b6 SHA1 9a7d5cf973e502b663c1b61136a37a1ca57b0b47 SHA256 47b1523bd9e2c2f11020243b5d8001c3a4b48267c32332962a580d032441c18d
 MISC ChangeLog 1150 RMD160 71c6cc17c65c258ef59c7659e323e0bb4f368461 SHA1 f6a252bc8c5654d4ec79a8c3c4ae1da4e0dabad3 SHA256 5faede0587f5e126b8356c0c0e15dd05c9834803614b5af04cd2215642eb1262
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Index: media-sound/musescore/musescore-9999.ebuild
===================================================================
--- media-sound/musescore/musescore-9999.ebuild	(revision 0)
+++ media-sound/musescore/musescore-9999.ebuild	(working copy)
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-1.2.ebuild,v 1.2 2012/05/05 08:43:57 mgorny Exp $
+
+EAPI=4
+inherit cmake-utils eutils font subversion
+
+MY_P="mscore-${PV}"
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://mscore.sourceforge.net";
+ESVN_REPO_URI="https://mscore.svn.sourceforge.net/svnroot/mscore/trunk/mscore";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	>=media-libs/libsndfile-1.0.19
+	media-libs/portaudio
+	media-sound/fluidsynth
+	media-sound/jack-audio-connection-kit
+	sys-libs/zlib
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-script:4
+	x11-libs/qt-svg:4
+	x11-libs/qtscriptgenerator"
+DEPEND="${RDEPEND}
+	dev-texlive/texlive-context
+	app-doc/doxygen
+	virtual/pkgconfig"
+
+VARTEXFONTS="${T}/fonts"
+FONT_SUFFIX="ttf"
+FONT_S="${S}/fonts"
+
+src_prepare() {
+	# Don't build redundant qtscriptgenerator libs
+	sed -i -e '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
+
+	#epatch "${FILESDIR}"/${P}-cflags.patch
+}
+
+src_compile() {
+	cmake-utils_src_make lupdate
+	cmake-utils_src_make lrelease
+	cmake-utils_src_make
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+	dodoc ChangeLog NEWS README
+	doman packaging/mscore.1
+}
Index: media-sound/hydrogen/hydrogen-9999.ebuild
===================================================================
--- media-sound/hydrogen/hydrogen-9999.ebuild	(revision 2162)
+++ media-sound/hydrogen/hydrogen-9999.ebuild	(working copy)
@@ -4,7 +4,7 @@
 
 EAPI=1
 
-inherit eutils qt4 subversion
+inherit eutils qt4 subversion cmake-utils
 
 DESCRIPTION="Linux Drum Machine"
 HOMEPAGE="http://hydrogen.sourceforge.net/";
@@ -61,13 +61,15 @@
 	myconf="${myconf} CC=${CC} CXX=${CXX}"
 	mkdir -p ${D}
 	einfo "${myconf}"
-	scons CUSTOMCCFLAGS="${CFLAGS}" CUSTOMCXXFLAGS="${CXXFLAGS}" \
-		MAKEOPTS="${MAKEOPTS}" \
-		${myconf} || die "scons failed"
+	#scons CUSTOMCCFLAGS="${CFLAGS}" CUSTOMCXXFLAGS="${CXXFLAGS}" \
+	#	MAKEOPTS="${MAKEOPTS}" \
+	#	${myconf} || die "scons failed"
+	cmake-utils_src_compile 
 }
 
 src_install() {
-	scons install prefix="${ROOT}usr" DESTDIR="${D}" || die "scons install failed"
+	cmake-utils_src_install
+	#scons install prefix="${ROOT}usr" DESTDIR="${D}" || die "scons install failed"
 
 	# install tools
 	for i in hydrogenSynth hydrogenPlayer; do
Index: media-sound/hydrogen/Manifest
===================================================================
--- media-sound/hydrogen/Manifest	(revision 2162)
+++ media-sound/hydrogen/Manifest	(working copy)
@@ -5,6 +5,6 @@
 AUX hydrogen-9999-configure.patch 1389 RMD160 afda9f8885753457b210aca4e8cc59f236a5c8b6 SHA1 553287b8b46b4dd9c2adcd66e434a4dd28056733 SHA256 6dc6a1e7fe1524d8e000528f2311befd5abc74b0def7519a0d8a23c3641f602a
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
 EBUILD hydrogen-0.9.3-r1.ebuild 3356 RMD160 6ff63dca7cb1cfc0cf00ada93aa381835aede05b SHA1 5064926d9749f3b1e6de510d33fc0673c00162ea SHA256 5c06fb6ad488d173a9a474b57d47f3c9411a7b99ba6b2c90afb8499d83735001
-EBUILD hydrogen-9999.ebuild 2028 RMD160 235e86b357d56645cfc97f0444ae9de0697ed05d SHA1 b34d51420fc3b22ada36c012154957c6e24f5975 SHA256 8440f83075ea70de0724db10220862d6c01c098d869885f3db184039e5365a00
+EBUILD hydrogen-9999.ebuild 2095 RMD160 6429a47d8f09d9bcf6a442b024ac4ad40fffea01 SHA1 d439faa3cf6a4da055dada7a9d20f50695526f96 SHA256 490ec80ab5872f27410f1f2a4855a9bf32791194ca16932b85e20822ce3fabef
 MISC ChangeLog 574 RMD160 5a7b6db4c8c0076b12bb2e0405cd488179de6547 SHA1 0c2c0eee205e1a79a061737847347e11b0ec9f0d SHA256 590c07f679c72716db28b3d4e0d8985d7975500fff966fd6c68cc058bc9599cc
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Index: media-video/lives/Manifest
===================================================================
--- media-video/lives/Manifest	(revision 0)
+++ media-video/lives/Manifest	(working copy)
@@ -0,0 +1,3 @@
+DIST LiVES-1.6.1.tar.bz2 3372854 RMD160 1f9806f8eeb27ae5916ef426c54b938ad17103d7 SHA1 349f8fcc12730abd66dc738de15e981b6b5edc14 SHA256 cb0dc4e909e78db79e33f3dbd0464522cdc494442bd79670d05756ad4d5b9cb7
+EBUILD lives-1.6.1.ebuild 2061 RMD160 487da57788b55e41bfcb6474bc05cb95742800ba SHA1 28be7f79bf51b9faf6924a68e548cc7afa2824b6 SHA256 e1b7400cd9ca94ef6bfea74f2440ff5c785908707a48cfc6183bed4ff1ab58ca
+EBUILD lives-9999.ebuild 2142 RMD160 b828fe25c29e7b40c2b09f2c29d9b8b86935c75b SHA1 c0369361dc962b35fdb8cacc293fb68dbd03513a SHA256 736752f5412828c7b186297a726ae4f94a37c776ccdbf57e0d52e7c9b14e1041
Index: media-video/lives/lives-1.6.1.ebuild
===================================================================
--- media-video/lives/lives-1.6.1.ebuild	(revision 0)
+++ media-video/lives/lives-1.6.1.ebuild	(working copy)
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.4 2012/05/05 08:58:57 jdhore Exp $
+
+EAPI=4
+inherit autotools eutils
+
+MY_P=LiVES-${PV}
+
+DESCRIPTION="LiVES is a Video Editing System"
+HOMEPAGE="http://lives.sf.net";
+SRC_URI="http://www.xs4all.nl/~salsaman/lives/current/${MY_P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libvisual matroska nls ogg theora" # static-libs
+
+RDEPEND="media-video/mplayer
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	dev-lang/perl
+	>=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.16:2
+	media-libs/libsdl
+	media-libs/libv4l
+	virtual/ffmpeg
+	virtual/jpeg
+	media-sound/sox
+	virtual/cdrtools
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	media-plugins/frei0r-plugins
+	media-sound/jack-audio-connection-kit
+	>=media-video/mjpegtools-1.6.2
+	sys-libs/libavc1394
+	libvisual? ( media-libs/libvisual )
+	matroska? ( media-video/mkvtoolnix )
+	ogg? ( media-sound/ogmtools )
+	theora? ( media-libs/libtheora )"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS README )
+
+src_prepare() {
+	esvn_clean
+
+	# Don't try to detect installed copies wrt #295293
+	sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.in || die
+	sed -i -e '/test/s:sendOSC:dIsAbLeAuToMaGiC:' libOSC/sendOSC/Makefile.am || die
+
+	# Use python 2.x as per reference in plugins
+	sed -i \
+		-e '/#!.*env/s:python:python2:' \
+		lives-plugins/plugins/encoders/multi_encoder* \
+		lives-plugins/marcos-encoders/lives_*_encoder* || die
+
+	AT_M4DIR="mk/autoconf" eautoreconf # for the seds
+}
+
+src_configure() {
+	# $(use_enable static-libs static)
+	econf \
+		--disable-static \
+		$(use_enable libvisual) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"usr/bin/lives #384727
+	dosym lives-exe /usr/bin/lives
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+	# use static-libs ||
+	rm -f "${ED}"usr/lib*/libweed-*.a
+}
Index: media-plugins/ir-lv2/Manifest
===================================================================
--- media-plugins/ir-lv2/Manifest	(revision 2162)
+++ media-plugins/ir-lv2/Manifest	(working copy)
@@ -1,6 +1,8 @@
 DIST ir.lv2-1.1.tar.gz 44608 RMD160 a04100ef06dc4cdcc321a92cf4414eb74a011f4c SHA1 d6c5f422b71fdb77afc1ec37d2484af492ad10ae SHA256 58e36b394bca94c7b874cbdd4f1cac631522fccdfbec35974c6f894d75b8d665
 DIST ir.lv2-1.2.tar.gz 46185 RMD160 0d86beaa64e9fa9b12c22511ef01b34c1e1e9207 SHA1 6524fe377d4da92c4f5491f1be32e605947208fa SHA256 065b4bccdc87acdad8884f675c69af263612217aeffc44358c10acf837e636a8
+DIST ir.lv2-1.3.1.tar.gz 47103 RMD160 9634726d1c7501ca8fc76daa6b1eb319f0e187bd SHA1 33aed77fd063957ea40ddc4306a8f0ea791df4a7 SHA256 b27be831076a5fdff211305c898bee76bf3d684c9000e47a6466f79b2322c700
 EBUILD ir-lv2-1.1.ebuild 803 RMD160 c1a3dce325f66e362963065be7c22c0c0059f207 SHA1 7189379e7d6395ca37b5b572ec886cf29042cd30 SHA256 1f73866d25b59858546496ea82aaeff20c336005cc9e7e8b4746766310092b77
 EBUILD ir-lv2-1.2.ebuild 717 RMD160 d0a06d284441d4bce8dc5787760fb70d612a71e5 SHA1 4eddee269d45831e4e2affd2b11e03c5984984fe SHA256 16517b99fb8ff4a2eccf2830ffc2284bce32643adfe7001d60f7ae5ed096ce3b
+EBUILD ir-lv2-1.3.1.ebuild 1329 RMD160 6c138879cb4e7e6fa6961d01129f243e61dc413f SHA1 ef0285ba806faa9d3644ec2d23e86771a1d396e0 SHA256 964ab8504df039c3254f4f6700d0f7a3125e245fa88ecdd818f50166469523b1
 MISC ChangeLog 372 RMD160 5989b3adf42937d7d08a0bf0bd39d9227f6d259b SHA1 ca55e5b2c16d004252943cac02f7fde5ba9d7321 SHA256 684393e5c4e73fdf75935299277de890db1e3de41c415e7bf8732ffc7605e873
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Index: dev-libs/sord/Manifest
===================================================================
--- dev-libs/sord/Manifest	(revision 2162)
+++ dev-libs/sord/Manifest	(working copy)
@@ -1,3 +1,3 @@
-EBUILD sord-9999.ebuild 1222 RMD160 ac38e61a1a6d2c1ef71216e5972d768c5648ee71 SHA1 2f5d0c14fdcfa80b725cbed8a62e0bac7febb88e SHA256 16ee3e38e4845c8571c17cec4e57c25304a5a900c5ef541ba4eb06e08a5260e1
+EBUILD sord-9999.ebuild 1220 RMD160 c80f71f424c32da82c6f8967741d71accdacc9fd SHA1 73aaa819f630b5150f8c3f1afe15e7a88bb9adf8 SHA256 7874be3e83cac8b58c68ec761e013c18756c1f2f6d92ac8c96b60884d8790d7d
 MISC ChangeLog 515 RMD160 fbbc684248d505b57c0b9ce6a65a648ddf5bb6c8 SHA1 795f4f9306ccbf3ec74a064c5b902feb82349bb1 SHA256 65156dd20de4ac8232b0a40297a7a7394e7eac43846083d21a7aa425df2508fc
 MISC metadata.xml 246 RMD160 cdd725771833663c8cfa684c4c71e57d86d9993d SHA1 973be5799e631fd26fb4abcfc8da942f2f759d06 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f
Index: dev-libs/sord/sord-9999.ebuild
===================================================================
--- dev-libs/sord/sord-9999.ebuild	(revision 2162)
+++ dev-libs/sord/sord-9999.ebuild	(working copy)
@@ -19,7 +19,7 @@
 IUSE="debug doc"
 
 RDEPEND=">=dev-libs/glib-2.26.1-r1:2
-	>=media-libs/serd-0.1.0"
+	>=dev-libs/serd-0.1.0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-util/pkgconfig
Index: media-libs/lilv/Manifest
===================================================================
--- media-libs/lilv/Manifest	(revision 2162)
+++ media-libs/lilv/Manifest	(working copy)
@@ -1,3 +1,3 @@
-EBUILD lilv-9999.ebuild 1540 RMD160 176bf8239cba141a24a45dae4458593cf203d185 SHA1 ca70e20846a4af57e4383c4b8c68c49b2c0e9b52 SHA256 a9f1f659c65f5c9f9c84d8b39185187575bd06ef9eb64cb34c93052a913e13b5
+EBUILD lilv-9999.ebuild 1574 RMD160 277c6f618d1c4b7d2efa41d4dc2d5fdba2bd3f7e SHA1 d92d0af9ab366983a921a5e6f61aefd32b2c3117 SHA256 9b1022bcaf87a6e7ba43bced59b59529afbad202d9aefa84500bf096517d4271
 MISC ChangeLog 375 RMD160 9c8b4723bea17a32231d5cb4ee865171a0f40c18 SHA1 2ea6a815caed8c5e847880d6babb69fd75c876a7 SHA256 bc721e0cbcb976a68ec71845bb0a74df76b209c1f0c769a1c76c5e594ea94e57
 MISC metadata.xml 334 RMD160 e82fb40ca234f84d88cce68c1014b392d2d5f7ef SHA1 3a8be0f41a5c4c28099da00a26258ee15585cd39 SHA256 849350d8091a73ebe13b5c83d35c346fe276a801bc20379b70beca455e05fa9f
Index: media-libs/lilv/lilv-9999.ebuild
===================================================================
--- media-libs/lilv/lilv-9999.ebuild	(revision 2162)
+++ media-libs/lilv/lilv-9999.ebuild	(working copy)
@@ -18,7 +18,7 @@
 IUSE="bash-completion debug doc jack swig"
 
 RDEPEND=">=dev-libs/glib-2.26.1-r1:2
-	>=media-libs/lv2core-6
+	( || ( >=media-libs/lv2core-6 >=media-libs/lv2-1.0.0 ) )
 	>=dev-libs/serd-0.5
 	>=dev-libs/sord-0.5
 	jack? ( >=media-sound/jack-audio-connection-kit-0.120.1 )"