Simplify handling of iconv USE flag (masked on profiles where it's useless). Simplify blend_with calls (no longer in a loop).

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

3 files changed, 47 insertions, 53 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 34f3da1c4191..216478bf194c 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.229 2012/07/16 09:28:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.230 2012/07/16 11:40:02 flameeyes Exp $
+
+  16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r1.ebuild:
+  Simplify handling of iconv USE flag (masked on profiles where it's useless).
+  Simplify blend_with calls (no longer in a loop).
 
   16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r1.ebuild,
   metadata.xml:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 77b8184723d7..bfbd524b9007 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -14,17 +14,17 @@ DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d
 DIST blender-2.63a-patches-2.tar.bz2 14736 SHA256 4e7d61e0dd9c1d2995d5e049bfeae580395d187d4beaf7148efaee61e3bfb698 SHA512 fd95af280671f6c930fc48dcb6c6aa74f02e5ff2d22c4339ec21155653cb7a66ed98f02d4314f3e6d9460d763bf1a4415f93e2b4c850d635397ba15ed5244c9a WHIRLPOOL eef287dbdfd006e729c41e79105c8937adc6d6139c056bb953937f3e760bc011c881ff03ad1d7c60c6e89ff5fcf63350b0af0cba91a7c2b5614756182305b14c
 DIST blender-2.63a.tar.gz 26759658 SHA256 c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a SHA512 86abf813153da2b0c9974d35bb794ea6df4f933559abf99ffefcffce429d2304c0e04ce91f576f0c8b3394fd4bed05d465602b39f2b0081c62b5ba4e7073b297 WHIRLPOOL 08f26def3c4ede3c50c71c59bccae0ab2fef91e123e31acddb7f2ee42ffed7a6e4c6ac96ad8f66f6e57720c49d35d0ec6d4534bbe486449d1c39eb5eaa379ec2
 EBUILD blender-2.49b-r2.ebuild 5295 SHA256 fd61820a492e3e32875e998d9e310d3431e380d7ec88c9d20ac13adb48d66554 SHA512 ed5e69f8ee020b15772583900e134fe275657e742dc11f82278d6daaaeb8190a790e726deb0e09943e0ac3e0b09d82ebcb7e5a75bef40a8a43b16d7eec70123c WHIRLPOOL 1c2bc098a3f35eb265f91507835c167a6c42c49b12362dc771477111a70d7b28a14d25d87f20ba31f293b6a402fbdc89daffa835ed53c2be43e3913ea438a912
-EBUILD blender-2.63a-r1.ebuild 7704 SHA256 5c88d637250aa5bd2017cfddbd4128ceecb3a2ed99c688e660b5a505378410ce SHA512 adb90cd651fdec84825c3258018578bcf4e23df353664657f22cb3068273a6708f39a728589c706beeb32fca750a6d1acfc788ec5fe383789c1d4c55143931a8 WHIRLPOOL 7ac76a7e925abd97339d281dbd2ef9a307a7a810d14bbec0023b249c551125ea60e3038074cfac7814b31fcf69b7125cbbc64a0fb5855b5795b1d8976edb154c
-MISC ChangeLog 38612 SHA256 d87544aa452d60d55e9f5786db0292fbb2f390152798264d2a81323bb6e159fb SHA512 384d8e30726966ce7d7ec47dc882698ef9696aacb17d7b93e9a9da3222e032461697c03ad76fd92ddf783090dda398f85297a313f5e4abc95f9200a5afc731fe WHIRLPOOL 69e79d8843a26b28fbea7d85b1379cda6537bed6a5ba57f945734dd90174eaa097797f33ebb9ab4dcb31cf7d855d7049e305cbd152776ff3e285d06dc3674efe
+EBUILD blender-2.63a-r1.ebuild 7650 SHA256 c8766a1ee3f07ebaaa2682136f2748558880fce1d6f20b7362fc0cb6455a372b SHA512 402d50928c748493f020067bfcc983a7c9e5adbee01a6c2df9048fde206f832e38955d57ec3ead1bbc17eb851c4e8964d584d2949d40ad53360b13dd535b83b2 WHIRLPOOL 56a00198f81ad7d3004c7afc04e3b3cf4fc06e0a512beb0cbc1ff8aa94c800b9695472a03548afc213e57708c05faa15e1264bb7c0f79c0894dd35341786f4b9
+MISC ChangeLog 38824 SHA256 0039e274cccf01c1e13029a0eb92c38a07dcb5028749dd5220450c72a37acc76 SHA512 0a6c00e84d194c4ef0e29b7ecdb0f18839535c5602b354ae08abed8ae2a374a77eeaee520904e4ed4fe53d12a6306f02bbcd30a61f2c0bf8f4b800098b8c1b3c WHIRLPOOL 0c7d7f19e01fd37a08abd67941137735c014eccb691603f7dedb9bc4cc7cae10b18ab8be370b87cf3289c564db2f67e913c386176c1de614c544b5b7d2a84f65
 MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQA97rAAoJEBzRPIrUMBNCY1cH/jvpDWY20/5XOF3AelVCEgMg
-KGxl1rC45u/sL89z/2k6zOVD/5GgevxUU4Ht2l7QdFcB6MSCL5ZWcx1NFiZONm8w
-Wvkl+8YGSNsj9MYR5kEfky52eMv73lP9ccUgika6klJoXnDQOMVv/GxSxeX5rQv7
-Kr/mu3J6P9LiPypUjHq+0RJeAA48m16jmwb7MNDLatSKTjGVL1px9/qWDCz3CjjW
-be8YhB0AVX6KlKWXpdy/WHxrMcx2b93YhzDA2Qe91QPR1l7S0vwaf3JwNWHFMDLj
-6UUjCFj+06niAumo6wQP4ks/WmByll+wAQvTD0t7sBOEfdlAymnl4HZxMlgiCSY=
-=YaAG
+iQEcBAEBCAAGBQJQA/3lAAoJEBzRPIrUMBNCpC4H/3yoFOQ41crZSWvlqvYwTlkB
+YgNZTahOTMkua5CIKoYABzhKeJBtdpuZoPlEizwFo30U+NjmzcLBMGUMJwN+zTvV
+0tKlTFu6i+bg6AcduhRRy/QbBZ5QMvhOrxMb9R0dpNMXdJ/bgevoPgVbWCdODgtL
++bs4cZQCkvHEV0VDQcIPxMFg/mHg1WqpAXim1CZ7osMC2BjihbWhW7zJj3fo4GEF
+5snjM1PP5XdSgwMnXi4ghjLQh37OZnahMmPGornV+KqDTb8KNJl1Yq90OtkuNkhI
+Vs6h04vqkfvGoUnwz57/Yd/leeb9ORds0DTczjur99o9UftTyWXfQF8mweX2MGI=
+=CZr1
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.63a-r1.ebuild b/media-gfx/blender/blender-2.63a-r1.ebuild
index 677ca7890f1a..6bc3ca0354d7 100644
--- a/media-gfx/blender/blender-2.63a-r1.ebuild
+++ b/media-gfx/blender/blender-2.63a-r1.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.63a-r1.ebuild,v 1.2 2012/07/16 09:28:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r1.ebuild,v 1.3 2012/07/16 11:40:02 flameeyes Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
@@ -56,7 +56,7 @@ RDEPEND="virtual/jpeg
 		media-libs/openimageio
 		>=dev-libs/boost-1.44
 	)
-	iconv? ( virtual/libiconv )
+	iconv? ( dev-libs/libiconv )
 	sdl? ( media-libs/libsdl[audio,joystick] )
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
@@ -111,11 +111,6 @@ src_prepare() {
 }
 
 src_configure() {
-	blend_with() {
-		echo "WITH_BF_${2:-$1}=$(usex $1 1 0)" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	}
-
 	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
 	# shadows, see bug #276338 for reference
 	append-flags -funsigned-char
@@ -124,7 +119,6 @@ src_configure() {
 	local mycflags=$(printf "'%s'," ${CPPFLAGS} ${CFLAGS} | sed -e 's:,$::')
 	local mycxxflags=$(printf "'%s'," ${CPPFLAGS} ${CXXFLAGS} | sed -e 's:,$::')
 	local myldflags=$(printf "'%s'," ${LDFLAGS} | sed -e 's:,$::')
-
 	cat << EOF >> "${S}"/user-config.py
 CC="$(tc-getCC)"
 CXX="$(tc-getCXX)"
@@ -165,6 +159,8 @@ BF_OIIO_LIB="OpenImageIO"
 BF_BOOST="/usr"
 BF_BOOST_INC="/usr/include/boost"
 
+BF_ICONV="/usr"
+
 BF_TWEAK_MODE=$(usex tweak-mode 1 0)
 BF_DEBUG=$(usex debug 1 0)
 
@@ -183,43 +179,37 @@ WITH_BF_BINRELOC=0
 WITH_BF_STATICOPENGL=0
 EOF
 
-	#add iconv into Scons build options.
-	if use !elibc_glibc && use !elibc_uclibc && use iconv; then
-		cat <<- EOF >> "${S}"/user-config.py
-			WITH_BF_ICONV=1
-			BF_ICONV="/usr"
-		EOF
-	fi
+	blend_with() {
+		echo "WITH_BF_${2:-$1}=$(usex $1 1 0)" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	}
 
 	# configure WITH_BF* Scons build options
-	for arg in \
-		'3dmouse' \
-		'collada' \
-		'cycles boost' \
-		'cycles oiio' \
-		'cycles' \
-		'dds' \
-		'doc docs' \
-		'elbeem fluid' \
-		'ffmpeg ogg' \
-		'ffmpeg' \
-		'fftw fftw3' \
-		'fftw oceansim' \
-		'game-engine gameengine' \
-		'jack' \
-		'jpeg2k openjpeg' \
-		'nls international' \
-		'openal'\
-		'openexr' \
-		'openmp' \
-		'player' \
-		'redcode' \
-		'sdl' \
-		'sndfile' \
-		'sse rayoptimization' \
-		; do
-		blend_with ${arg}
-	done
+	blend_with 3dmouse
+	blend_with collada
+	blend_with cycles boost
+	blend_with cycles oiio
+	blend_with cycles
+	blend_with dds
+	blend_with doc docs
+	blend_with elbeem fluid
+	blend_with ffmpeg ogg
+	blend_with ffmpeg
+	blend_with fftw fftw3
+	blend_with fftw oceansim
+	blend_with game-engine gameengine
+	blend_with iconv
+	blend_with jack
+	blend_with jpeg2k openjpeg
+	blend_with nls international
+	blend_with openal
+	blend_with openexr
+	blend_with openmp
+	blend_with player
+	blend_with redcode
+	blend_with sdl
+	blend_with sndfile
+	blend_with sse rayoptimization
 }
 
 src_compile() {