diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2012-09-09 11:43:04 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2012-09-09 11:43:04 +0000 |
| commit | ed32576fb0f4e46a3ffd313310878397dcb3e4fe (patch) | |
| tree | 83fd9131103bf9f12c810f99013e59dc656eae44 | |
| parent | alpha/ia64/s390/sh/sparc stable wrt #385321 (diff) | |
| download | gentoo-2-ed32576fb0f4e46a3ffd313310878397dcb3e4fe.tar.gz gentoo-2-ed32576fb0f4e46a3ffd313310878397dcb3e4fe.tar.bz2 gentoo-2-ed32576fb0f4e46a3ffd313310878397dcb3e4fe.zip | |
Fix dependencies to handle also php 5.4 with sqlite. Cleaned up deps related to php 5.2
(Portage version: 2.1.11.9/cvs/Linux x86_64)
| -rw-r--r-- | www-apps/gallery/ChangeLog | 8 | ||||
| -rw-r--r-- | www-apps/gallery/gallery-2.3.1.ebuild | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog index b1935f94699c..9be7967a9af8 100644 --- a/www-apps/gallery/ChangeLog +++ b/www-apps/gallery/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apps/gallery -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.187 2011/04/04 12:14:40 scarabeus Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.188 2012/09/09 11:43:04 olemarkus Exp $ + + 09 Sep 2012; Ole Markus With <olemarkus@gentoo.org> gallery-2.3.1.ebuild: + Fix dependencies to handle also php 5.4 with sqlite. Cleaned up deps related + to php 5.2 04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> gallery-2.3.1.ebuild: Move to virtual/ffmpeg from media-video/ffmpeg. diff --git a/www-apps/gallery/gallery-2.3.1.ebuild b/www-apps/gallery/gallery-2.3.1.ebuild index f6b8b98c8abd..d36df277875a 100644 --- a/www-apps/gallery/gallery-2.3.1.ebuild +++ b/www-apps/gallery/gallery-2.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3.1.ebuild,v 1.9 2011/04/04 12:14:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3.1.ebuild,v 1.10 2012/09/09 11:43:04 olemarkus Exp $ EAPI="2" @@ -20,11 +20,11 @@ RDEPEND="raw? ( media-gfx/dcraw ) netpbm? ( media-libs/netpbm media-gfx/jhead ) unzip? ( app-arch/unzip ) zip? ( app-arch/zip ) - sqlite? ( dev-lang/php[pdo] ) - gd? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) ) + sqlite? ( dev-lang/php[pdo] + || ( dev-lang/php:5.3[sqlite] dev-lang/php[sqlite3] ) + ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) - dev-lang/php[session,postgres?,sqlite?] - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )" + dev-lang/php[session,postgres?,gd?]" S=${WORKDIR}/${PN}2 |