Upload blender.png to mirrors as blender-2.48a.png.bz2 wrt #370903

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

4 files changed, 21 insertions, 18 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 95f8a4a81507..63ace125d7dc 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.225 2012/06/14 15:18:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.226 2012/06/27 21:25:30 ssuominen Exp $
+
+  27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
+  -files/blender.png:
+  Upload blender.png to mirrors as blender-2.48a.png.bz2 wrt #370903
 
   14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
   blender-2.49a.ebuild, blender-2.49b-r2.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 42a435245965..ae382ba7bb11 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -39,27 +39,27 @@ AUX blender-2.60a-libav-0.7.patch 1181 RMD160 66dc84d6ca37a97bb43886ed86b7249938
 AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
 AUX blender-2.61-opencollada-debug.patch 846 RMD160 55c37aea862c4318624fb394ca32f67775bc95b8 SHA1 5866b3e4911ba95b071457cf1fd09e5a87b63236 SHA256 c2861bca33a9a72dc5f45dfe15e5b552fe93843ee9d6e10e594baec62ecb206b
 AUX blender.desktop 199 RMD160 a55286923d1422f620dff35226a42fcbaf8c60a9 SHA1 c5ad8c540571a254756ac541c64933e80406aa16 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad
-AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
+DIST blender-2.48a.png.bz2 2509 RMD160 a9a3e6d21337bffb74cbb155676e47ffb397f523 SHA1 086b2aa858d296bc77dd69a7b751e2bbc927d725 SHA256 aea439e0504c5e9eed16e062694636d523b28674c594077c0fafe29b4d775515
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
 DIST blender-2.49a.tar.gz 23039535 RMD160 f37100c7a02c75b622b8e055f32f06e064a62de2 SHA1 59f5be96eda874bb901390f55a70d58cf8e0b979 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
 DIST blender-2.49b.tar.gz 22918377 RMD160 5b641de7b41af5e4186c9721b66eddc6870f9fbc SHA1 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488
 DIST blender-2.57.tar.gz 16806453 RMD160 d2f4d14cb08067a3d1fb3c1661772cf8f3a9bfaa SHA1 c539e2640dfa2a17e044d0f296219b866242112a SHA256 8bd1812166f2dd96e158c1898a666adc1f9f109765d5cd7ff3a8adeae60794b8
 DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124
-EBUILD blender-2.48a-r3.ebuild 4116 RMD160 0c2790ac77760b7d7ece41a7947246011f05fa9b SHA1 b286b4ff1cc44a8383de40b64fb10c5ac9caa43c SHA256 491ac88445db61cd51a3d8ef3387993a85a7f3d33846e5dfda1ca5d0fdb56ed6
+EBUILD blender-2.48a-r3.ebuild 4121 RMD160 352a990ef523cd88ca090cb7d0cc37b3a9909be7 SHA1 0c7d718d54a0a1ffb84c4324a87dc7cc63b97cb2 SHA256 1effa801ae75047486f27b6948f80345e28bdb1773fd0ee6f153bd249cb2f5f3
 EBUILD blender-2.49a.ebuild 5066 RMD160 3518f0aa94a1360a4ec774480f80fff9bd0ecda0 SHA1 5e6dad8e9cd80e23171f874090a3199d139aee1f SHA256 64cca831b882fd527b53de22bfa137a859c6a5d89f6615b5e075aa916f0c43f0
 EBUILD blender-2.49b-r2.ebuild 5295 RMD160 776c53fbce7fc6cfcae58b7830906089ad03c10d SHA1 a33dd9729c2c1bf75805c2360ab5697432b4599f SHA256 fd61820a492e3e32875e998d9e310d3431e380d7ec88c9d20ac13adb48d66554
 EBUILD blender-2.57-r1.ebuild 14179 RMD160 f74e423ef538b7f2443fd38beaa623e281b381eb SHA1 1c6b0920facc35dc2603711e7208f82f21414a8e SHA256 3d479b13ce87170a085dbb46a9884d7e1eaefdc3c20e97efec865e480d555be0
 EBUILD blender-2.60a.ebuild 14352 RMD160 dbe25fdc6939189605e1b313f5c1098367c92bf9 SHA1 5f841651edd70eb38d3fcf5543afa063ab341b41 SHA256 b0c053c1fc01fe881b47610b8ce6fa755d524b56d92c812dd41fcf28e1699b11
-MISC ChangeLog 35216 RMD160 2a04635dda94dee79802fc3dea7371e5bccbb9dd SHA1 4934ce84bd02dd71e6c1e0e7dd71e3fe847609a6 SHA256 0e221690860c5b4a2e2cc0d1d91a6120b4f0b4e54cca6ff87391b49728b9f205
+MISC ChangeLog 35387 RMD160 55bba7a03ce9d51dc7c6a6c481356fce197c2d03 SHA1 c32c87dc24c6b9526ea825d539d262b7efc29b01 SHA256 bd2c81b120ec8aba8164f355f291ce1ac3891285e5be2110e044d4740b2f7fc1
 MISC metadata.xml 1965 RMD160 3f48332ec841384161d2377ff0a2e02c37a4a909 SHA1 bf4dce385ef1e309b5d6ac4a8a631463587cf949 SHA256 ec5973923a2cce6ae374f6dfed03b15f401b1c9a05b1e8520440cdd5756a1c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2f/dAAoJEEdUh39IaPFNDh0H/0AI1LJKP37XX/cK8IZFwQ0q
-otHC9W34t0tdZ9ml2k91Je8SX3TBHxK8QDL7vxl5OhKtsUV4n5ndg2Df2cvlC903
-0uXszIULg2xCJY39qjsk9G8lxKJlpvskdLyWCNVy3iNuKNqBhlcU1ACcv9AiNvXT
-pDSz2m+MMtr+ajnnyq0J+X8Su8ikdMY8qJy6N1CMoAHxFC4OuKF0QSXiBxz9ZWZ8
-unguiQqux0SsUKV46HFeMFw7XBwnxOJeE0pi87Lm7bLIzBoDuLbUPaIhpbjk3vW2
-50ohwnomggkhDsH6ubLvd1w8mqa4gHU3S14BerzNdWUK+kIS5rNjUl25iq+5qJc=
-=81jx
+iQEcBAEBAgAGBQJP63kSAAoJEEdUh39IaPFNxFsH/3y5PSU4rPhuJ4BFn3QVbC0Y
+VJVTlgMGaPzIG+Z+7Q5NJBfDZm4VXmKw/Ck3nyeaMdiO5LcTVJRoLSG20pAeH+2J
+hW0DHStPQXGOC+lzv+NsH/KiUKjDGIJUv7nkHztkCuXKTEXmNDIvoWyMrQgTz+Ah
+0sPaJeuI1kHTTMHn28H1JyOFWAPJVR+SE0X7Cr/y2gCATAg6Jb9Pls5lbXAOZYqc
+7p8S95SoLQzT0F+/tU2jRA8Yx7Fy4bzUHBccNRqANaJOtpGkaH1IfU3EJ24omumQ
+ZVTAPtu+Wey5TjnV84sn/09hy0H0hJpnHpSJiAEKTb+tbNoiC46OEXd/6e/bkTs=
+=fISp
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index 37708a79f4d6..7ae242821465 100644
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.20 2012/06/14 15:18:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.21 2012/06/27 21:25:30 ssuominen Exp $
 
 EAPI=2
 
@@ -13,13 +13,14 @@ IUSE="blender-game ffmpeg jpeg nls openal openexr openmp
 	player png quicktime verse"
 DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}.png.bz2"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-RDEPEND=">=dev-libs/openssl-0.9.6
+RDEPEND=">=dev-libs/openssl-0.9.6:0
 	ffmpeg? ( virtual/ffmpeg )
 	jpeg? ( virtual/jpeg )
 	media-libs/tiff:0
@@ -141,10 +142,8 @@ src_install() {
 
 	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
 
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/${PN}.png
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	newicon -s 48 "${WORKDIR}"/${P}.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
 
 	dodoc INSTALL README
 	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
diff --git a/media-gfx/blender/files/blender.png b/media-gfx/blender/files/blender.png
deleted file mode 100644
index 864a97a294d1..000000000000
--- a/media-gfx/blender/files/blender.png
+++ /dev/null