diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-11-26 20:10:02 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-11-26 20:10:02 +0000 |
| commit | b30f5e875034cc588b9f6a3926c10b0ffe1511a5 (patch) | |
| tree | 4467618b8112e534c3d9a4b07fffac4868196b2c /net-print | |
| parent | Remove misc hacks that are no longer needed with the fix from #156252. (diff) | |
| download | historical-b30f5e875034cc588b9f6a3926c10b0ffe1511a5.tar.gz historical-b30f5e875034cc588b9f6a3926c10b0ffe1511a5.tar.bz2 historical-b30f5e875034cc588b9f6a3926c10b0ffe1511a5.zip | |
Add missing cp, thanks jakub in bug 150801
Package-Manager: portage-2.1.2_rc2-r2
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/hplip/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/hplip/Manifest | 16 | ||||
| -rw-r--r-- | net-print/hplip/hplip-1.6.10.ebuild | 13 |
3 files changed, 18 insertions, 16 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index c6883abe43c4..85be60ebad7b 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/hplip # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.44 2006/10/20 18:38:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.45 2006/11/26 20:10:02 genstef Exp $ + + 26 Nov 2006; Stefan Schweizer <genstef@gentoo.org> hplip-1.6.10.ebuild: + Add missing cp, thanks jakub in bug 150801 *hplip-1.6.10 (20 Oct 2006) diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index e29b123522d4..3051f66bc5d7 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -11,14 +11,14 @@ EBUILD hplip-0.9.7-r3.ebuild 3346 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46 MD5 fb6b1a96f35c7cbdda733461183b38a3 hplip-0.9.7-r3.ebuild 3346 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c hplip-0.9.7-r3.ebuild 3346 SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5 hplip-0.9.7-r3.ebuild 3346 -EBUILD hplip-1.6.10.ebuild 3634 RMD160 8ca5a403ad4cef9bdc76353e4e5d803d99276ba9 SHA1 356acd9c4be7b204c913ae966d77b7c92f790493 SHA256 80b4cfcb7e79f073dd51a48c7519eb07c42551f48cc43b131ef4ca6faa5aebd8 -MD5 293ea71daef5204906265ebed24791f6 hplip-1.6.10.ebuild 3634 -RMD160 8ca5a403ad4cef9bdc76353e4e5d803d99276ba9 hplip-1.6.10.ebuild 3634 -SHA256 80b4cfcb7e79f073dd51a48c7519eb07c42551f48cc43b131ef4ca6faa5aebd8 hplip-1.6.10.ebuild 3634 -MISC ChangeLog 7893 RMD160 5f96551f44686f1b37298bafddf76a3d98285205 SHA1 f08927eebf02f39ac726fd3c28202f4508e246a1 SHA256 4f44482d51ed2c5838b126f7c5a05df110affb49e3a2047eac95fc1de704a0ca -MD5 4a91d4abcee35cdefb87099fc7723f12 ChangeLog 7893 -RMD160 5f96551f44686f1b37298bafddf76a3d98285205 ChangeLog 7893 -SHA256 4f44482d51ed2c5838b126f7c5a05df110affb49e3a2047eac95fc1de704a0ca ChangeLog 7893 +EBUILD hplip-1.6.10.ebuild 3636 RMD160 2d8f51349509e3b369a74dbc69e322e81d14e9cc SHA1 5f0c8eca87f3825e0c1b4da927ec1a78b0e3e866 SHA256 44a24a89ec1f007df1f595369c4f53dabf9443ec9993146153988c8f08193f64 +MD5 b8f1b66139be24f4b3a2312fb30385ee hplip-1.6.10.ebuild 3636 +RMD160 2d8f51349509e3b369a74dbc69e322e81d14e9cc hplip-1.6.10.ebuild 3636 +SHA256 44a24a89ec1f007df1f595369c4f53dabf9443ec9993146153988c8f08193f64 hplip-1.6.10.ebuild 3636 +MISC ChangeLog 8013 RMD160 91041dd540c7dbc9f2062fe22d552770701f95bd SHA1 64420e1c84769caeeadf56eedeef99d91a801986 SHA256 85989f4d687ceed299ead36ce932181dcf6c06c1ec4f3b6b1002b71973856059 +MD5 018df84fcd4b33f6a91337e223b4e7d6 ChangeLog 8013 +RMD160 91041dd540c7dbc9f2062fe22d552770701f95bd ChangeLog 8013 +SHA256 85989f4d687ceed299ead36ce932181dcf6c06c1ec4f3b6b1002b71973856059 ChangeLog 8013 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/hplip/hplip-1.6.10.ebuild b/net-print/hplip/hplip-1.6.10.ebuild index 4efac1c34128..8b472d45fc3e 100644 --- a/net-print/hplip/hplip-1.6.10.ebuild +++ b/net-print/hplip/hplip-1.6.10.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/hplip/hplip-1.6.10.ebuild,v 1.1 2006/10/20 18:38:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.10.ebuild,v 1.2 2006/11/26 20:10:02 genstef Exp $ inherit eutils @@ -21,9 +21,8 @@ IUSE="foomaticdb snmp X qt3 ppds scanner" DEPEND=">=dev-lang/python-2.2.0 snmp? ( >=net-analyzer/net-snmp-5.0.9 ) !net-print/hpijs - !net-print/hpoj" - -RDEPEND="virtual/ghostscript + !net-print/hpoj + virtual/ghostscript scanner? ( >=media-gfx/sane-backends-1.0.9 || ( @@ -36,8 +35,8 @@ RDEPEND="virtual/ghostscript sys-apps/hotplug-base net-print/cups foomaticdb? ( net-print/foomatic-db-engine ) - >=net-print/foomatic-filters-3.0.2 - ${DEPEND}" + >=net-print/foomatic-filters-3.0.2" +RDEPEND="${DEPEND}" pkg_setup() { # avoid collisions with cups-1.2 compat symlinks @@ -117,7 +116,7 @@ pkg_preinst() { if use scanner; then insinto /etc/sane.d [ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf . - [ -e ${ROOT}/etc/sane.d/dll.conf ] && ${ROOT}/etc/sane.d/dll.conf . + [ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf . grep -q hpaio dll.conf || echo hpaio >> dll.conf doins dll.conf fi |