summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-09-23 07:55:40 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-09-23 07:55:40 +0000
commit8b8868b3ebeac31186e252d3b09867c7fdc30ecd (patch)
treeeb75fe4b7e0dc35edf0a4e1bcb3e8cedbfbf37fc /net-print/hplip
parent+cairo (diff)
downloadhistorical-8b8868b3ebeac31186e252d3b09867c7fdc30ecd.tar.gz
historical-8b8868b3ebeac31186e252d3b09867c7fdc30ecd.tar.bz2
historical-8b8868b3ebeac31186e252d3b09867c7fdc30ecd.zip
Fix get_libdir thanks to Georgi Georgiev <chutz@gg3.net> in bug 148732
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'net-print/hplip')
-rw-r--r--net-print/hplip/ChangeLog5
-rw-r--r--net-print/hplip/Manifest16
-rw-r--r--net-print/hplip/hplip-1.6.9.ebuild20
3 files changed, 22 insertions, 19 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 44ce5ce56209..04ad840d7381 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.42 2006/09/22 23:00:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.43 2006/09/23 07:55:40 genstef Exp $
+
+ 23 Sep 2006; Stefan Schweizer <genstef@gentoo.org> hplip-1.6.9.ebuild:
+ Fix get_libdir thanks to Georgi Georgiev <chutz@gg3.net> in bug 148732
*hplip-1.6.9 (22 Sep 2006)
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 137cdf11f515..3ecdb6cbfaf2 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.9.ebuild 3305 RMD160 ac498fd1ae59fd245a53496f4a0c420fcffe6b2a SHA1 b65161fce6eefbc6db214610fbaf97adf0a5c97a SHA256 c10bf06ff3b96db731d5bcc6936d681fc632973dfa6da12a413ab850f72666dc
-MD5 7f719a77f07f8dd8805d61e043222075 hplip-1.6.9.ebuild 3305
-RMD160 ac498fd1ae59fd245a53496f4a0c420fcffe6b2a hplip-1.6.9.ebuild 3305
-SHA256 c10bf06ff3b96db731d5bcc6936d681fc632973dfa6da12a413ab850f72666dc hplip-1.6.9.ebuild 3305
-MISC ChangeLog 7465 RMD160 5e31b69f87be5859c077a457e45cd6ccb61f5cc7 SHA1 5bb2391af96270e3d5145c01ee61bfe48450ba9d SHA256 bce86ca640f0c7ac2ddbe226240ca89b85e78528a6f6d6daf052f6308ff86883
-MD5 1a71197b23fb818180f2b29ba3c55749 ChangeLog 7465
-RMD160 5e31b69f87be5859c077a457e45cd6ccb61f5cc7 ChangeLog 7465
-SHA256 bce86ca640f0c7ac2ddbe226240ca89b85e78528a6f6d6daf052f6308ff86883 ChangeLog 7465
+EBUILD hplip-1.6.9.ebuild 3435 RMD160 3c949bca389e83832832ff02c723ada5fcebd6e5 SHA1 123fa25281f9f727180dd39f705ba6ddfd75e021 SHA256 c1ed747f1df6d761f80b988e3eedcaded4d87e547f2ca654b056effb1298ec2a
+MD5 da8dc30879a5c802f0b4ed58fd5c5cf0 hplip-1.6.9.ebuild 3435
+RMD160 3c949bca389e83832832ff02c723ada5fcebd6e5 hplip-1.6.9.ebuild 3435
+SHA256 c1ed747f1df6d761f80b988e3eedcaded4d87e547f2ca654b056effb1298ec2a hplip-1.6.9.ebuild 3435
+MISC ChangeLog 7612 RMD160 9deb5a682a64a18a250b4741316f62e463d75d54 SHA1 e5726d901258d4032e6072269cdcf71c0ad5e6d3 SHA256 40d1f17f20e718835bf3f145727cf894ed91258d88e6d68b357b40eabb615232
+MD5 bacbfb8a6fcf9e68924c16a6442b963a ChangeLog 7612
+RMD160 9deb5a682a64a18a250b4741316f62e463d75d54 ChangeLog 7612
+SHA256 40d1f17f20e718835bf3f145727cf894ed91258d88e6d68b357b40eabb615232 ChangeLog 7612
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.9.ebuild b/net-print/hplip/hplip-1.6.9.ebuild
index 679f5863282c..54bf5b846d97 100644
--- a/net-print/hplip/hplip-1.6.9.ebuild
+++ b/net-print/hplip/hplip-1.6.9.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.9.ebuild,v 1.1 2006/09/22 23:00:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.9.ebuild,v 1.2 2006/09/23 07:55:40 genstef Exp $
inherit eutils
@@ -87,16 +87,16 @@ src_install() {
echo "hpaio" > dll.conf
doins dll.conf
- dodir /usr/lib/sane
- dosym /usr/lib/libsane-hpaio.la /usr/lib/sane/libsane-hpaio.la
- dosym /usr/lib/libsane-hpaio.so /usr/lib/sane/libsane-hpaio.so
- dosym /usr/lib/libsane-hpaio.so.1 /usr/lib/sane/libsane-hpaio.so.1
- dosym /usr/lib/libsane-hpaio.so.1.0.0 /usr/lib/sane/libsane-hpaio.so.1.0.0
+ dodir /usr/$(get_libdir)/sane
+ dosym /usr/$(get_libdir)/libsane-hpaio.la /usr/$(get_libdir)/sane/libsane-hpaio.la
+ dosym /usr/$(get_libdir)/libsane-hpaio.so /usr/$(get_libdir)/sane/libsane-hpaio.so
+ dosym /usr/$(get_libdir)/libsane-hpaio.so.1 /usr/$(get_libdir)/sane/libsane-hpaio.so.1
+ dosym /usr/$(get_libdir)/libsane-hpaio.so.1.0.0 /usr/$(get_libdir)/sane/libsane-hpaio.so.1.0.0
else
- rm -f "${D}"/usr/lib/libsane-hpaio.la
- rm -f "${D}"/usr/lib/libsane-hpaio.so
- rm -f "${D}"/usr/lib/libsane-hpaio.so.1
- rm -f "${D}"/usr/lib/libsane-hpaio.so.1.0.0
+ rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.la
+ rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.so
+ rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.so.1
+ rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.so.1.0.0
fi
# bug 106035