Lower the media-libs/giflib dependency since multilib support was backported.

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

4 files changed, 26 insertions, 22 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index db89f859a7cb..d18df512f88e 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.125 2014/06/23 14:11:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.126 2014/07/03 20:26:03 mgorny Exp $
+
+  03 Jul 2014; Michał Górny <mgorny@gentoo.org> imlib2-1.4.6-r2.ebuild,
+  imlib2-9999.ebuild:
+  Lower the media-libs/giflib dependency since multilib support was backported.
 
   23 Jun 2014; Michał Górny <mgorny@gentoo.org>
   +files/imlib2-1.4.6-out-of-source-build.patch, imlib2-1.4.6-r2.ebuild:
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 916920feb1eb..1cde20c0ebba 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -8,26 +8,26 @@ DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866
 DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c
 EBUILD imlib2-1.4.5-r1.ebuild 1777 SHA256 0a31e394a6f507a23757023afc933894eab79cb20d6f5a96d5a988e086d04bb2 SHA512 f204428f402c698bc0cdca2985aa8746551faa3e880a938a754d38fa6ae03b4c24b819d59df3eda542d518dc1ef0b06f82543df224ec8387c7e450ab7eee1608 WHIRLPOOL edb8d980511245bfe35d5e1429bb00476ebd542b0746ac752a8c516a36505d9611ee4c21c8a3289f2ebdf1fafe6de4c8bc5bacdc98ee8b67b22c9669fdfd266b
 EBUILD imlib2-1.4.6-r1.ebuild 1774 SHA256 f27cedffadd9768c0b5ff4d1f8d5cb9653c1cd94fd380afaf940c233951f7479 SHA512 c4b133b05da40487a326f21456bf47ef83c25b108fd068556ed4144aecf2e0fec91ca2da5f6d30568c5d7611447b371aad3e4cba488bb4c89a0d0ab8f2094ac1 WHIRLPOOL 8a2aa70271484a4024fa64f3b1849a5ed9717254da1f58c92052b9a10f112b68e5a28e652059d5d58ae4260537a82cf60ffb7cdc5b0f18da1d0a5f74de236854
-EBUILD imlib2-1.4.6-r2.ebuild 2321 SHA256 6281aff9add074335d21751547fcf8e9fc75049d4d5dd06243b7de9139875dfd SHA512 2ee8dd44fba5963afa90597eee4f7134686cdc1828f319b8f82c5e780d3570dffd5f0334a5c903efc03bb964fa2c31ee3d4f08a56179688197d7e77a80329aad WHIRLPOOL 5ec445c25f613ed284609c2a229dabd5784645dde8d07da3b98704694f25a0c435e7483d5164dfc063f1bc1f05ed58943dc8ef26de588e4e8d7fd899968b1760
-EBUILD imlib2-9999.ebuild 1948 SHA256 b9b2c90caccfbe56962a439b0735289c734246ce9f897d481d12c11e939bb3c4 SHA512 4b0a2a9e2d48aae6fd6e480fcd5e651fd2c0a5a168283cd6a3c4825780366a8a13a96e2595cba0f25131bbe8d8932a2bc3e4dfa1960c6135d3128d492e99589e WHIRLPOOL a878038eea3e97a1a8874d5fbd28e07ee328400f740079798873d9047d7a955f32a64746cbc14adefa782f230ff3e7a39dad30ac617a75879f8e0ba480eb40db
-MISC ChangeLog 15681 SHA256 caf1e7e29af7a51b92ff66c4e0cb94bd5efb6745c3bfb4d735a376451f8f9bfb SHA512 4cd9c9a2de957b683b48676d75a047311446bc08b87444beddbc228fda4470139f353153681cba170dda47a019cbbb1b3dee5a777cea4415b7cab6117ba0b495 WHIRLPOOL 83b48dc9814b503efed94c7df06d24f3daab732ad72588902ca1442c7436572ac66279ff4fba31354f0aad6906ad1098463cacf13e6b47192d279bf925e732ed
+EBUILD imlib2-1.4.6-r2.ebuild 2324 SHA256 a0d443f314c5c8d965ddec9a522a61976a6e709d6df1cc59f7638d4a5f0a6d0b SHA512 414e5a68a9034aae65638a53e4db82885735b778b85d4821fafbf4ee818c8bf4097f174d19defdfff5b35e12812387bd088be20ec955f7af2bae9560b1f92533 WHIRLPOOL 844db2544e67a2f78f03b2ac8022c3cd4cd71fa5c18f1ceb7eb4f162b88831a16d1a40303624c8ed867bf80dfa7f67dc612512f7169ffdfc485491da8eea559f
+EBUILD imlib2-9999.ebuild 1951 SHA256 da015b2e8a4bfcc1632743c3224de4ebbf776bb1c201efe4f5004f1eebee3faf SHA512 f10b6ba36f0d4a53cf4030b565acf58f9f23295d9505813cb99fd6364896e95b9a67b701513f8967b7476f088310b7bed164dd2301d0a31e21254d1d49d521ef WHIRLPOOL 3ed8a647aadbf359b7b90da573e840631dff860148f8ad17b491597065056dd6335f94075f76a953b0fbb8bf734f70ebfd7f3f206ce537d33d7f0f150f7ba577
+MISC ChangeLog 15858 SHA256 065922504e9545c53ebbccdcb594332f5623adb5789f64d941335f45f4b79de3 SHA512 9068b89c4b1ace6dd323143bd564f795aea83d295685b749a91a6fce56cafed6b5c7df1db32810371d9ef0859e42d71e4701cf0a681c72f58c358645cc57a101 WHIRLPOOL 9d6f213f6794f158f70e738f548506fea9070a65d28c6c186a561c71ac2d0bff2b8b603dc2b76e692ceaf605a2f09ac0002437735f97f63b0a4b4f6a09e308f4
 MISC metadata.xml 2200 SHA256 343b4e61546c7f2a89249bd63c4018975cbc53bd8622d641d27dc05f8aa5235a SHA512 1993bd9088534da0122db66e83017259423f79f4dd9de442f4f4dec6fe4398979813ae83f0a7640630da1f6fcf2b8ab59d64ed5cba09144cd243f232618501f1 WHIRLPOOL bbd8aafa47c63e0b32b888e89a62d321591a2c43ea0b3d816206c62f2a0381de89c554a84479727a281957c8b707175c8b125c47135ccf17d707928cadc51ff8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTqDWrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTtbxdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCzUQAJcRNJOk6dyAU8F7NFGCnkH6
-jVx/KLVqLY3W41V6QRNvB+kGBIh/6D2JqNi77pcUTSzyKeJ0FbxM/DIlzY/Q6JA/
-yp2TxInJB6jfXKBoTIOTAIwIpY7HdqMlXTzHtVT8K59TcPHazjLCrFWrWWk/1cI6
-pM6UvXMJF8cDnr7m/Qyh15Lun46rYxcuUuzCyHMyeTXmnAwgpRYiranA2MyWfZAe
-rE5th/hHI1HHaafCdEPM76a51NRzvMS1E/eVKUKUTgg33+bB0Ux5/5ZdGdpsymVK
-7lij2iWjwfYPYBC8J7jQEV2BRtpQ/I2A6vlIfJJ0RasLXfjcfh7ddvV/5lgC+Hsc
-irEK3QzwvlOKqd1shOACqVDjEuDB2eTKcqaUBrb/zSDilUSROfDZ6wH0k+qfwVDv
-ybRE1gmZJBg9Qgna9Q+Ka+cmSjcwK5hNVobWZ+KfI09oG4REkFtTqPk1WHoWRfCK
-LghQuWIeNoUzIoC1ZC9rGxigOdNRdVbyzZOZ6CzCCYFSyYU5pYpOg3gwA7kX4gUE
-nmKUm14qVR2fN9nrENK4kP1Kxf95zYPUCrrP0NQRreutCAJ1c/sVODYfyB3uCQt1
-XFUMjhq8jzaBJzhhy7PaZ52lVCsmiemnfbDhwy7kzLPQ18p13QfGfzEhq4GR/ZhH
-zxFfZt99JfC0gGvRvtE1
-=ScRT
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOr44QANZgDRHcKz5VSIk+ueufoUPh
+w9AemZhevnLHT8TSSJLvKaelTyihgzcUeuzyEg/+bK/QSBWRg+vS+Bm+XSjV1/St
+IMJmUEFfYr5hPgMlMCCiH6ke68MTwax+MmlH+VPYkNnh0OXEt7xo1G4nuJDkhdHt
+n/neJ/G4RvrCh2jQdAqzGuROX+uHG9yN9FOj0ExKPq+dl/slsXIJXi+gELNVZmkL
+Hvb1LOPg1cCaRGO0wjcBPFiuOj3Ahitpg96jo+VKMs67q7g92z8vHhb3BohDQ9bP
+MO7NpacPGu8Z+PRetfj8JyjaCr+H8nmP69XDo+DR/LBjKlucjj6jdxQcHuuZMN//
+0LwSd99PlCBV5zDojF1juXCxV0Nzud1E8xC1OOhbv0BQ6StfgYitzg1izCnvEzn/
+O/95kOOW/RlQpZjfBsMdZhgPJcRLsVpcBX+N3YLTYZHbsTQsZLXoeRGCuW/p+2Ji
+Nf0Cs+rNHV+8uPlFvMyJ8VJdtNFKzN3nqKfL/R7wInoLWvizJSwAmB8Qah71Vlty
+LkjbX/OoapadgpGRpOKR5s8mySgokmwdCah2/qYAGUy9UkfFKvAGEM0BAO3RcsM9
+iWr83BkRGISDvd3sboRlpaUB/VL4RSlhCtKndyU/jL4MzxvKReUwbKMGS2qHpOS4
+LxaqcJn2MpV1d/4V13NB
+=/H0a
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
index 6224ecd80807..6b200c8dd30d 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.4 2014/06/23 14:11:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.5 2014/07/03 20:26:03 mgorny Exp $
 
 # NOTE!!!: to avoid masking of -9999 the
 # package.mask entry for multilib version
@@ -26,7 +26,7 @@ IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	gif? ( >=media-libs/giflib-4.2.3[${MULTILIB_USEDEP}] )
+	gif? ( >=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 39931baec5b9..7f64169939ee 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.20 2014/06/18 19:35:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.21 2014/07/03 20:26:03 mgorny Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	gif? ( >=media-libs/giflib-4.2.3[${MULTILIB_USEDEP}] )
+	gif? ( >=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )