diff options
author | Timo Gurr <tgurr@gentoo.org> | 2009-09-13 10:35:07 +0000 |
---|---|---|
committer | Timo Gurr <tgurr@gentoo.org> | 2009-09-13 10:35:07 +0000 |
commit | f154707eac85bfabbb805f988c1d2606bd5a1804 (patch) | |
tree | 0caac58b2e9ef03f24ead942dac947ce12a55305 /net-print | |
parent | Fix circular dep by creating and moving libsoup-gnome-2.26.3 into PDEPEND, pe... (diff) | |
download | gentoo-2-f154707eac85bfabbb805f988c1d2606bd5a1804.tar.gz gentoo-2-f154707eac85bfabbb805f988c1d2606bd5a1804.tar.bz2 gentoo-2-f154707eac85bfabbb805f988c1d2606bd5a1804.zip |
Prepare for cups-1.4.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/splix/ChangeLog | 8 | ||||
-rw-r--r-- | net-print/splix/splix-1.1.0.ebuild | 9 | ||||
-rw-r--r-- | net-print/splix/splix-1.1.1.ebuild | 9 |
3 files changed, 14 insertions, 12 deletions
diff --git a/net-print/splix/ChangeLog b/net-print/splix/ChangeLog index d1466a2677db..a2e82e8a894d 100644 --- a/net-print/splix/ChangeLog +++ b/net-print/splix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/splix -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.13 2008/03/02 15:11:28 philantrop Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.14 2009/09/13 10:35:07 tgurr Exp $ + + 13 Sep 2009; Timo Gurr <tgurr@gentoo.org> splix-1.1.0.ebuild, + splix-1.1.1.ebuild: + Prepare for cups-1.4. 02 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org> splix-1.1.1.ebuild: Marked stable on amd64 as per bug 198691. diff --git a/net-print/splix/splix-1.1.0.ebuild b/net-print/splix/splix-1.1.0.ebuild index 071c700f5355..6fc2ee01a2e9 100644 --- a/net-print/splix/splix-1.1.0.ebuild +++ b/net-print/splix/splix-1.1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-1.1.0.ebuild,v 1.1 2007/11/20 00:23:51 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-1.1.0.ebuild,v 1.2 2009/09/13 10:35:07 tgurr Exp $ inherit eutils toolchain-funcs @@ -15,9 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="net-print/cups - net-print/cupsddk - media-libs/jbigkit" +DEPEND="media-libs/jbigkit + || ( >=net-print/cups-1.4.0 net-print/cupsddk )" RDEPEND="${DEPEND}" src_unpack() { diff --git a/net-print/splix/splix-1.1.1.ebuild b/net-print/splix/splix-1.1.1.ebuild index 83c21a3c09e6..c23f59315895 100644 --- a/net-print/splix/splix-1.1.1.ebuild +++ b/net-print/splix/splix-1.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-1.1.1.ebuild,v 1.3 2008/03/02 15:11:28 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-1.1.1.ebuild,v 1.4 2009/09/13 10:35:07 tgurr Exp $ inherit eutils toolchain-funcs @@ -15,9 +15,8 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="net-print/cups - net-print/cupsddk - media-libs/jbigkit" +DEPEND="media-libs/jbigkit + || ( >=net-print/cups-1.4.0 net-print/cupsddk )" RDEPEND="${DEPEND}" src_unpack() { |