remove custom handling of icons; its done properly by upstream's makefiles now, by Rafał Mużyło <galtgendo@o2.pl>, bug #325049

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 17 insertions, 27 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 6277fa349d42..1652fca512f4 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.595 2010/06/22 08:56:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.596 2010/06/22 12:26:03 aballier Exp $
+
+  22 Jun 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.0.ebuild,
+  vlc-1.1.9999.ebuild, vlc-9999.ebuild:
+  remove custom handling of icons; its done properly by upstream's makefiles
+  now, by Rafał Mużyło <galtgendo@o2.pl>, bug #325049
 
   22 Jun 2010; Christian Faulhammer <fauli@gentoo.org> vlc-1.1.0.ebuild:
   add ~x86 for bug 325007
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a016db394e49..6b1012c1e1bd 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,15 +7,15 @@ DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
 EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c
-EBUILD vlc-1.1.0.ebuild 12042 RMD160 207f6b22d286ffdaae20e33f359cd85a58b7c58b SHA1 678442d419a91e191d0165702c9bdc1ecd4f06b8 SHA256 d83cb304d4783da06ee2f35c4d88d8044f6378c17e1bee0e5361dceb4513cb34
-EBUILD vlc-1.1.9999.ebuild 12027 RMD160 1f96083d98b07e67fa300904dc6a7478d17b5a27 SHA1 4b8d1004b8a1661dcf79c197d88e220bcb797fe7 SHA256 0387b919f7238ad8a0e6681f391a4805831c784db92d22a38e6a3a8c8196016c
-EBUILD vlc-9999.ebuild 12024 RMD160 f2eae7bbb5806461ac54cc5488527808dfc98a6e SHA1 50b0acfacba0b6150922004d0cc637226fa90760 SHA256 575079423d0f37c3cb53514921bacd4dbe83331b5e2afeacfe1182a90714a61c
-MISC ChangeLog 92107 RMD160 bcfaeb53dce9ff5cc38a8d24d5e3fcc633c907da SHA1 b42d1d005edeb9a6e6f4169de297fb6cd317e333 SHA256 cc83bfc7a9d9114260abca14bf3dc10321e0aaba0b0c15beaf33da665a7c5579
+EBUILD vlc-1.1.0.ebuild 11907 RMD160 1a4428292986da464dc8d4fd96201421f6bc4d61 SHA1 294cdd867d55aafd9e5e9bd00a4d52caacef84d5 SHA256 dde7d18e29576ab4ee8373e4bd79a061d6fe8fd68d2f88072650b6a41b84cd56
+EBUILD vlc-1.1.9999.ebuild 11889 RMD160 3b9be735c1d1be99a86f08a125aa620306212f9e SHA1 7b4db33059e2e0ec85e92ca2dd4fc71cc56bf127 SHA256 40362d9216a0ca54e09cb62f1b2586550951be2d7f8b373ed552dc890c9e8254
+EBUILD vlc-9999.ebuild 11886 RMD160 49bdb56d294096397af3e90addbd8cfb84f06071 SHA1 bef795b7fc355469a8b0f011e9e2cf6b75f33262 SHA256 f3743be9edefdf39681c6222dff7d48e240acfd32e2e8966aa22516d8b0daf62
+MISC ChangeLog 92355 RMD160 c1838811831116c1186e4dab82439550d95585dd SHA1 652be03b7482f8ebd29cb47f44f3e0ae56cffd6a SHA256 d042fd97dac84e82a60e3b0e269ef0353b4b47d9ecaa1a3897cf3c822fc1ecd5
 MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwgetIACgkQNQqtfCuFneNxzwCeOeMZZ+4ATYxMe/G3ppkbEaGI
-UWQAn01zUgLzcgSXQqa00gp2BF3tHfAk
-=NvRu
+iEYEARECAAYFAkwgq+IACgkQvFcC4BYPU0pjawCgnrb6+AWWXC7/W05IWV/ciWzZ
+ekgAoK3g1ZnWXvqfmuLSZS25S+cNXLm9
+=bHUf
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.0.ebuild b/media-video/vlc/vlc-1.1.0.ebuild
index 2d8591fd0055..36bc600e4fd6 100644
--- a/media-video/vlc/vlc-1.1.0.ebuild
+++ b/media-video/vlc/vlc-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.2 2010/06/22 08:56:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.3 2010/06/22 12:26:03 aballier Exp $
 
 EAPI="2"
 
@@ -359,11 +359,6 @@ src_install() {
 	fi
 
 	use skins || rm -rf "${D}/usr/share/vlc/skins2"
-
-	for res in 16 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
-		newins "${S}"/share/vlc${res}x${res}.png vlc.png
-	done
 }
 
 pkg_postinst() {
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index a881a87b9022..813a22c54704 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.8 2010/06/11 10:51:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.9 2010/06/22 12:26:03 aballier Exp $
 
 EAPI="2"
 
@@ -359,11 +359,6 @@ src_install() {
 	fi
 
 	use skins || rm -rf "${D}/usr/share/vlc/skins2"
-
-	for res in 16 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
-		newins "${S}"/share/vlc${res}x${res}.png vlc.png
-	done
 }
 
 pkg_postinst() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6052a04d4538..ca8b5c26d7e4 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.75 2010/06/11 10:51:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.76 2010/06/22 12:26:03 aballier Exp $
 
 EAPI="2"
 
@@ -359,11 +359,6 @@ src_install() {
 	fi
 
 	use skins || rm -rf "${D}/usr/share/vlc/skins2"
-
-	for res in 16 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
-		newins "${S}"/share/vlc${res}x${res}.png vlc.png
-	done
 }
 
 pkg_postinst() {