Don't try to detect installed copies of libweed and sendOSC wrt #295293 by Dustin Polke and Juergen Rose. Fix absolute path to symlink (with rm and dosym) wrt #384727 by Thomas Rausch.

Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64

3 files changed, 26 insertions, 16 deletions

diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index 2106f7838ad0..6032b7db2760 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/lives
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.33 2011/09/30 19:26:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.34 2011/10/06 17:25:07 ssuominen Exp $
+
+  06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> lives-1.4.6.ebuild:
+  Don't try to detect installed copies of libweed and sendOSC wrt #295293 by
+  Dustin Polke and Juergen Rose. Fix absolute path to symlink (with rm and
+  dosym) wrt #384727 by Thomas Rausch.
 
   30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -lives-1.0.0.ebuild,
   -lives-1.4.2.ebuild:
diff --git a/media-video/lives/Manifest b/media-video/lives/Manifest
index c2f0d8f224a5..1d3b0a1ec7a3 100644
--- a/media-video/lives/Manifest
+++ b/media-video/lives/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST LiVES-1.4.6.tar.bz2 3086311 RMD160 8a3da63940f3449479b393cd1718c4842fa9c01e SHA1 6e5aa19ab29247d73d85be4924ad4bb50b863764 SHA256 67fb57571b80da680463f53f4e1aa2ac92d88f9437b7c9feb048faef7e617d59
-EBUILD lives-1.4.6.ebuild 1937 RMD160 550722411d031cd38dab639db05f0d42b9cb170b SHA1 66f1c714c8dca33bc311e1c27c64a6292adcf308 SHA256 5ae3428ad46aa752550d701f5f76452deb6a38f929d308acf4f75692e0c50f05
-MISC ChangeLog 4948 RMD160 a82f9a113c2ea469e17dd29fa30dddffd46d54f4 SHA1 237e486b1be6a4cddf3a067869594edd0c452249 SHA256 e74a9c6cea84cac4e5a2246d722445440de5cc2bd69d494adf4335bbbf3f994a
+EBUILD lives-1.4.6.ebuild 2087 RMD160 7c5e45aae4dac07d605c886e838f7bf494fc80ea SHA1 0cf5c4a7a9bf1d296feb6845ee7b4d6c3cbb98e2 SHA256 1d220f697f9e63aad2dc46f3f2ee58e1fd6423a55baf902d36e7186396ddc8e4
+MISC ChangeLog 5214 RMD160 d6ec72a262a88f0115af97f173da0a43f7ab9024 SHA1 fddc32f5e56d97333b5f498d89cb197d89cda844 SHA256 2cebfcf1cc8a7ab453823c67104c0b2594f6630df7fa4de4a67c6a9ab6488ae9
 MISC metadata.xml 305 RMD160 56aca1392bb785b378c019d73f727615c872ca8d SHA1 f8f046e301348ddff86afbc63591e087e63b94fb SHA256 3bdae23d81481e833af249e9ee4872ee56c7d2f7b19cbefe59fcbc5b0cc49930
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOhhgVAAoJEEdUh39IaPFNKMgIAIfhTog8dFdFcJOBBjZ55QAi
-I0hO9KaOQ6r16S3gBPyfDFn1sJW4EE/4IGapbDJcRkGUyzDNdAZxZi/eyVC1P6wa
-lYJsp6FWLYI5K5TfacE/Q5jEoFeKhlW+9KRRouT+cifYPQSPgGDYbjPfWPF3EMK/
-TX/0qd5lqLkBUYZXodaD/xGqF/sb72tfh3UZsy7fS0XhV/hnnz77YAzXzkv/HZ4H
-8WFsLiA290lNFTvx5H35VkNruuoHlHTDID29YbZXLy+7utxOuq3mCg/CV00JppTZ
-GELP40S3Dvbnf9pN/zLMv0IqnaiBDtKPCeAzbAf74tk0PTxR3LmQ32wrqSJd1P4=
-=vh96
+iQEcBAEBAgAGBQJOjeSWAAoJEEdUh39IaPFNS1EIAJNyxQ/N7YjKB/4zAl78WSYh
+GgTuQwJ32mPiKLDDQ+guwuedLKrrV9D1XSi1FAEeWm3sO0TUOk1NT/KhusoYl7D2
+uifL9CKdmHkcxATJEEPRjjGnq2p4w33tlBxGhkGCdmLeel0w9aFTWccbm99TMi9u
+KlKcua5d8+4DP00P05NP2TBE1x4ux19dVsy/Z/E7BJQ83r9xfMkQWZE7VLGHN0So
+GM4z8rojsZm+D9jH8kkDnLqs15LdCvyk9gA8dhI3AZE5qp5ZXcY93v4DG046kMIN
+GpczXeBadRTb3OBi5+PWcDAF6IVLKCowsvs1TsgXrZTchRprLg6NlZ5MwJrfvWo=
+=fpyu
 -----END PGP SIGNATURE-----
diff --git a/media-video/lives/lives-1.4.6.ebuild b/media-video/lives/lives-1.4.6.ebuild
index c9765830b32a..6beeedef7323 100644
--- a/media-video/lives/lives-1.4.6.ebuild
+++ b/media-video/lives/lives-1.4.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 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.1 2011/09/30 19:13:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.2 2011/10/06 17:25:07 ssuominen Exp $
 
 EAPI=4
-inherit eutils
+inherit autotools eutils
 
 MY_P=LiVES-${PV}
 
@@ -16,10 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libvisual matroska nls ogg theora" # static-libs
 
-# FIXME (incomplete workaround in place):
-# !!<${CATEGORY}/${PF} is because if you have lives installed, the bundled
-# libweed never gets installed in second emerge
-# See also bug 295293
 RDEPEND="media-video/mplayer
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	dev-lang/perl
@@ -50,12 +46,17 @@ 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() {
@@ -68,6 +69,10 @@ src_configure() {
 
 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