From d20139bab1d7d04cfee171f47bee82560855aa4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Mon, 29 Mar 2010 09:57:06 +0400 Subject: [PATCH] Added cnijfilter-3.20-r1. --- net-print/cnijfilter/ChangeLog | 11 +++++++++++ net-print/cnijfilter/Manifest | 2 +- ...r-3.20.ebuild => cnijfilter-3.20-r1.ebuild} | 18 ++++++++++++------ profiles/calculate/desktop/package.keywords | 3 --- profiles/calculate/package.keywords | 3 +++ 5 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 net-print/cnijfilter/ChangeLog rename net-print/cnijfilter/{cnijfilter-3.20.ebuild => cnijfilter-3.20-r1.ebuild} (92%) diff --git a/net-print/cnijfilter/ChangeLog b/net-print/cnijfilter/ChangeLog new file mode 100644 index 000000000..85500450f --- /dev/null +++ b/net-print/cnijfilter/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for net-print/cnijfilter +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*cnijfilter-3.20-r1 (29 Mar 2010) + + 29 Mar 2010; Alexander Tratsevskiy (L'autre) + -cnijfilter-3.20.ebuild, +cnijfilter-3.20-r1.ebuild: + net-print/cnijfilter-3.20-r1.ebuild depends on app-text/ghostscript-gpl + instead of virtual/ghostscript. + diff --git a/net-print/cnijfilter/Manifest b/net-print/cnijfilter/Manifest index 973174f64..2736d76db 100644 --- a/net-print/cnijfilter/Manifest +++ b/net-print/cnijfilter/Manifest @@ -3,4 +3,4 @@ DIST cnijfilter-common-3.00-1.tar.gz 6207050 RMD160 c8a4dedb0ac4ad7ab411434a99d1 DIST cnijfilter-source-3.20-1.tar.gz 6494749 RMD160 7bd45b55b324e26535962b740506fbd8fb0866d4 SHA1 1221441ef6c6a055e634f0e931bed8de55a4f7a6 SHA256 2fc4dcd79d6644baeb0c8a0ee1b43dc9f59f44d21f773c0d85bfe2660a180b9a EBUILD cnijfilter-2.70-r1.ebuild 7175 RMD160 1a45f80e428e7e005fff6936f9b28dd478c5d73d SHA1 b559ee24898fd3b0823ea699fdf849350b423b5e SHA256 91fbe5d4a42ca6f788f9f9cc11c9adae534401f19564b81c69aaefcde43d1d97 EBUILD cnijfilter-3.00.ebuild 7794 RMD160 30c77972ee25b61aa7b585a900d70ee437e96096 SHA1 717e7b4fccd6567dd9f86b8fd59bc7e5407d8c56 SHA256 bffcc45cc4a3968ebed316e6b72edb46ed29e0121395f13140a31411db4f487a -EBUILD cnijfilter-3.20.ebuild 7144 RMD160 2302e4d698b1ec4fa3dd1779d0faf96c3f81dc30 SHA1 2a79668a0fc33cf5778c8e17cbc5cdb55635e91a SHA256 ff92b5636316111a93077d4d5669d10aa91f0fc8ccd904523a7482ec7837ad7d +EBUILD cnijfilter-3.20-r1.ebuild 7453 RMD160 71e5ae4933d0d16f5baa9720d928a09c5da6c5a0 SHA1 02fc9648b86837e9f452997d84e855b7d1dd3b97 SHA256 79deae2abf068f06aaa29859ae00382605bb11d66f03ba3e146d5333d30f2b05 diff --git a/net-print/cnijfilter/cnijfilter-3.20.ebuild b/net-print/cnijfilter/cnijfilter-3.20-r1.ebuild similarity index 92% rename from net-print/cnijfilter/cnijfilter-3.20.ebuild rename to net-print/cnijfilter/cnijfilter-3.20-r1.ebuild index a95ec86f4..22f9c52c9 100644 --- a/net-print/cnijfilter/cnijfilter-3.20.ebuild +++ b/net-print/cnijfilter/cnijfilter-3.20-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,6 +7,13 @@ # initial version # updated to use cnijfilter-common-2.80 2008-01-12 by Victor Mataré # +# 2010-03-19 GuS Version 3.20-r1 +# Replaced dependency of non-existing dev-libs/libxml with +# dependency of >=dev-libs/libxml2-2.7.3-r2. +# +# 2010-03-20 GuS Version 3.20-r2 +# Replaced dependency of non-existing virtual/ghostscript with +# dependency of app-text/ghostscript-gpl. inherit eutils rpm flag-o-matic multilib @@ -29,7 +36,7 @@ IUSE="amd64 mp560 ip4700 mp640" -DEPEND="virtual/ghostscript +DEPEND="app-text/ghostscript-gpl >=net-print/cups-1.1.14 !amd64? ( sys-libs/glibc >=dev-libs/popt-1.6 @@ -39,11 +46,10 @@ DEPEND="virtual/ghostscript app-emulation/emul-linux-x86-compat app-emulation/emul-linux-x86-baselibs ) servicetools? ( !amd64? ( >=gnome-base/libglade-0.6 - >=dev-libs/libxml-1.8 + >=dev-libs/libxml2-2.7.3-r2 =x11-libs/gtk+-1.2* ) amd64? ( >=app-emulation/emul-linux-x86-bjdeps-0.1 app-emulation/emul-linux-x86-gtklibs ) )" -# >=automake-1.6.3 # Arrays of supported Printers, there IDs and compatible models _pruse=("mp250" "mp270" "mp490" "mp550" "mp560" "ip4700" "mp640") @@ -65,10 +71,10 @@ pkg_setup() { if (use amd64 && use servicetools); then eerror "You can't build this package with 'servicetools' on amd64," eerror "because you would need to compile '>=gnome-base/libglade-0.6'" - eerror "and '>=dev-libs/libxml-1.8' with 'export ABI=x86' first." + eerror "and '>=dev-libs/libxml2-2.7.3-r2' with 'export ABI=x86' first." eerror "That's exactly what 'emul-linux-x86-bjdeps-0.1' does with" eerror "'dev-libs/popt-1.6'. I encourage you to adapt this ebuild" - eerror "to build 32bit versions of 'libxml' and 'libglade' too!" + eerror "to build 32bit versions of 'libxml2' and 'libglade' too!" die "servicetools not yet available on amd64" fi diff --git a/profiles/calculate/desktop/package.keywords b/profiles/calculate/desktop/package.keywords index 037865cf3..5eef1f224 100644 --- a/profiles/calculate/desktop/package.keywords +++ b/profiles/calculate/desktop/package.keywords @@ -30,9 +30,6 @@ x11-drivers/nvidia-drivers amd64 x86 ~net-wireless/broadcom-sta-5.60.48.36 amd64 x86 ~net-wireless/b43-fwcutter-012 amd64 x86 -~net-print/cnijfilter-3.00 amd64 x86 -~app-emulation/emul-linux-x86-bjdeps-0.1 amd64 x86 - ~dev-python/py-smbpasswd-1.0 amd64 #fix compile 1.0.2-r1 =media-tv/tvtime-1.0.2-r2 amd64 x86 diff --git a/profiles/calculate/package.keywords b/profiles/calculate/package.keywords index e3a6ff9dd..c1199b985 100644 --- a/profiles/calculate/package.keywords +++ b/profiles/calculate/package.keywords @@ -33,3 +33,6 @@ ~dev-libs/iniparser-3.0b amd64 x86 ~sys-fs/lvm2-2.02.56 amd64 x86 ~sys-power/cpufreqd-2.3.4 amd64 x86 + +~net-print/cnijfilter-3.20 amd64 x86 +~app-emulation/emul-linux-x86-bjdeps-0.1 amd64 x86