From 19a2a7b18b134d21af184ab6d46f5dbe141eaa2a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Fri, 17 Nov 2006 13:39:06 +0000
Subject: [PATCH] Run emake install in src first so that we don't need to block
 old versions of VLC. Package-Manager: portage-2.1.2_rc1-r7

---
 media-video/vlc/ChangeLog              |  6 +++++-
 media-video/vlc/Manifest               | 22 +++++++++++-----------
 media-video/vlc/vlc-0.8.6_beta2.ebuild |  9 ++++-----
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 9dcee7ad2b24..b30facae265f 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.191 2006/11/17 01:47:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.192 2006/11/17 13:39:06 flameeyes Exp $
+
+  17 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.6_beta2.ebuild:
+  Run emake install in src first so that we don't need to block old versions
+  of VLC.
 
 *vlc-0.8.6_beta2 (17 Nov 2006)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index c2de8f531d9d..efac5cb52bb5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -20,14 +20,14 @@ EBUILD vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737
 MD5 81ff77133353f46a2181354d2978d73e vlc-0.8.5-r5.ebuild 7479
 RMD160 d87443d301afdc32f29b74beb908852bd309c737 vlc-0.8.5-r5.ebuild 7479
 SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 vlc-0.8.5-r5.ebuild 7479
-EBUILD vlc-0.8.6_beta2.ebuild 7726 RMD160 b63cb8a968b77e9e7f67f6ada6742fbbff81d512 SHA1 9385166444c5acfec78c4fe56fc5c7128920922f SHA256 4c44103e0ffee293fa8f538029ad98000387df6969adb357d27046af5c7435a0
-MD5 5f0c1a0174865fcc4dcac0b7838b77a4 vlc-0.8.6_beta2.ebuild 7726
-RMD160 b63cb8a968b77e9e7f67f6ada6742fbbff81d512 vlc-0.8.6_beta2.ebuild 7726
-SHA256 4c44103e0ffee293fa8f538029ad98000387df6969adb357d27046af5c7435a0 vlc-0.8.6_beta2.ebuild 7726
-MISC ChangeLog 36031 RMD160 a085b0c9cd31be417e1b1dbc1665244a973faf77 SHA1 1ae51553afa9db8fac0b4a21a0b1e72a7589a361 SHA256 12a100222b5ce38bada66c2ae6e267f26614d05f6bcbafc0fc6434ba3ecde39b
-MD5 f02e939d551c4e197ef388477f211e13 ChangeLog 36031
-RMD160 a085b0c9cd31be417e1b1dbc1665244a973faf77 ChangeLog 36031
-SHA256 12a100222b5ce38bada66c2ae6e267f26614d05f6bcbafc0fc6434ba3ecde39b ChangeLog 36031
+EBUILD vlc-0.8.6_beta2.ebuild 7716 RMD160 aae604615187442ca8f37a67700f476b75ac7c5f SHA1 387ca8a7439a9e5a242bc3283e670768ef6053e9 SHA256 261b5d49ee83e9c8853b67c5d1867368442bad705050281ae2db926ef82a7589
+MD5 2fa5ca9d40ff41e8a6e1d37f50fbd6b5 vlc-0.8.6_beta2.ebuild 7716
+RMD160 aae604615187442ca8f37a67700f476b75ac7c5f vlc-0.8.6_beta2.ebuild 7716
+SHA256 261b5d49ee83e9c8853b67c5d1867368442bad705050281ae2db926ef82a7589 vlc-0.8.6_beta2.ebuild 7716
+MISC ChangeLog 36196 RMD160 e65eb36a54f7f4d0310eaeb8212fab00b1a6d6bd SHA1 b122949d9f05e8661ab293e7ae8cecaa36941b78 SHA256 70eca7a8e5c9cc5f9854ccfa0a2222e413ee420be62abe7e76e5f914c3a610ac
+MD5 c3c5ec22efc05d468b6d34bc18570f7f ChangeLog 36196
+RMD160 e65eb36a54f7f4d0310eaeb8212fab00b1a6d6bd ChangeLog 36196
+SHA256 70eca7a8e5c9cc5f9854ccfa0a2222e413ee420be62abe7e76e5f914c3a610ac ChangeLog 36196
 MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
@@ -47,7 +47,7 @@ SHA256 8ee2b8cad31d5d39f1db30c2e54c506eb983c2963a4cd137f39ef4812417dc0f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXRTRAiZjviIA2XgRAoynAKDIt658OG7nCvyrjmtMg1ngTO7ZRACfRwJ4
-kWUozLbf0ajnQ3/eaX6J70A=
-=qYOW
+iD8DBQFFXbxIAiZjviIA2XgRAkoFAJ96LBZPwbQkHdJEzfDy+UW6xIbTyACdHftt
+Od/f75gMn5WoPvQYmoQVOzg=
+=d4KA
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.6_beta2.ebuild b/media-video/vlc/vlc-0.8.6_beta2.ebuild
index b957096614f8..38d951073087 100644
--- a/media-video/vlc/vlc-0.8.6_beta2.ebuild
+++ b/media-video/vlc/vlc-0.8.6_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_beta2.ebuild,v 1.1 2006/11/17 01:47:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_beta2.ebuild,v 1.2 2006/11/17 13:39:06 flameeyes Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -105,10 +105,7 @@ RDEPEND="
 		)
 		libnotify? ( x11-libs/libnotify )"
 
-# For a series of reason, libtool breaks stuff with plugins and
-# shared libvlc. Until that can be sorted out, remove VLC before
 DEPEND="${RDEPEND}
-	!<media-video/vlc-${PV}
 	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
 	dev-util/pkgconfig"
 
@@ -239,7 +236,9 @@ src_compile () {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed!"
+	# First install the library, to avoid screwups during relinking.select
+	emake -C src DESTDIR="${D}" install || die "make -C src install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
 		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-- 
2.26.2