diff options
author | Alexis Ballier <aballier@gentoo.org> | 2007-02-10 19:05:50 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2007-02-10 19:05:50 +0000 |
commit | ef400a2e756dc514270599d773869b7e8b04ff76 (patch) | |
tree | 5dcbefa5679ec0b4290d5fcdcef4d2de07cfe91a | |
parent | Stable on ppc wrt bug 163951 (diff) | |
download | gentoo-2-ef400a2e756dc514270599d773869b7e8b04ff76.tar.gz gentoo-2-ef400a2e756dc514270599d773869b7e8b04ff76.tar.bz2 gentoo-2-ef400a2e756dc514270599d773869b7e8b04ff76.zip |
Remove duplicate docs when use=-nsplugin, bug #158536, thanks to Chris Mayo <mayo@clara.co.uk>
(Portage version: 2.1.2-r9)
-rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/vlc/vlc-0.8.6-r1.ebuild | 8 | ||||
-rw-r--r-- | media-video/vlc/vlc-0.8.6_p18636.ebuild | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 702a1d196d66..a3419d4e74ff 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.218 2007/02/10 15:57:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.219 2007/02/10 19:05:50 aballier Exp $ + + 10 Feb 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild, + vlc-0.8.6_p18636.ebuild: + Remove duplicate docs when use=-nsplugin, bug #158536, thanks to Chris Mayo + <mayo@clara.co.uk> 10 Feb 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6_p18636.ebuild: Jack useflag, bug #157899 diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild index 513300c67847..301ea566ccee 100644 --- a/media-video/vlc/vlc-0.8.6-r1.ebuild +++ b/media-video/vlc/vlc-0.8.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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-r1.ebuild,v 1.11 2007/02/10 15:09:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.12 2007/02/10 19:05:50 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -268,11 +268,11 @@ src_install() { 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} fi + rm -rf "${D}/usr/share/doc/vlc" \ + "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + use skins || rm -rf "${D}/usr/share/vlc/skins2" for res in 16 32 48; do diff --git a/media-video/vlc/vlc-0.8.6_p18636.ebuild b/media-video/vlc/vlc-0.8.6_p18636.ebuild index 68bbda9f5b37..75531dba7e69 100644 --- a/media-video/vlc/vlc-0.8.6_p18636.ebuild +++ b/media-video/vlc/vlc-0.8.6_p18636.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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_p18636.ebuild,v 1.5 2007/02/10 15:57:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.6 2007/02/10 19:05:50 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -275,11 +275,11 @@ src_install() { 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} fi + rm -rf "${D}/usr/share/doc/vlc" \ + "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + use skins || rm -rf "${D}/usr/share/vlc/skins2" for res in 16 32 48; do |