cups-1.2 fixes and major ebuild cleanups

Package-Manager: portage-2.1.1_pre1

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 59ffd01e0da7705dfa8004f9137ba0d159eeab53..2c54b648c6083fc041a6a53dbf9c46c597ee09c6 100644 (file)
--- 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.35 2006/06/16 00:44:34 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.36 2006/06/17 00:15:05 genstef Exp $
+
+  17 Jun 2006; Stefan Schweizer <genstef@gentoo.org> hplip-1.6.6.ebuild:
+  cups-1.2 fixes and major ebuild cleanups
 
 *hplip-1.6.6 (16 Jun 2006)
 

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b53b6980c66501f46cecc16b26a77f8872b4d914..dcce59f0c08f98e456fa3eaabdcf832fa058d19c 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,11 +1,50 @@
-MD5 74886385e3427ebd0e8d141a897879ac ChangeLog 6021
-MD5 85fb640ceecd949521bef397e8e23d0b files/digest-hplip-0.9.11-r1 768
-MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
-MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
-MD5 85a2fd344ee4765adfc9ba1a5c548295 files/digest-hplip-1.6.6 146
+AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
+RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
+SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95 files/hplip.init.d 948
+DIST foomatic-db-hpijs-1.5-20051126.tar.gz 87836
+DIST foomatic-db-hpijs-1.5-20060211.tar.gz 97873 RMD160 267fba7b83525042cd3198aa54f6d1cc22fd97dc SHA1 05305a71fd1568a6f38d82de031489598cc299ce SHA256 3c95566ef9c4c149325b09dac235b4dacbc28b6c8602016b3a2c702b4df131db
+DIST foomatic-db-hpijs-20060615.tar.gz 98297 RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 SHA1 35128a6d929408f243b568f6963e9f4c9f833bcc SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d
+DIST hplip-0.9.11-2.patch 10260 RMD160 1ea139b7e90120c528ce60ce360bb3dc327d4a01 SHA1 e1afee2afad72ae36d7fffa154fc70728496fc6f SHA256 1b5da9a28f02d55b7e3669e2d9f6f6b83c4680015df7a5bdec6541da8ce5344c
+DIST hplip-0.9.11.tar.gz 9924094 RMD160 c544b61bcdea20a18e76b5bd1072518f16e74e2b SHA1 23fbaa34667ff187e8a91c75c9bad67ccc2b7d05 SHA256 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42
+DIST hplip-0.9.7-2.patch 25718
+DIST hplip-0.9.7.tar.gz 9705231
+DIST hplip-0.9.8-4.patch 31429 RMD160 ebbc0d557fa00a70f8945e51924a3078ded810df SHA1 b10957f66ac4a61866873f653b44ea17433ef929 SHA256 e28ed1fa1aaa3b55c10ac36ce4c539cb2fa97b5fde59dc6844b044ff000556b3
+DIST hplip-0.9.8.tar.gz 9298145 RMD160 6f3fb9af7bedd3de375554d71ce77bb6cd6a3f3a SHA1 4280ceba70d841906c3df9c4ab1abc0677c9bcdb SHA256 b573e31499920a787f2d6b3eb1e0de732e48d7ba00cb0e7ecd5d3e860e48662a
+DIST hplip-1.6.6.tar.gz 10429794 RMD160 84171d39677e132915169cb4c687271325777f25 SHA1 613f54cc41df367fd9497e6a5788e69e940b561a SHA256 cb148342ef56de7426290a8556114de440ff01ed36008ab81ea64755828701d0
+EBUILD hplip-0.9.11-r1.ebuild 3334 RMD160 ec2612727fdb490355ac349239aae9fc22ccde27 SHA1 fc8f8833012a4221a7dc5aa014e4faba250db889 SHA256 57c185c97058b234d3ebe2d709f5167c77be66ca3a535d00cde90a5fe9be7961
 MD5 f5607fe7587656f6248c9bde90bc6822 hplip-0.9.11-r1.ebuild 3334
+RMD160 ec2612727fdb490355ac349239aae9fc22ccde27 hplip-0.9.11-r1.ebuild 3334
+SHA256 57c185c97058b234d3ebe2d709f5167c77be66ca3a535d00cde90a5fe9be7961 hplip-0.9.11-r1.ebuild 3334
+EBUILD hplip-0.9.7-r3.ebuild 3336 RMD160 35247f043e4ab2e7f3f0fa1ca6171ef9c9009f62 SHA1 72419c98df0ac0f46b5cd555c32c9c6cbc945d1c SHA256 3a24d57ec2246856bb25704893267dfd23a6877e00372bc5fd0a0cd0c960ce70
 MD5 59049b57d4e2248499c09e11408c2c38 hplip-0.9.7-r3.ebuild 3336
+RMD160 35247f043e4ab2e7f3f0fa1ca6171ef9c9009f62 hplip-0.9.7-r3.ebuild 3336
+SHA256 3a24d57ec2246856bb25704893267dfd23a6877e00372bc5fd0a0cd0c960ce70 hplip-0.9.7-r3.ebuild 3336
+EBUILD hplip-0.9.8-r2.ebuild 3325 RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff SHA1 098cb75f31d5cbdcb469f1bf178f351f649194d1 SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98
 MD5 12340dda48ab3f17a14149a5c797cf67 hplip-0.9.8-r2.ebuild 3325
-MD5 0da6e6051e4253a147246b75f8a1fd55 hplip-1.6.6.ebuild 3234
+RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff hplip-0.9.8-r2.ebuild 3325
+SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98 hplip-0.9.8-r2.ebuild 3325
+EBUILD hplip-1.6.6.ebuild 3255 RMD160 02555b15c74e5aafd643b5ffc93c332744c4034d SHA1 d53e3f7cdf0a70e5cb5f183971b71c95e30c03b9 SHA256 543c582132ffd3027b4eef0023bb23e909dce69e59fe4d9929c5a042bb2d0021
+MD5 e9a3e976f4a499ab699d92673527f656 hplip-1.6.6.ebuild 3255
+RMD160 02555b15c74e5aafd643b5ffc93c332744c4034d hplip-1.6.6.ebuild 3255
+SHA256 543c582132ffd3027b4eef0023bb23e909dce69e59fe4d9929c5a042bb2d0021 hplip-1.6.6.ebuild 3255
+MISC ChangeLog 6135 RMD160 ad816567266e736c0cfaf443f495e7f54733a737 SHA1 75c396907504b756213c144c5febda7628fae4a2 SHA256 438be7f64b774ba83c4b145a2804160a4f348239b7e3e09a40974a91a3d2b5e2
+MD5 df19a2eaf83dae479324a47402a0630d ChangeLog 6135
+RMD160 ad816567266e736c0cfaf443f495e7f54733a737 ChangeLog 6135
+SHA256 438be7f64b774ba83c4b145a2804160a4f348239b7e3e09a40974a91a3d2b5e2 ChangeLog 6135
+MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
+SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
+MD5 85fb640ceecd949521bef397e8e23d0b files/digest-hplip-0.9.11-r1 768
+RMD160 5be0a15eae5e2d919910baded2a70d1d9696f824 files/digest-hplip-0.9.11-r1 768
+SHA256 c9159b89ae9462b8430efca095dc5291db44a1409e61650c4ea8a8321d997001 files/digest-hplip-0.9.11-r1 768
+MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
+RMD160 d7b115f1f976ff65f4d1ff39a4116f3b28b52c9a files/digest-hplip-0.9.7-r3 208
+SHA256 aef6c585a691ad40bab1d0822f328f0b272e11cc05803ddc3d7ce4c436fd229c files/digest-hplip-0.9.7-r3 208
+MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
+RMD160 c64b7394f53159c066f614b52759f07b24f0a2eb files/digest-hplip-0.9.8-r2 762
+SHA256 079f5ac90d4d00f03099796a7f307aebff27f22c546cb44b696cdf33dfb1625b files/digest-hplip-0.9.8-r2 762
+MD5 c0d122eabe6edd697928b8ebc16e5d00 files/digest-hplip-1.6.6 518
+RMD160 5c51391233b44dc618afe99ed23e961c960912b7 files/digest-hplip-1.6.6 518
+SHA256 c512c5108775eb02c47ffeacf8d0575acfc77d648d1a3dcc5b9a2dbc1d328847 files/digest-hplip-1.6.6 518

diff --git a/net-print/hplip/files/digest-hplip-1.6.6 b/net-print/hplip/files/digest-hplip-1.6.6
index 1a434ce097e8f9d9a57ed335f660f45bac7ff517..782e3d8985d399a3953a3320c25ffb9f8e381c19 100644 (file)
--- a/net-print/hplip/files/digest-hplip-1.6.6
+++ b/net-print/hplip/files/digest-hplip-1.6.6
@@ -1,2 +1,6 @@
-MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
+MD5 5aa44a363ceea0adad2c8fa5db4aa41f foomatic-db-hpijs-20060615.tar.gz 98297
+RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 foomatic-db-hpijs-20060615.tar.gz 98297
+SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d foomatic-db-hpijs-20060615.tar.gz 98297
 MD5 292fbcc25b79d273d7280760ce797666 hplip-1.6.6.tar.gz 10429794
+RMD160 84171d39677e132915169cb4c687271325777f25 hplip-1.6.6.tar.gz 10429794
+SHA256 cb148342ef56de7426290a8556114de440ff01ed36008ab81ea64755828701d0 hplip-1.6.6.tar.gz 10429794

diff --git a/net-print/hplip/hplip-1.6.6.ebuild b/net-print/hplip/hplip-1.6.6.ebuild
index d1aa7abceca683b3cb598551382decd02e58508c..0f80b728aef7b510e37d5b3d9a27f942a0fbf0a4 100644 (file)
--- a/net-print/hplip/hplip-1.6.6.ebuild
+++ b/net-print/hplip/hplip-1.6.6.ebuild
@@ -1,28 +1,27 @@
 # 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.6.ebuild,v 1.1 2006/06/16 00:44:34 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6.ebuild,v 1.2 2006/06/17 00:15:05 genstef Exp $
 
 inherit eutils
 
-DB_V=1.5-20060211
+DB_V=20060615
 DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
 HOMEPAGE="http://hplip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-       foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz )"
+       foomaticdb? ( http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz )"
        #http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt ppds scanner cups"
+IUSE="foomaticdb snmp X qt ppds scanner"
 
-DEPEND="dev-lang/python
+DEPEND=">=dev-lang/python-2.2.0
        snmp? ( >=net-analyzer/net-snmp-5.0.9 )
        !net-print/hpijs
        !net-print/hpoj"
 
 RDEPEND="virtual/ghostscript
-       >=dev-lang/python-2.2.0
        scanner? (
                >=media-gfx/sane-backends-1.0.9
                || (
@@ -38,29 +37,46 @@ RDEPEND="virtual/ghostscript
        >=net-print/foomatic-filters-3.0.2
        ${DEPEND}"
 
+pkg_setup() {
+       # avoid collisions
+       if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
+               rm ${ROOT}/usr/libexec/cups/backend/hp;
+       fi
+}
+
 src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
-               "${S}"/scan/sane/mfpdtf.h
-
        # bug 98428
        sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-               "${S}"/hpssd.py
+               hpssd.py
 }
 src_compile() {
-       myconf="${myconf} --disable-cups-install --disable-foomatic-install"
-
-       use snmp || myconf="${myconf} --disable-network-build"
+       econf \
+               $(use_enable snmp network-build) \
+               $(use_enable cups cups-install) \
+               $(use_enable ppds foomatic-install) \
+               || die "econf failed"
+       emake || die "emake failed"
 
-       econf ${myconf} || die "Error: econf failed!"
-       emake || die "Error: emake failed!"
+       if use foomaticdb ; then
+               cd ../foomatic-db-hpijs-${DB_V}
+               econf || die "econf failed"
+               rm -fR data-generators/hpijs-rss
+               emake || die "emake failed"
+       fi
 }
 
 
 src_install() {
-       make DESTDIR="${D}" install
+       # cups-1.2 installation paths, make sure that the .desktop is installed
+       sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
+               -e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
+               -e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
+               Makefile
+
+       emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
        newinitd "${FILESDIR}"/hplip.init.d hplip
 
@@ -87,34 +103,14 @@ src_install() {
                rm -f "${D}"/usr/bin/hp-toolbox
                rm -f "${D}"/usr/share/hplip/print
                rm -f "${D}"/usr/share/hplip/toolbox
-               rm -f "${D}"/usr/share/hplip/data/hplip.desktop
                rm -f "${D}"/usr/share/applications/hplip.desktop
+               rm -f "${D}"/usr/lib/menu/hplip
        fi
 
-       if use ppds; then
-               dodir /usr/share
-               mv "${S}"/prnt/hpijs/ppd/* "${D}"/usr/share/ppd
-       fi
-
-       if use cups && use ppds ; then
-               dodir /usr/share/cups/model
-               dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-       fi
-
-       [ -e /usr/bin/foomatic-rip ] && rm -f "${D}"/usr/bin/foomatic-rip
+       rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
 
        if use foomaticdb ; then
                cd ../foomatic-db-hpijs-${DB_V}
-               econf || die "econf failed"
-               rm -fR data-generators/hpijs-rss
-               make || die
-               make DESTDIR="${D}" install || die
-       fi
-
-       # desktop entry, bug 122758
-       if use qt; then
-               dodir /usr/share/applications
-               mv "${D}"/usr/share/hplip/data/hplip.desktop \
-               "${D}"/usr/share/applications
+               emake DESTDIR="${D}" install || die "emake install failed"
        fi
 }