Remove duplicate docs when use=-nsplugin, bug #158536, thanks to Chris Mayo <mayo@clara.co.uk>

Package-Manager: portage-2.1.2-r9

4 files changed, 29 insertions, 24 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/Manifest b/media-video/vlc/Manifest
index d76baf9acd5f..ecbc2144e6bc 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,18 +4,18 @@ Hash: SHA1
 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
 DIST vlc-0.8.6_p18636.tar.bz2 10732448 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 SHA1 fff2d45fc24f6782ce3fd90ac7a3a9ec4d905d7d SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe
 DIST vlc-patches-35.tar.bz2 11019 RMD160 a79a774e94be36824745d415a7743d4b74abc76e SHA1 43a69371056b3c7b35871971c5e1938a76a903c4 SHA256 3b74d69405b107569b47b33342e78d7c7ef8ac10cdc486bef6803975853405fa
-EBUILD vlc-0.8.6-r1.ebuild 8227 RMD160 a6a1f2197735087f74cd4b25f490cac96b2d4b73 SHA1 2337f56f6b334920f11c6c3b04d4590fd0c41720 SHA256 881a9cdd069b861b5a334632047fbb06098575d1b71b6820c831cf08ad53c14d
-MD5 65a91aec00b72efb450805896bf795f3 vlc-0.8.6-r1.ebuild 8227
-RMD160 a6a1f2197735087f74cd4b25f490cac96b2d4b73 vlc-0.8.6-r1.ebuild 8227
-SHA256 881a9cdd069b861b5a334632047fbb06098575d1b71b6820c831cf08ad53c14d vlc-0.8.6-r1.ebuild 8227
-EBUILD vlc-0.8.6_p18636.ebuild 8449 RMD160 8979393eddc62949f69a24ae26e710700a803a00 SHA1 31969138a2ef6e6249135a6fed4bc4a32d4083af SHA256 2b1e5465a282fe833148d208362c635832ba10ac63efcbc40217c5543f66f58e
-MD5 d673b0e490758fd96302e41c6a709ae5 vlc-0.8.6_p18636.ebuild 8449
-RMD160 8979393eddc62949f69a24ae26e710700a803a00 vlc-0.8.6_p18636.ebuild 8449
-SHA256 2b1e5465a282fe833148d208362c635832ba10ac63efcbc40217c5543f66f58e vlc-0.8.6_p18636.ebuild 8449
-MISC ChangeLog 39878 RMD160 bc3e2d901238834043549eceadd1570c3178001f SHA1 359d1aa59feea26c42b42dac4c8110e52b14c175 SHA256 f043d3fbd323665d1df2f85d56df4664576cc514c50c556c0345dbf1c4a8f9a0
-MD5 3aadced69f8ba1c64f979e8ab2900261 ChangeLog 39878
-RMD160 bc3e2d901238834043549eceadd1570c3178001f ChangeLog 39878
-SHA256 f043d3fbd323665d1df2f85d56df4664576cc514c50c556c0345dbf1c4a8f9a0 ChangeLog 39878
+EBUILD vlc-0.8.6-r1.ebuild 8225 RMD160 40e9d945d823bd404d07f6633177858ec3da512d SHA1 71a9b2255a9db72e4a45fa258820716ba78240b0 SHA256 12e24fba2c5cfa03ab7820aad0afc3fad4704acc40051247fa05cdd29c762acc
+MD5 99980ad30d6422493fa6c2ed3ff4867f vlc-0.8.6-r1.ebuild 8225
+RMD160 40e9d945d823bd404d07f6633177858ec3da512d vlc-0.8.6-r1.ebuild 8225
+SHA256 12e24fba2c5cfa03ab7820aad0afc3fad4704acc40051247fa05cdd29c762acc vlc-0.8.6-r1.ebuild 8225
+EBUILD vlc-0.8.6_p18636.ebuild 8447 RMD160 eeff0a2e625ef41380780d7c2b2a245d1d9747f9 SHA1 a7a3954b05bb0b4a0c5fe177afffb4478a5eea6c SHA256 f7ad29bdea65c12ef9f2c29d12ed90feb24526d0fd0b5eac2bbd537ced0bff51
+MD5 f24ec9028410f6c46d8cb16357e0badf vlc-0.8.6_p18636.ebuild 8447
+RMD160 eeff0a2e625ef41380780d7c2b2a245d1d9747f9 vlc-0.8.6_p18636.ebuild 8447
+SHA256 f7ad29bdea65c12ef9f2c29d12ed90feb24526d0fd0b5eac2bbd537ced0bff51 vlc-0.8.6_p18636.ebuild 8447
+MISC ChangeLog 40078 RMD160 19d729b318522a04315b0775ab91e9eb3a662cf4 SHA1 82238472a40e77b0001584b5bcef8819dda3bcc5 SHA256 b9071176b2fd9fa9822f01d1fc89b57f66f46cde9034b23bd2d4fe0ebad6a90e
+MD5 1ca6cab292c45485ded8ca70b09701a2 ChangeLog 40078
+RMD160 19d729b318522a04315b0775ab91e9eb3a662cf4 ChangeLog 40078
+SHA256 b9071176b2fd9fa9822f01d1fc89b57f66f46cde9034b23bd2d4fe0ebad6a90e ChangeLog 40078
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -29,7 +29,7 @@ SHA256 59e6acba8cd278a6390780d4a4b3c488df47b82a64fefaed11764e048e9e1016 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzet2vFcC4BYPU0oRAtziAKCj7MMhz9CXQgEgeLDKsKU1zNzg8gCglQLS
-AUTly+8s5JgLjgCQdw32w3g=
-=Hgkx
+iD8DBQFFzheXvFcC4BYPU0oRAjk0AJ0T5BDqF9Kp3AYGjU/QNkS399GjJQCgkBD2
+mk2Y9zencE5u/TOcPTFhL9I=
+=cI8l
 -----END PGP SIGNATURE-----
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