diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-12-01 13:16:06 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-12-01 13:16:06 +0000 |
| commit | cd4ad7fc611e73c4272a82cb88aeb0697fd907e1 (patch) | |
| tree | 34e2138f309aadb5625c808c3980cf0a13eca31c | |
| parent | Stable on sparc wrt #156718 (diff) | |
| download | gentoo-2-cd4ad7fc611e73c4272a82cb88aeb0697fd907e1.tar.gz gentoo-2-cd4ad7fc611e73c4272a82cb88aeb0697fd907e1.tar.bz2 gentoo-2-cd4ad7fc611e73c4272a82cb88aeb0697fd907e1.zip | |
Hopefully fixed the nsplugin building (bug #156067) this time.
(Portage version: 2.1.2_rc2-r3)
| -rw-r--r-- | media-video/vlc/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.8.6_rc1.ebuild | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 18115503c41b..3d16477f6ed2 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,9 @@ # 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.195 2006/12/01 02:40:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.196 2006/12/01 13:16:06 caster Exp $ + + 01 Dec 2006; Vlastimil Babka <caster@gentoo.org> vlc-0.8.6_rc1.ebuild: + Hopefully fixed the nsplugin building (bug #156067) this time. *vlc-0.8.6_rc1 (01 Dec 2006) diff --git a/media-video/vlc/vlc-0.8.6_rc1.ebuild b/media-video/vlc/vlc-0.8.6_rc1.ebuild index 153f0964de22..ebb7a2a72fc5 100644 --- a/media-video/vlc/vlc-0.8.6_rc1.ebuild +++ b/media-video/vlc/vlc-0.8.6_rc1.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_rc1.ebuild,v 1.1 2006/12/01 02:40:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_rc1.ebuild,v 1.2 2006/12/01 13:16:06 caster Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -238,6 +238,7 @@ src_compile () { --disable-x264 \ --enable-utf8 \ --enable-libtool \ + $(use_enable nsplugin mozilla) \ XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \ ${myconf} || die "configuration failed" @@ -255,12 +256,14 @@ src_install() { dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \ doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt - dodir "/usr/$(get_libdir)/${PLUGINS_DIR}" - mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \ - "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" + if use nsplugin; then + dodir "/usr/$(get_libdir)/${PLUGINS_DIR}" + mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \ + "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" - rm -rf "${D}/usr/share/doc/vlc" \ - "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + rm -rf "${D}/usr/share/doc/vlc" \ + "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + fi use skins || rm -rf "${D}/usr/share/vlc/skins2" |