Re-apply patch from bug #505188

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

3 files changed, 56 insertions, 50 deletions

diff --git a/media-video/imagination/ChangeLog b/media-video/imagination/ChangeLog
index 2047c49a1368..a8cdd0c3c1de 100644
--- a/media-video/imagination/ChangeLog
+++ b/media-video/imagination/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/imagination
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/ChangeLog,v 1.5 2014/04/02 18:50:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/ChangeLog,v 1.6 2014/04/03 19:47:41 hwoarang Exp $
+
+  03 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  files/imagination-3.0-cflags.patch:
+  Re-apply patch from bug #505188
 
   28 Mar 2014; Markos Chandras <hwoarang@gentoo.org>
   files/imagination-3.0-cflags.patch:
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index ed06eb979fd3..7c0206d51c1a 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX imagination-3.0-cflags.patch 937 SHA256 ee37c0285cf66ccb2c4381d847e19b2bc246b47f8844ba20a44dd4bc7c29a069 SHA512 1d1bad1ea36ab14cfebb1efceca20429f31968cb5ea50934a21f59e74b36d92a723aede1788a6777eb40ebdf456d8b8b039e881dd3c91f3483abf7aeae2c4f65 WHIRLPOOL 148b0d32efc5ee7b86d3314517c78bde646a8b75e12c16fd2a54fb8b951853d405706ee51f5e5067d99e689099ac0c81ac1d02d4e759cf721dda531cc35801a6
-DIST imagination-3.0.tar.gz 3327784 SHA256 417d8586d9c85109b87d30b9c196d63531a637cbc2ffb3c12b48a873bfcb4b1e
+AUX imagination-3.0-cflags.patch 834 SHA256 9816dca396536b0c7f4366dbce52c2a8f1022fb40b1952ebf939462375f3e16b SHA512 0afdeb7b3b4b25c08180eabe74631d3689a7eeff8a4f8ca930d6c093d75c29ae8e6c31fc82dcac65ba4dd5efaff21e64114ef8e7218e379845c8dd72aaa93369 WHIRLPOOL c9f97442e3f11385c9dcd0900482baf388f183c2e139ca540d5903bcfdf34ed3f6f2c0dd36b383954344cecc9e8b58d926bafa7672951d16aa9109a9ada36b6b
+DIST imagination-3.0.tar.gz 3327784 SHA256 417d8586d9c85109b87d30b9c196d63531a637cbc2ffb3c12b48a873bfcb4b1e SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8 WHIRLPOOL f091ea5d65b79cdd2b74cb330a91b9da3b707e0f775af4aa9f0d523e414705fce25e630d32f4c4b6433068a0ce61d48352fa61842b8e736233a6c3eff2a897e7
 EBUILD imagination-3.0-r1.ebuild 1121 SHA256 fa0e88e1c59e366f8934391200f421c1b187064e872a70b3aa61ea67a69f3f50 SHA512 7146ec915dc80c257bb2cef68495e17be5332d9ff8452f6915f9b86a26909092580d0e7f6b253879626e2db74d5d897932bdf447332a01a896e53fb64d197fdb WHIRLPOOL cd934b7daf1bae3c1d3a6a6cfd39d615e2045fb177e2a251613966a7fd487125e98cdd2b1ef34577a262a1b0392e2a13ec91052308f5119a01d9a0b0c22d3f94
 EBUILD imagination-3.0.ebuild 840 SHA256 5e39489d8327af8ab24604d69f10ff8a62ccd6778ca305ed4260090ec780c3d0 SHA512 d1e9825aefeb61d0201ec382e46f36b98f335fbac28588b6836b63fd35806ab5b48e19808b0fa9129789581299e04bf6a50f08077787cd94320658b025218881 WHIRLPOOL 2a84736e8fb6f7a677c44e83439006b931e285a481f50881faca6cddb7e43c763f23e39b310a34fd457a0942cd098f33af4cdd052ca3c44885b66de293445445
-MISC ChangeLog 1075 SHA256 af9c01fe9b9a516aeed7bb754ca1b04c718ac7608a14e94399da207682d422cb SHA512 94678d25139ce93d56e9dd3cc43beebf827a25f2c19fd875fa83be7c3bdf1588aa6b2d42b9a36aec39278076d920814521c1346864e18e54d7a004bd630ded32 WHIRLPOOL b6ecf9f8beb139e8c56089675de281e952b19316f085eaf9fe3b69f7dd319912cceb3dad2f98ff29e4abc5d7e75c9f55b39a8e75bbd8fc9a47c51cbfbb4aa629
+MISC ChangeLog 1201 SHA256 933f2ca6d28798b948b14ec8e2f9decf89fb762cebc6c9cc7b888270e760c0c7 SHA512 f09a29e8d47c9ef1d8ec185ac05edeec624f7ade69d9afabf1cf259bc8769d42622a60453fe206cfbdae3d27c463772f59846cff75f1c7d7d2426d40bfdab026 WHIRLPOOL 3b376badcb8b2dbf1deed52b16228d9b37c2550f4458951e0e647931d786d7fc1587bfe24081b25b6f6f9c116ce9170856200b12d86236b303faf77261f8a4dc
 MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTPFuoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTPbqRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88tPsP/1HLcC+GmKcEymDgeSYPSfJe
-y75CwvqCQpJjtwOiCm8l8gKXrk1/bWlL6+vzjFrEfupN8h3eeZuval3xfT/etabb
-UO0+ajiQbEr/+AE/x0MKfcmWZRNujBgu8DyNs/386GyxpqMSt++8+ViHUF6E3Qch
-x5KdnxZnEap86a04ZiuNoA8pJPagORtlIY8qRvZzMlggPEhLe/fZJeN3nFQG2ZgI
-GVe5purAxeHuEsGOt7XvnRtr6sZfIr/Y5r8TrSohkwm8YkyQ/Ljwy13t2622z4T9
-U5FMjRyDgIto9V6JXaJtj+3r/lckjjuymeCqHZD2ec26dai4Xa+lN2YJFo1NnOYQ
-rvnhxqj1X9iUTimPt4MdMh3AQQEx/8k7nbx0Wuqu4AUmdJ3N0tqv0O7U/DNuY3gC
-RBp2f3n7IovXem1wPdbH1n8MC7680n/pK8+KoDlcQF8ZeBiKTLcTHCNIHDICaVIA
-MN6lCepzB2cT1FNu3vPWGI7DuMWbGKbmVmI370XpYD63MpdwUECnBxs7v3ML+Roa
-a6coSgrqkuJbSgoSsHj4h7BfjqD4tqNW8vjMpeQonGzshqADOV1lZxAkVTxxsOO+
-uA3PK6ltahOk5dLwmTMocn2WN908n5L3QRz+++6NVJvLgHtgO7SiDItOXUmE84rG
-Gy1hBKjD+4/j6QqmCHOM
-=g2fd
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88qocP/RqZrWlgc7K261jeCsU3XWBO
+tyElAIn5m+PGzaCO/8/zy3yU9so3aK6zTt5oYbZ0FniKvh5xI9ABA4mbGcWQVwOF
+NScdwiLkqO0bkf1ZEBr65vzUBawKxKCQh0BeBRZaKo+Wbd6g1hEZDS3TEt+qKE4C
+wkCnkt1lIw/fL50rJXST0anVBT/tWYELzBlaxA6mptrn0wUhPGLev179YGYBaogr
+CG/K7XVBRR18YKF5Yq1z9HORzD0FlAbqCPJsqZANJjdgEoUtqvrju0xX9uC9qKji
+s/u7nzg1jGsfSAdV5ukTBCYkU4BVgYe0Wygzq5X3zTJ6766dvnBOV+GCDzVlHZnr
+zVxXTbw8EsoCOpoIvaCrm8Oyw004djk3KCXeQx6nNm3KNuaMm+6eq0sX9+171p23
+SeZkDr7nvvhLK9QxoMZibDj2rX0EfZr9bOMrobYtq+V6AYbBmds6QbWMJy4gcEP8
+GWDl3mH/VcObi3qE88OOc6f3tU8Dt9wlYKth0oaVm7utY+YvLBLiskaJ4zRsmXb+
+UKEFGuDSTTZ3hOgU67IbeX88sRZSmWG6U3suCXL3b/lTcTTQu+1S/fRrUKOGeVKm
+XV0/EXSQc2JFsG/0uW/F1zMxlz/BOduhzwlBMJBjm55m1GpFfJ+IHxDuwFftG2Yf
+X49njiW6Kge8WYUiJRSF
+=Z7gy
 -----END PGP SIGNATURE-----
diff --git a/media-video/imagination/files/imagination-3.0-cflags.patch b/media-video/imagination/files/imagination-3.0-cflags.patch
index 03e72626cb13..1b38a9aeff71 100644
--- a/media-video/imagination/files/imagination-3.0-cflags.patch
+++ b/media-video/imagination/files/imagination-3.0-cflags.patch
@@ -1,32 +1,34 @@
---- imagination-3.0-cflags-old.patch	2014-03-28 21:29:05.208684625 +0100
-+++ imagination-3.0-cflags.patch	2014-03-28 21:42:45.880726226 +0100
-@@ -5,7 +5,28 @@
- index 0be7802..d19c8ec 100644
- --- a/configure.in
- +++ b/configure.in
--@@ -46,7 +46,7 @@ fi
-+@@ -24,7 +24,7 @@
-+ AM_PROG_LIBTOOL
-+ LIBTOOL="$LIBTOOL --silent"
-+ 
-+-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
-++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0"
-+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-+ 
-+ sox_modules="sox >= 14.2.0"
-+@@ -33,6 +33,11 @@
-+ plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0"
-+ PKG_CHECK_MODULES(PLUGINS, [$plugins_modules])
-+ 
-++dnl Check for libm for sqrtf()
-++AC_SEARCH_LIBS([sqrtf], [m], [], [
-++	AC_MSG_ERROR([unable to find the sqrtf() function])
-++])
-++
-+ # get svn revision
-+ REVISION="r0"
-+ if test "x${REVISION}" = "xr0"
-+@@ -46,7 +51,7 @@
-  if test "x${REVISION}" != "xr0"
-  then
-  	# force debug mode for a SVN working copy
+diff --git a/configure.in b/configure.in
+index 0be7802..d19c8ec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -24,7 +24,7 @@
+ AM_PROG_LIBTOOL
+ LIBTOOL="$LIBTOOL --silent"
+ 
+-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ 
+ sox_modules="sox >= 14.2.0"
+@@ -33,6 +33,11 @@
+ plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0"
+ PKG_CHECK_MODULES(PLUGINS, [$plugins_modules])
+ 
++dnl Check for libm for sqrtf()
++AC_SEARCH_LIBS([sqrtf], [m], [], [
++	AC_MSG_ERROR([unable to find the sqrtf() function])
++])
++
+ # get svn revision
+ REVISION="r0"
+ if test "x${REVISION}" = "xr0"
+@@ -46,7 +51,7 @@
+ if test "x${REVISION}" != "xr0"
+ then
+ 	# force debug mode for a SVN working copy
+-	CFLAGS="-g -Wall"
++	CFLAGS +="-Wall"
+ else
+ 	REVISION="-1"
+ fi