fix installation of ppd files

diff --git a/net-print/hpijs/ChangeLog b/net-print/hpijs/ChangeLog
index 40580833ef1429b85a3927d8c4ad658e81137e31..ff0f30e26a3bc02887551aab0c68f2ed7811567b 100644 (file)
--- a/net-print/hpijs/ChangeLog
+++ b/net-print/hpijs/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for net-print/hpijs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.34 2004/12/29 20:41:16 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.35 2004/12/31 11:26:09 lanius Exp $
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
 
+  31 Dec 2004; Heinrich Wendel <lanius@gentoo.org> hpijs-1.7.1.ebuild:
+  fix installation of ppd files
+
 *hpijs-1.7.1 (20 Dec 2004)
 
   20 Dec 2004; Heinrich Wendel <lanius@gentoo.org> +hpijs-1.7.1.ebuild:

diff --git a/net-print/hpijs/Manifest b/net-print/hpijs/Manifest
index 92979c38c0ba680dac3616f5ed520fa5b20e9da2..b093dabf9f1d979439fc0a61bb9c32d2d79be236 100644 (file)
--- a/net-print/hpijs/Manifest
+++ b/net-print/hpijs/Manifest
@@ -1,12 +1,12 @@
-MD5 f2a2f0a49bc4793ab7d451a35fa3eb21 hpijs-1.6.1.ebuild 2110
-MD5 0e2ce5308132d817f9e5e5597e101927 hpijs-1.7.1.ebuild 2037
-MD5 042fb4ac1e34ccd26672deb7d38d2ab7 ChangeLog 3617
+MD5 231d1573902614fcef544d037cc7b3d3 hpijs-1.7.1.ebuild 2092
 MD5 29c3dda867492a08ea041bbc009fbece hpijs-1.5.ebuild 2072
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 3b917cf4ef8f616597347e806ce8c5e2 hpijs-1.4.1.ebuild 2006
-MD5 f332f0c4b395ed9a2c8d89cf38787447 files/hpijs-1.5-gcc34.patch 1482
-MD5 001779aa38e92ba16c9ee47f6c0051d9 files/digest-hpijs-1.7.1 144
+MD5 f2a2f0a49bc4793ab7d451a35fa3eb21 hpijs-1.6.1.ebuild 2110
+MD5 b405e5aaaecd83c04393d7ddbe5cc0d2 ChangeLog 3720
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 153b11771cdc5889cbe726925c862292 files/hpijs-1.4.1-rss.1.patch 6182
+MD5 f332f0c4b395ed9a2c8d89cf38787447 files/hpijs-1.5-gcc34.patch 1482
 MD5 9eb7c84d396d9a290a23086489dc1a2c files/digest-hpijs-1.4.1 137
 MD5 58fac4387f6a0b15374d24019eac6816 files/digest-hpijs-1.6.1 63
+MD5 001779aa38e92ba16c9ee47f6c0051d9 files/digest-hpijs-1.7.1 144
 MD5 4a45d7f2afffa6ae0b5a8c27d7608ddc files/digest-hpijs-1.5 143

diff --git a/net-print/hpijs/hpijs-1.7.1.ebuild b/net-print/hpijs/hpijs-1.7.1.ebuild
index 518ef1d2922fb2473ab9b7d25e8f4cdcf1915696..3a6ef235809295c3b0dadd197c0e0c922fe53802 100644 (file)
--- a/net-print/hpijs/hpijs-1.7.1.ebuild
+++ b/net-print/hpijs/hpijs-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.7.1.ebuild,v 1.1 2004/12/20 21:19:53 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/hpijs-1.7.1.ebuild,v 1.2 2004/12/31 11:26:09 lanius Exp $
 
 inherit eutils gnuconfig
 
@@ -29,7 +29,7 @@ src_unpack() {
 
 src_compile () {
        econf --disable-cups-install \
-               --disable-foomatic-install || die "econf failed"
+               $(use_enable ppds foomatic-install) || die "econf failed"
 
        sed -i -e 's|/usr/share/cups|${prefix}/share/cups|g' \
                -e 's|/usr/lib/cups|${prefix}/lib/cups|g' Makefile \
@@ -57,6 +57,8 @@ src_install() {
                rm -fR ${D}/usr/share/ppd
        fi
 
+       use ppds && rm -f ${D}/usr/bin/foomatic-rip
+
        if use foomaticdb ; then
                cd ../foomatic-db-hpijs-${DB_V}
                make DESTDIR=${D} install || die