fix USE dependencies for media-libs/gd wrt #368443

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

7 files changed, 23 insertions, 18 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 061e7a6fb355..2416576b4675 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.280 2011/05/19 08:28:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.281 2011/05/24 07:08:12 hollow Exp $
+
+  24 May 2011; Benedikt Böhm <hollow@gentoo.org> nginx-0.8.53.ebuild,
+  nginx-0.8.53-r1.ebuild, nginx-1.0.0.ebuild, nginx-1.0.0-r1.ebuild,
+  nginx-1.0.2.ebuild:
+  fix USE dependencies for media-libs/gd wrt #368443
 
   19 May 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.2.ebuild:
   bump cache_purge module to fix build after nginx-1.0.1
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index bd59c3bb98ce..0527c1936f8c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -18,10 +18,10 @@ DIST ngx_cache_purge-1.3.tar.gz 6434 RMD160 d9f5d225b99f3164e80a85b7c7b4bee8bb16
 DIST ngx_slowfs_cache-1.5.tar.gz 9785 RMD160 3e226531c01c33f1d102fc046ca7917ad9592101 SHA1 db7929f401c733d9d2a5a25ef07da1c3c4090daa SHA256 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
 DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed505c14 SHA1 dbb2f3346061872a43efc554990d8993172c8ff9 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
 DIST passenger-3.0.1.tar.gz 2958200 RMD160 abf9d25c1d91ba44e6468f186d0e9d2569428842 SHA1 2801e35043ea43d6fae5677a7c36bc43b6fc017e SHA256 765b5528f23a5f65f2cc4b72f2e90d9b93ae777dc36a1f7b6d957b39f3cd55cd
-EBUILD nginx-0.8.53-r1.ebuild 10606 RMD160 64a2971e97c42a1168bb1885a4745d51e29fa624 SHA1 26fbe692b561528e4fe8264ac2091a0c203a259d SHA256 c9f6d6f7e087b5624e073acc70fd7b64c3351483d0ecd28429b2a980fa70f5f6
-EBUILD nginx-0.8.53.ebuild 9995 RMD160 28f8c8fdf47322ecd0bceab07804a1d2f0f4a433 SHA1 7111e7a41e5aba26ae31e854747982be77487e8c SHA256 a9eb0c9e7c0e9020a78645b119287807b4af8aae55d8097d9e74702fd690217f
-EBUILD nginx-1.0.0-r1.ebuild 11216 RMD160 1bd16eae00c139f82f9985d28d0e903713a937ae SHA1 bf3f4dc9eeb9bad02f9c4ae457b3f74d6d8183d3 SHA256 711daf2672b728522dca2d492aa82d22e36ac73065998601287c2f36bcef4fd6
-EBUILD nginx-1.0.0.ebuild 9745 RMD160 33c952be70ae5c93a57a3dbf5daa49b8c2467a9e SHA1 1f44c5aa2d9bdd9e92ad8fe582682fefbbdea8b8 SHA256 845d5464d4280cd598f3906b0fce53db640e188e0e2d715c2deb003eaeac1c77
-EBUILD nginx-1.0.2.ebuild 11213 RMD160 5a1363d2b8be2ceef605b3035ac4c16df178867f SHA1 91f9d4d99ed99202e7a9d5e0a408fe9c2b58a57d SHA256 087a1787ae8cd2f7a6e9c2fe93fc622c7526b353a737b0dfa5f82463892250c2
-MISC ChangeLog 45835 RMD160 dc74412c4bd8fe67237e4a1e685aa97b15faf2c6 SHA1 f6aa37137e34afea00ff648ecc92e6b696b71bdf SHA256 a3bea9a0ceae0ad569529f07ac99034105f7d7c515c53fef39db69e93cef2701
+EBUILD nginx-0.8.53-r1.ebuild 10614 RMD160 31076e4fa4edacd006c95083f636f0b51ada60e2 SHA1 14b7bae0a2361e2d0b9eb3795020e570c216b339 SHA256 75fe08e1d368064cb0a0b5eefc08c5dbaf69caddaa30b3eb4b2ddce7e74691b2
+EBUILD nginx-0.8.53.ebuild 10005 RMD160 c64c36257748f4e8edbe55947d0dc6038cb84964 SHA1 4b4110cfc0f8ff0423fb002ae3a34d7c428c45c8 SHA256 fc95d25bc4daeb1bb1323d790895b0e47f73eafc4b554bc5a737e490a72f5c07
+EBUILD nginx-1.0.0-r1.ebuild 11226 RMD160 d0c66a01f980efbc2d8c23e023b61418c7f4da45 SHA1 b1b2e665b5b7e0958a1dde9e617fef4d3606d166 SHA256 106115c45f0d41d775418daaba55967f81ffa782293a7aeb2143b81387c60d28
+EBUILD nginx-1.0.0.ebuild 9755 RMD160 81052de6debe92ef7ad3bb3bbe755091961f65f4 SHA1 d0d0f5672f7b1e7c1caccdfaed609ccfa201de87 SHA256 ef65f6406193adaf3dbbf68ebe013b5d5f012072d0882b4e7605eb53ef502d3a
+EBUILD nginx-1.0.2.ebuild 11223 RMD160 7dccc70986c83eae0b5d73f22ece6462fcd81ead SHA1 8c88fb1a7a0c7a009ae00e8212f8d4397a14f041 SHA256 5ef4018cc2e65aa61f375b12f99a3b6c1179f28f3f42aef5eabc17a11138024e
+MISC ChangeLog 46051 RMD160 2494a4c4c7cb26af755017e2962890f6df89565f SHA1 0f4481f7bbe12eb6129f5728034e60578e286c8a SHA256 c10517effe84c717f1fa0cf973eb9acfe04dca51b4a9a17cf240e1cfe53051a7
 MISC metadata.xml 2292 RMD160 7f4fcccb4e9a6b603f0459d43a45ca3be0fa4f53 SHA1 0a59c780ca02dd1db34dbb2aecb6220d3b4567a7 SHA256 0f31896a536f46c66c248a89ce24fdf662989ec6bef15ad053b652dff4b4e369
diff --git a/www-servers/nginx/nginx-0.8.53-r1.ebuild b/www-servers/nginx/nginx-0.8.53-r1.ebuild
index e43f9e026a2d..bbc60f4beb34 100644
--- a/www-servers/nginx/nginx-0.8.53-r1.ebuild
+++ b/www-servers/nginx/nginx-0.8.53-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.53-r1.ebuild,v 1.1 2010/12/13 10:38:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.53-r1.ebuild,v 1.2 2011/05/24 07:08:12 hollow Exp $
 
 EAPI="2"
 
@@ -83,7 +83,7 @@ CDEPEND="
 	nginx_modules_http_geo? ( dev-libs/geoip )
 	nginx_modules_http_gzip? ( sys-libs/zlib )
 	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
 	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
 	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
 	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
diff --git a/www-servers/nginx/nginx-0.8.53.ebuild b/www-servers/nginx/nginx-0.8.53.ebuild
index 50162afbaef6..3b5b7e753510 100644
--- a/www-servers/nginx/nginx-0.8.53.ebuild
+++ b/www-servers/nginx/nginx-0.8.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.53.ebuild,v 1.4 2011/03/05 00:59:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.53.ebuild,v 1.5 2011/05/24 07:08:12 hollow Exp $
 
 EAPI="2"
 
@@ -83,7 +83,7 @@ CDEPEND="
 	nginx_modules_http_geo? ( dev-libs/geoip )
 	nginx_modules_http_gzip? ( sys-libs/zlib )
 	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
 	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
 	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
 	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
diff --git a/www-servers/nginx/nginx-1.0.0-r1.ebuild b/www-servers/nginx/nginx-1.0.0-r1.ebuild
index fc0511bde524..e1ec142c39d4 100644
--- a/www-servers/nginx/nginx-1.0.0-r1.ebuild
+++ b/www-servers/nginx/nginx-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0-r1.ebuild,v 1.2 2011/04/19 06:50:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0-r1.ebuild,v 1.3 2011/05/24 07:08:12 hollow Exp $
 
 EAPI="2"
 
@@ -95,7 +95,7 @@ CDEPEND="
 	nginx_modules_http_geo? ( dev-libs/geoip )
 	nginx_modules_http_gzip? ( sys-libs/zlib )
 	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
 	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
 	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
 	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
diff --git a/www-servers/nginx/nginx-1.0.0.ebuild b/www-servers/nginx/nginx-1.0.0.ebuild
index 5c61da021734..df8320b8cfc0 100644
--- a/www-servers/nginx/nginx-1.0.0.ebuild
+++ b/www-servers/nginx/nginx-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0.ebuild,v 1.1 2011/04/12 11:32:57 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0.ebuild,v 1.2 2011/05/24 07:08:12 hollow Exp $
 
 EAPI="2"
 
@@ -84,7 +84,7 @@ CDEPEND="
 	nginx_modules_http_geo? ( dev-libs/geoip )
 	nginx_modules_http_gzip? ( sys-libs/zlib )
 	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
 	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
 	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
 	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
diff --git a/www-servers/nginx/nginx-1.0.2.ebuild b/www-servers/nginx/nginx-1.0.2.ebuild
index ace4294000a2..13e30c832cd5 100644
--- a/www-servers/nginx/nginx-1.0.2.ebuild
+++ b/www-servers/nginx/nginx-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.2.ebuild,v 1.2 2011/05/19 08:28:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.2.ebuild,v 1.3 2011/05/24 07:08:12 hollow Exp $
 
 EAPI="2"
 
@@ -95,7 +95,7 @@ CDEPEND="
 	nginx_modules_http_geo? ( dev-libs/geoip )
 	nginx_modules_http_gzip? ( sys-libs/zlib )
 	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
 	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
 	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
 	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )