From: Stefan Schweizer Date: Thu, 15 Jun 2006 00:07:10 +0000 (+0000) Subject: Make libpng depend correctly a <1.2.10 one thanks to Friedrich Oslage , Rob Couto and moesasji in bug 136346 Package-Manager: portage-2.1 --- 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 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 + , Rob Couto and moesasji + in bug 136346 14 Jun 2006; Rajiv Aaron Manglani cups-1.2.1-r1.ebuild: install web interface files in data dir so FEATURES=nodoc works. diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 9ee0401d29cc..120050a8e9ef 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -60,22 +60,22 @@ RMD160 c53bec6987551228fc3b03958a1fe7c79a4d087a files/xpdf-pl3.patch 348 SHA256 19a90dde4d5e5e619866d8a61bec7507a308901d6d54fe49b8bc982f5ca01f0b files/xpdf-pl3.patch 348 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e DIST cups-1.2.1-source.tar.bz2 3475342 RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 SHA1 308dec4039153e62d4206c30d6b1f25469ee868f SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45 -EBUILD cups-1.1.23-r1.ebuild 4130 RMD160 d2b38e6f29d8f6a9cd0a4753d945d120ab8c4dbd SHA1 b90b92aeebe6884ee04756ccc66b70c6b04e3430 SHA256 f7eea788f7fab983696ddf7d68f33dc6cc542ae9a7d50658c1195202cfe90fb5 -MD5 b92beaae46fa3940593e9915f4feb8f0 cups-1.1.23-r1.ebuild 4130 -RMD160 d2b38e6f29d8f6a9cd0a4753d945d120ab8c4dbd cups-1.1.23-r1.ebuild 4130 -SHA256 f7eea788f7fab983696ddf7d68f33dc6cc542ae9a7d50658c1195202cfe90fb5 cups-1.1.23-r1.ebuild 4130 -EBUILD cups-1.1.23-r7.ebuild 4652 RMD160 b5bd526c8b13d19a037ce0d9c67cb1eff7526e39 SHA1 8257eaecb2667a47892d1e097e4fe247ccf2d1b3 SHA256 17aaa947d10006f4e3a731cd3fed758889b45c917b9e68523dff046dd41e18af -MD5 7f59a19ef555409ec79fc728865e5fa4 cups-1.1.23-r7.ebuild 4652 -RMD160 b5bd526c8b13d19a037ce0d9c67cb1eff7526e39 cups-1.1.23-r7.ebuild 4652 -SHA256 17aaa947d10006f4e3a731cd3fed758889b45c917b9e68523dff046dd41e18af cups-1.1.23-r7.ebuild 4652 +EBUILD cups-1.1.23-r1.ebuild 4131 RMD160 50c044eee7737f58c3295046b322f31de2381c40 SHA1 161766465673c7c79342364f81b35cb76ab0b77a SHA256 c453d2a4a55e45886c091551c45ef794ccbeeb26ac25591d8e9261720a7e8a74 +MD5 f19354dc15d37020af9a107b96b04f56 cups-1.1.23-r1.ebuild 4131 +RMD160 50c044eee7737f58c3295046b322f31de2381c40 cups-1.1.23-r1.ebuild 4131 +SHA256 c453d2a4a55e45886c091551c45ef794ccbeeb26ac25591d8e9261720a7e8a74 cups-1.1.23-r1.ebuild 4131 +EBUILD cups-1.1.23-r7.ebuild 4653 RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a489 SHA1 9c81b953682af70f53b6b89448fc4ef6816b324c SHA256 09cf15f1ea38a706c673454d6b932aff09d2af8c260b15fc303151f09735f7bc +MD5 09c9a9dc9a485404b7828210068bcf0f cups-1.1.23-r7.ebuild 4653 +RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a489 cups-1.1.23-r7.ebuild 4653 +SHA256 09cf15f1ea38a706c673454d6b932aff09d2af8c260b15fc303151f09735f7bc cups-1.1.23-r7.ebuild 4653 EBUILD cups-1.2.1-r1.ebuild 4660 RMD160 81b985f399026adfdfe97912cef5ab80c2a62ee5 SHA1 8bd46fd04995c41683a5b915cb3a79e4128de7f3 SHA256 147f0cbf4b3046c79ffd6a92245603783090129aa1c7bb4cf191840197584daf MD5 d1dca55a4a3b38da3d230f8f348e3e13 cups-1.2.1-r1.ebuild 4660 RMD160 81b985f399026adfdfe97912cef5ab80c2a62ee5 cups-1.2.1-r1.ebuild 4660 SHA256 147f0cbf4b3046c79ffd6a92245603783090129aa1c7bb4cf191840197584daf cups-1.2.1-r1.ebuild 4660 -MISC ChangeLog 23666 RMD160 ffdd10329c727cd2787473b9af82041924144c7a SHA1 2bb16770e75d8ce78f623e69b90318d76a7d6839 SHA256 9b5619c674e88283dc5f362cbaa92570280a640e3e2c9dfd583c4b8183deaaa0 -MD5 d6100e5e54a027f55bdbef1ce8a13ecb ChangeLog 23666 -RMD160 ffdd10329c727cd2787473b9af82041924144c7a ChangeLog 23666 -SHA256 9b5619c674e88283dc5f362cbaa92570280a640e3e2c9dfd583c4b8183deaaa0 ChangeLog 23666 +MISC ChangeLog 23959 RMD160 7d8796b648f23f4a69cb7a6bfcce2067533ffec6 SHA1 7f3d4d627dd79b74dd1125a11a75e521f65f4969 SHA256 0fb92005c2338ed339849ef596e23423fcf96f815361cec3ba230835ee037b75 +MD5 f5f51ccdb8da4983586cd72d26cf0c5f ChangeLog 23959 +RMD160 7d8796b648f23f4a69cb7a6bfcce2067533ffec6 ChangeLog 23959 +SHA256 0fb92005c2338ed339849ef596e23423fcf96f815361cec3ba230835ee037b75 ChangeLog 23959 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 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/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/tiff-3.5.5 >=media-libs/jpeg-6b" DEPEND="${DEP}