diff options
| author |   Renat Lumpau <rl03@gentoo.org> | 2006-07-24 22:14:32 +0000 |
|---|---|---|
| committer | Renat Lumpau <rl03@gentoo.org> | 2006-07-24 22:14:32 +0000 |
| commit | 84460c0b198d9d73ddbe9deb10d6d771e2e663f5 (patch) | |
| tree | 52c1db8fcb62c75d268690b53892499649cb013a /www-apps | |
| parent | Added media-sound/mpd-svn:fifo and media-sound/mpd-svn:pulseaudio (diff) | |
| download | historical-84460c0b198d9d73ddbe9deb10d6d771e2e663f5.tar.gz historical-84460c0b198d9d73ddbe9deb10d6d771e2e663f5.tar.bz2 historical-84460c0b198d9d73ddbe9deb10d6d771e2e663f5.zip | |
Better detect PHP use flags when USE="gd" (bug #141343).
Package-Manager: portage-2.1.1_pre2-r6
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/gallery/ChangeLog | 5 | ||||
| -rw-r--r-- | www-apps/gallery/Manifest | 22 | ||||
| -rw-r--r-- | www-apps/gallery/gallery-2.1.1a.ebuild | 29 |
3 files changed, 41 insertions, 15 deletions
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog index 9974bf7bf094..a91c312e2787 100644 --- a/www-apps/gallery/ChangeLog +++ b/www-apps/gallery/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apps/gallery # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.95 2006/07/09 21:55:17 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.96 2006/07/24 22:14:32 rl03 Exp $ + + 24 Jul 2006; Renat Lumpau <rl03@gentoo.org> gallery-2.1.1a.ebuild: + Better detect PHP use flags when USE="gd" (bug #141343). 09 Jul 2006; Renat Lumpau <rl03@gentoo.org> gallery-2.1.1a.ebuild: Add php checking from bug #137490. diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest index 019e8c52ed75..3120f96a0fff 100644 --- a/www-apps/gallery/Manifest +++ b/www-apps/gallery/Manifest @@ -29,14 +29,14 @@ EBUILD gallery-2.0.4.ebuild 1124 RMD160 a7f827de37211dd4f91bb6ed0d0381d363b5ca20 MD5 f5ed4b5a047d5eba47f5e7020e55a955 gallery-2.0.4.ebuild 1124 RMD160 a7f827de37211dd4f91bb6ed0d0381d363b5ca20 gallery-2.0.4.ebuild 1124 SHA256 bec8886a6845e2e45cc1436752f2e98db7a80463d15232a455d8a93b5c18e8f6 gallery-2.0.4.ebuild 1124 -EBUILD gallery-2.1.1a.ebuild 1794 RMD160 4ea56706e8e60d48d7edbd35ab46cc69397a188e SHA1 bb9314838e53c905377b3b28589399fc74ac6db6 SHA256 d8e9f7a116e55dadd0414ae824ae8d309d6041548c1ae7e710208a75bc33801b -MD5 b20b22f9e6d16b2f09c1cbbe96c4d1a4 gallery-2.1.1a.ebuild 1794 -RMD160 4ea56706e8e60d48d7edbd35ab46cc69397a188e gallery-2.1.1a.ebuild 1794 -SHA256 d8e9f7a116e55dadd0414ae824ae8d309d6041548c1ae7e710208a75bc33801b gallery-2.1.1a.ebuild 1794 -MISC ChangeLog 16305 RMD160 f535e56d28532971ec27d2fa0c1a7b86fa749fef SHA1 f2fd6158ac67b632b5d25a6b673f7c4582d469d5 SHA256 90b8b11eb4ecd12f96f57f05fab45ef97388ac2e7faaddafd50a904718c83072 -MD5 f7f419f14bf392cb32d6ed60c8a29171 ChangeLog 16305 -RMD160 f535e56d28532971ec27d2fa0c1a7b86fa749fef ChangeLog 16305 -SHA256 90b8b11eb4ecd12f96f57f05fab45ef97388ac2e7faaddafd50a904718c83072 ChangeLog 16305 +EBUILD gallery-2.1.1a.ebuild 2281 RMD160 f91473647d91a3f0e5daad5b4f8dfb57b19dae7a SHA1 d850b70a5367ee45f122515224ca060bf3fd89c3 SHA256 d298ad042d23ebcdf1d16502533806d33e9335c8fb3e93a02acd729616c32e28 +MD5 f9430d4309b1b7b55999b6b3083130ce gallery-2.1.1a.ebuild 2281 +RMD160 f91473647d91a3f0e5daad5b4f8dfb57b19dae7a gallery-2.1.1a.ebuild 2281 +SHA256 d298ad042d23ebcdf1d16502533806d33e9335c8fb3e93a02acd729616c32e28 gallery-2.1.1a.ebuild 2281 +MISC ChangeLog 16434 RMD160 66c50544488154d15eed28842f6e703ba96d08c9 SHA1 9e92002b48a525cbe92b62acbdfea953ab0f9c81 SHA256 6c4dd1f5d1756f526c924b0c74b1919ab4f818cbb005d07a771cc930142a72d6 +MD5 94708af16e6ac5ba3cec7feaafc57416 ChangeLog 16434 +RMD160 66c50544488154d15eed28842f6e703ba96d08c9 ChangeLog 16434 +SHA256 6c4dd1f5d1756f526c924b0c74b1919ab4f818cbb005d07a771cc930142a72d6 ChangeLog 16434 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280 @@ -56,7 +56,7 @@ SHA256 d3f1947f8f21f224ff7da840c60e14cd0d28f77bc058b4048d1ede0fa78160a6 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEsXt7EzitwsaoONoRAqckAJ9KH29tFAC3KVslAXcNGzI6F2GR4QCeLSnQ -b5ruTHFiRL8ia113Bwac8rw= -=0W+m +iD4DBQFExUZREzitwsaoONoRAlXXAJdCbnLrGiaYJfum9oZNAjrtX2dFAJ43c3/v +3kYgF9ej9AlPGdzFBvDfNw== +=arNM -----END PGP SIGNATURE----- diff --git a/www-apps/gallery/gallery-2.1.1a.ebuild b/www-apps/gallery/gallery-2.1.1a.ebuild index 67752c35ba06..2da79189f187 100644 --- a/www-apps/gallery/gallery-2.1.1a.ebuild +++ b/www-apps/gallery/gallery-2.1.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.1.1a.ebuild,v 1.3 2006/07/09 21:55:17 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.1.1a.ebuild,v 1.4 2006/07/24 22:14:32 rl03 Exp $ inherit webapp eutils depend.php @@ -31,12 +31,35 @@ pkg_setup() { webapp_pkg_setup local php_flags="session" + local DIE= - use gd && php_flags="${php_flags} gd" use mysql && php_flags="${php_flags} mysql" use postgres && php_flags="${php_flags} postgres" - require_php_with_use ${php_flags} + if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags}; then + DIE="yes" + fi + if use gd; then + if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then + DIE="yes" + fi + fi + + if [[ ${DIE} == "yes" ]]; then + eerror + eerror "${PHP_PKG} needs to be re-installed with all of the following" + eerror "USE flags enabled:" + eerror + eerror "${php_flags}" + eerror + if use gd; then + eerror "as well as any of the following USE flags enabled:" + eerror + eerror "gd gd-external" + eerror + fi + die "Re-install ${PHP_PKG}" + fi } src_install() { |