From: Marcelo Góes Date: Sat, 24 Feb 2007 22:06:05 +0000 (+0000) Subject: Re-adding hplip-1.6.10 since scanning is broken with newer versions. This is a workar... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4da62220d6f7459c5468ac47c08bc952f42c50a3;p=gentoo.git Re-adding hplip-1.6.10 since scanning is broken with newer versions. This is a workaround for bug 161926. Thanks to direx , Francisco Lloret and jim stead . Versions 1.6.12 and 1.7.1 will be kept masked until the scanning problem is sorted out. Package-Manager: portage-2.1.1-r2 --- diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index 1f585791bc6c..b3b1faa05974 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-print/hplip # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.48 2007/02/19 22:49:58 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.49 2007/02/24 22:06:05 vanquirius Exp $ + + 24 Feb 2007; Marcelo Goes +hplip-1.6.10.ebuild: + Re-adding hplip-1.6.10 since scanning is broken with newer versions. This is + a workaround for bug 161926. Thanks to direx , Francisco Lloret and jim stead + . Versions 1.6.12 and 1.7.1 will be kept + masked until the scanning problem is sorted out. *hplip-1.7.1 (19 Feb 2007) diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index 2f02b0233a7b..179d41ff5854 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -10,12 +10,17 @@ DIST foomatic-db-hpijs-1.5-20051126.tar.gz 87836 RMD160 c7073520c3f19d90d19cabf9 DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d SHA1 0e4ec08d01cd28bb751bc2e5844f0d0f7b97ba42 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e DIST hplip-0.9.7-2.patch 25718 RMD160 1b29ff9ffe77dd95f6202302e5c26fd18593af24 SHA1 825a134734cee1fc9a06c8de60cfe1825d47fa54 SHA256 7d406c7d77aa4825d4401c3d5c52b6564d49854fc8cf34ba84ce291b5429eb4c DIST hplip-0.9.7.tar.gz 9705231 RMD160 5c742564fa42a99fddf0f46ea177a28c22fe7cf6 SHA1 b354a6cf8f5b81f9242c3978c2ab22c752e4f77d SHA256 1aaa494d4297c598dfd85632d55e0942995b44011b580166e5c30df82a749ff6 +DIST hplip-1.6.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f DIST hplip-1.6.12.tar.gz 10679971 RMD160 eec181a1edbbb9087118b4f4c9447b042e202814 SHA1 934da62dddfa1c2dbdb38b6b25adf94619e9b55b SHA256 dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24 DIST hplip-1.7.1.tar.gz 10874573 RMD160 a6fb08542256408c29fc08974442c89308a7a0a7 SHA1 738f2fbf60d0b6d91e0f813f4a825b464844f166 SHA256 155bddb595466a8008665fb1bbef6ab2a84addfc0cb3e60fa63592dc4525eac8 EBUILD hplip-0.9.7-r3.ebuild 3346 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c SHA1 ab473af0d48815e1d42116cd2c0030b6bf43661a SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5 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 3680 RMD160 ad1a37c9d4c594b0bef6cc9ae171b26a8336525c SHA1 e2b76d12ac1f102fb4d3536fbffa39c0cce79094 SHA256 07a0aac8bf7e88ae88563d0ee524f777522d6f0eb3e3b24153c99b361b972575 +MD5 b162643d78d527f80850edb96d02e9ab hplip-1.6.10.ebuild 3680 +RMD160 ad1a37c9d4c594b0bef6cc9ae171b26a8336525c hplip-1.6.10.ebuild 3680 +SHA256 07a0aac8bf7e88ae88563d0ee524f777522d6f0eb3e3b24153c99b361b972575 hplip-1.6.10.ebuild 3680 EBUILD hplip-1.6.12.ebuild 3206 RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40 SHA1 f0d881832645444b6c0ef3c3bcfc72b4586c8c55 SHA256 59beca135049fefc0fe4ccb3916880483c017313e2392b3ab2627f15dbf32703 MD5 2785394a0cc45f621ff02b35c9d94999 hplip-1.6.12.ebuild 3206 RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40 hplip-1.6.12.ebuild 3206 @@ -24,10 +29,10 @@ EBUILD hplip-1.7.1.ebuild 3245 RMD160 e11ab4e33130d54888879fecd91751ad840b8ea4 S MD5 3ad93886963bc1bd98ff22081fdeae43 hplip-1.7.1.ebuild 3245 RMD160 e11ab4e33130d54888879fecd91751ad840b8ea4 hplip-1.7.1.ebuild 3245 SHA256 ad6bd1c10352360a6f86911af70a0cc0d56341a670bf740d13c735325685d271 hplip-1.7.1.ebuild 3245 -MISC ChangeLog 8494 RMD160 8518028c8c7fe75bea62297e65516b8ec23785df SHA1 4372e9006ea20711abd7fc2b43733746d6493117 SHA256 7cd5d03a9f114fc158fa3d880edb6ce3fed23085e87cf5ffbaa4cf73a57699a7 -MD5 2ab1e6069a146646560914f922f36a11 ChangeLog 8494 -RMD160 8518028c8c7fe75bea62297e65516b8ec23785df ChangeLog 8494 -SHA256 7cd5d03a9f114fc158fa3d880edb6ce3fed23085e87cf5ffbaa4cf73a57699a7 ChangeLog 8494 +MISC ChangeLog 8926 RMD160 1db9545ce4db42b5987a9f299ebe3e63eacc0d17 SHA1 55cce6dc85211d8b72998275ba6b7966eb5bfa49 SHA256 675c2d72325bb91e33fb1e1ccea65298cb32818f4c002a857963ff815808dfc2 +MD5 17e29da70e755db25e8d3bb97c861d69 ChangeLog 8926 +RMD160 1db9545ce4db42b5987a9f299ebe3e63eacc0d17 ChangeLog 8926 +SHA256 675c2d72325bb91e33fb1e1ccea65298cb32818f4c002a857963ff815808dfc2 ChangeLog 8926 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -35,9 +40,12 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata MD5 759a2fc253c81dea17ec09d6a7b77f2b files/digest-hplip-0.9.7-r3 762 RMD160 3d451b250dadfc497f90b1551603db053c24b988 files/digest-hplip-0.9.7-r3 762 SHA256 e04252a3484d93417d9e32f27158e97819517e2b0f7408abf49247a7f78b5387 files/digest-hplip-0.9.7-r3 762 -MD5 92a093b361728d0faafb11cbc041a406 files/digest-hplip-1.6.12 444 -RMD160 cb3f8399ee283d7e2e7625dbac51146eaff659f8 files/digest-hplip-1.6.12 444 -SHA256 ac7a6173be1afe2adec33b5f1e62f323496f418167155b1a41a40ca6018bee8d files/digest-hplip-1.6.12 444 -MD5 5988013f1847ade951d944734af2da02 files/digest-hplip-1.7.1 441 -RMD160 4c1ab7653265da406cf480ea1b625131d2630e2c files/digest-hplip-1.7.1 441 -SHA256 5ce1bcfc264c89e713749af270e882d642e0c1307adcac8ad42479560c86e676 files/digest-hplip-1.7.1 441 +MD5 2bbef9d8400c26b5a2bc15636d0db05b files/digest-hplip-1.6.10 521 +RMD160 fdbb47f4de10565f30fc32fcaa11d63def826a41 files/digest-hplip-1.6.10 521 +SHA256 a6a40ef739f13c2b5baf4d46161d709d65d1770a0bef40d472cd3161562c92ef files/digest-hplip-1.6.10 521 +MD5 25709caf12f71ccff6338308fda25d91 files/digest-hplip-1.6.12 521 +RMD160 e367642fb5c3875b48eba53c30ff237bdef297df files/digest-hplip-1.6.12 521 +SHA256 2a2ae331805179cb84ed4a7b4443a5e461f87544e8411127ea2f539180c06f86 files/digest-hplip-1.6.12 521 +MD5 4a96c1785e157ed4d9748528ae5eee67 files/digest-hplip-1.7.1 518 +RMD160 332e1945753918e84a23a91c0b6646d2cbc66a57 files/digest-hplip-1.7.1 518 +SHA256 23a17862b356504005764189abe03f10a1cbb5e140f91c942c827bce5db59a3d files/digest-hplip-1.7.1 518 diff --git a/net-print/hplip/files/digest-hplip-1.6.10 b/net-print/hplip/files/digest-hplip-1.6.10 new file mode 100644 index 000000000000..0ebd3f0dbc26 --- /dev/null +++ b/net-print/hplip/files/digest-hplip-1.6.10 @@ -0,0 +1,6 @@ +MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252 +RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252 +SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252 +MD5 01519018343978776fe4acfbdb7cb6df hplip-1.6.10.tar.gz 10561620 +RMD160 3608757fca36865528565c0c40571d91a936fd3f hplip-1.6.10.tar.gz 10561620 +SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f hplip-1.6.10.tar.gz 10561620 diff --git a/net-print/hplip/files/digest-hplip-1.6.12 b/net-print/hplip/files/digest-hplip-1.6.12 index eaa4baec97d2..ae62527870b2 100644 --- a/net-print/hplip/files/digest-hplip-1.6.12 +++ b/net-print/hplip/files/digest-hplip-1.6.12 @@ -1,3 +1,4 @@ +MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252 MD5 8adcb93703f6e90510f51b3cf96567c9 hplip-1.6.12.tar.gz 10679971 diff --git a/net-print/hplip/files/digest-hplip-1.7.1 b/net-print/hplip/files/digest-hplip-1.7.1 index 51029e2e9b40..9c5196847453 100644 --- a/net-print/hplip/files/digest-hplip-1.7.1 +++ b/net-print/hplip/files/digest-hplip-1.7.1 @@ -1,3 +1,4 @@ +MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252 MD5 1732a8544413ba8557c8b71929d848fa hplip-1.7.1.tar.gz 10874573 diff --git a/net-print/hplip/hplip-1.6.10.ebuild b/net-print/hplip/hplip-1.6.10.ebuild new file mode 100644 index 000000000000..98ac7c16c047 --- /dev/null +++ b/net-print/hplip/hplip-1.6.10.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2007 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.5 2007/02/24 22:06:05 vanquirius Exp $ + +inherit eutils + +DB_V=20060720 +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? ( + 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 qt3 ppds scanner" + +DEPEND=">=dev-lang/python-2.2.0 + snmp? ( >=net-analyzer/net-snmp-5.0.9 ) + !net-print/hpijs + !net-print/hpoj + virtual/ghostscript + scanner? ( + >=media-gfx/sane-backends-1.0.9 + || ( + X? ( >=media-gfx/xsane-0.89 ) + >=media-gfx/sane-frontends-1.0.9 + ) + ) + qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* ) + >=dev-libs/libusb-0.1.10a + sys-apps/hotplug-base + net-print/cups + foomaticdb? ( net-print/foomatic-db-engine ) + >=net-print/foomatic-filters-3.0.2" +RDEPEND="${DEPEND}" + +pkg_setup() { + # avoid collisions with cups-1.2 compat symlinks + if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then + rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax}; + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # bug 98428 + sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \ + hpssd.py +} +src_compile() { + econf \ + $(use_enable snmp network-build) \ + $(use_enable cups cups-install) \ + $(use_enable ppds foomatic-install) \ + || die "econf failed" + emake || die "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() { + # 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 + + if use scanner; then + 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/$(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 + rm -f "${D}"/etc/sane.d/dll.conf + fi + + # bug 106035 + if ! use qt3 ; then + rm -f "${D}"/usr/bin/hp-print + 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/applications/hplip.desktop + rm -f "${D}"/usr/lib/menu/hplip + fi + + rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip + + if use foomaticdb ; then + cd ../foomatic-db-hpijs-${DB_V} + emake DESTDIR="${D}" install || die "emake install failed" + fi +} + +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 ] && cp ${ROOT}/etc/sane.d/dll.conf . + grep -q hpaio dll.conf || echo hpaio >> dll.conf + doins dll.conf + fi +}