summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Gurr <tgurr@gentoo.org>2009-09-13 10:35:07 +0000
committerTimo Gurr <tgurr@gentoo.org>2009-09-13 10:35:07 +0000
commit9ab847c7ed60cd66bc51a3516c98e320b2ab4247 (patch)
treebe0ecd382922a768ea0f7429ef8131d5b35a5883 /net-print
parentFix circular dep by creating and moving libsoup-gnome-2.26.3 into PDEPEND, pe... (diff)
downloadhistorical-9ab847c7ed60cd66bc51a3516c98e320b2ab4247.tar.gz
historical-9ab847c7ed60cd66bc51a3516c98e320b2ab4247.tar.bz2
historical-9ab847c7ed60cd66bc51a3516c98e320b2ab4247.zip
Prepare for cups-1.4.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'net-print')
-rw-r--r--net-print/splix/ChangeLog8
-rw-r--r--net-print/splix/Manifest6
-rw-r--r--net-print/splix/splix-1.1.0.ebuild9
-rw-r--r--net-print/splix/splix-1.1.1.ebuild9
4 files changed, 17 insertions, 15 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/Manifest b/net-print/splix/Manifest
index fd97b79a17b7..9a381b639483 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -4,7 +4,7 @@ DIST splix-1.0.1-beta2.tar.bz2 33474 RMD160 d9264250e3117eb2f2915734651156d581bc
DIST splix-1.1.0.tar.bz2 63855 RMD160 c2df961fa2a52ae78da678df17790196835f1302 SHA1 3a43615bca43d60c0f2c73ec4a59170a5d766975 SHA256 0210c5015bccd08f0e9c25d40bcd01556a9b10528d40737493c1ef8b16b43491
DIST splix-1.1.1.tar.bz2 65233 RMD160 5804ce71147fe50a1c6f75545a841bb5348471ff SHA1 e25486aeb0500f0d1a221b86b96d28b6307f178b SHA256 fb26ef4083dd57cecbee174fe9c7d1b5b1df06f7ccd90e3006cbeb09c6738209
EBUILD splix-1.0.1_beta2.ebuild 954 RMD160 1ae70d68d04eef1b1f9816068591386c7e229584 SHA1 567f6e24e2f99fc49bc03e9611d5a5e0884ae322 SHA256 f13ff7fdc975fcbafea402d27067353c796f28f7c9e2a51408c204982060d033
-EBUILD splix-1.1.0.ebuild 1693 RMD160 9a000bfee6b3989310f3477e13330477d4bd2283 SHA1 d0110dbad4a85f802b1ebd74bae2292317ba2972 SHA256 c5e7b32f4e79fa3d13ff1a20af31d9c4371687795e7b9e9f630cffac7a1d0525
-EBUILD splix-1.1.1.ebuild 1700 RMD160 d23a71c96dfdf6d0957bf133739eca719c82156d SHA1 d99641555a71a914f9c40b1ad980a4d47f480abb SHA256 42b4043d27295290186f442e612fe4f278e69e5dd98606ff3611fac916bd4a60
-MISC ChangeLog 2701 RMD160 6e98bbab283488e2cb71b5dd63cf8b41ec185a24 SHA1 dad20ca9430689f3c19813d7992c36f42b3df74b SHA256 edc825dc9b13a5bf60191c238a8e7e13d3b392a0d2ee5e6693d82ee7217892e6
+EBUILD splix-1.1.0.ebuild 1704 RMD160 c23d77188aed7ebab3a7940a399ca15008b54293 SHA1 2ea33ab14ec825214c811ac1487cdfa07892e829 SHA256 f0ff64dce5443448ed98389e67dd1425b36488fd2153f879aabdf693603a412c
+EBUILD splix-1.1.1.ebuild 1709 RMD160 902fa3aa5ee815b63cb212e3c06804632f409fb5 SHA1 710603e6153b7ccd790840978fbcf98dbe048005 SHA256 27562dada3cc741edf3fd8d960674408d4a669e66ad104200180ede1da296a79
+MISC ChangeLog 2807 RMD160 df662592f1f75c02036b5c2c952cfeff6195f4c5 SHA1 f768071ffe2cf1b934ecdeb4837a999cdad30186 SHA256 e80438981ee8c8b3febfbaba002674d3358fc1167cfeec3bc112e8b632bdbc80
MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
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() {