summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-11-17 13:39:06 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-11-17 13:39:06 +0000
commit2ef5a3b8838429a03fea9d0c3cc8ddf0bb970993 (patch)
tree87f1e9e5b107026c14f94601728fac1c25884899 /media-video
parentre-added ~ppc (diff)
downloadgentoo-2-2ef5a3b8838429a03fea9d0c3cc8ddf0bb970993.tar.gz
gentoo-2-2ef5a3b8838429a03fea9d0c3cc8ddf0bb970993.tar.bz2
gentoo-2-2ef5a3b8838429a03fea9d0c3cc8ddf0bb970993.zip
Run emake install in src first so that we don't need to block old versions of VLC.
(Portage version: 2.1.2_rc1-r7)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-0.8.6_beta2.ebuild9
2 files changed, 9 insertions, 6 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/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