diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-06-15 00:07:10 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-06-15 00:07:10 +0000 |
| commit | f5ca58318ea978bd5b03f09aec575bc3e71dbf23 (patch) | |
| tree | f0abe07bb374bb400101d695c60b9c37fe90dce8 /net-print | |
| parent | Missing return value checks. (diff) | |
| download | gentoo-2-f5ca58318ea978bd5b03f09aec575bc3e71dbf23.tar.gz gentoo-2-f5ca58318ea978bd5b03f09aec575bc3e71dbf23.tar.bz2 gentoo-2-f5ca58318ea978bd5b03f09aec575bc3e71dbf23.zip | |
Make libpng depend correctly a <1.2.10 one thanks to Friedrich Oslage <bluebird@mnet-online.de>, Rob Couto <rob@cafe4111.org> and moesasji <henkjans_bagger@hotmail.com> in bug 136346
(Portage version: 2.1)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.23-r1.ebuild | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.23-r7.ebuild | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 5bb3eb91a237..e289c350f99e 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.175 2006/06/14 21:28:46 rajiv Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.176 2006/06/15 00:07:10 genstef Exp $ + + 15 Jun 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r1.ebuild, + cups-1.1.23-r7.ebuild: + Make libpng depend correctly a <1.2.10 one thanks to Friedrich Oslage + <bluebird@mnet-online.de>, Rob Couto <rob@cafe4111.org> and moesasji + <henkjans_bagger@hotmail.com> in bug 136346 14 Jun 2006; Rajiv Aaron Manglani <rajiv@gentoo.org> cups-1.2.1-r1.ebuild: install web interface files in data dir so FEATURES=nodoc works. diff --git a/net-print/cups/cups-1.1.23-r1.ebuild b/net-print/cups/cups-1.1.23-r1.ebuild index 148067547e49..1fe98d10e772 100644 --- a/net-print/cups/cups-1.1.23-r1.ebuild +++ b/net-print/cups/cups-1.1.23-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.11 2005/10/03 11:37:14 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.12 2006/06/15 00:07:10 genstef Exp $ inherit eutils flag-o-matic @@ -20,7 +20,7 @@ DEP="virtual/libc ssl? ( >=dev-libs/openssl-0.9.6b ) slp? ( >=net-libs/openslp-1.0.4 ) nls? ( sys-devel/gettext ) - >=media-libs/libpng-1.2.1 + <media-libs/libpng-1.2.10 >=media-libs/tiff-3.5.5 >=media-libs/jpeg-6b" DEPEND="${DEP} diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild index 995309c4431a..19e57eb1fbea 100644 --- a/net-print/cups/cups-1.1.23-r7.ebuild +++ b/net-print/cups/cups-1.1.23-r7.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/net-print/cups/cups-1.1.23-r7.ebuild,v 1.16 2006/06/14 20:43:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.17 2006/06/15 00:07:10 genstef Exp $ inherit eutils flag-o-matic pam autotools @@ -23,7 +23,7 @@ DEP="pam? ( virtual/pam ) gnutls? ( net-libs/gnutls ) ) slp? ( >=net-libs/openslp-1.0.4 ) - >=media-libs/libpng-1.2.1 + <media-libs/libpng-1.2.10 >=media-libs/tiff-3.5.5 >=media-libs/jpeg-6b" DEPEND="${DEP} |