From: Denis Dupeyron Date: Tue, 1 May 2007 14:14:10 +0000 (+0000) Subject: Removed net-print/hpoj, use net-print/hplip instead. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d400c66d96a9f7c562ddebc88f4eb378e778cec;p=gentoo.git Removed net-print/hpoj, use net-print/hplip instead. --- diff --git a/net-print/hpoj/ChangeLog b/net-print/hpoj/ChangeLog deleted file mode 100644 index 5b9488edb082..000000000000 --- a/net-print/hpoj/ChangeLog +++ /dev/null @@ -1,104 +0,0 @@ -# ChangeLog for net-print/hpoj -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.26 2007/04/28 12:47:19 tove Exp $ - - 28 Apr 2007; Torsten Veller hpoj-0.91-r3.ebuild: - Use newinitd - - 04 Jan 2007; Diego Pettenò hpoj-0.91-r3.ebuild: - Fix broken autotools handling. - - 24 Jun 2006; Doug Goldstein hpoj-0.91-r3.ebuild: - USE flag change qt->qt3/qt4 bug #137785 - - 28 Jan 2006; Simon Stelling - +files/hpoj-0.91-kernel26.patch, -files/hpoj-0.91-kernel26.patch.bz2, - hpoj-0.91-r3.ebuild: - no need to bzip a smallish patch - - 25 Jul 2005; Caleb Tennis hpoj-0.91-r3.ebuild: - Change qt dep per bug #100235 - - 07 Jun 2005; Heinrich Wendel -hpoj-0.91-r2.ebuild, - hpoj-0.91-r3.ebuild: - cleanups, bug #78062 - - 01 Jun 2005; Heinrich Wendel hpoj-0.91-r2.ebuild, - hpoj-0.91-r3.ebuild: - fix mtools path - - 04 Jan 2005; Michael Hanselmann hpoj-0.91-r3.ebuild: - Added to ~ppc, bug 76504. - - 27 Apr 2004; Aron Griffis hpoj-0.91-r2.ebuild, - hpoj-0.91-r3.ebuild: - Add inherit eutils - - 26 Apr 2004; Aron Griffis hpoj-0.91-r2.ebuild, - hpoj-0.91-r3.ebuild: - Add die following econf for bug 48950 - -*hpoj-0.91-r3 (08 Apr 2004) - - 08 Apr 2004; Heinrich Wendel hpoj-0.91-r1.ebuild, - hpoj-0.91-r3.ebuild, files/hpoj-0.91-kernel26.patch.bz2: - add support for kernel 2.6, bug #42921 - - 27 Mar 2004; Heinrich Wendel hpoj-0.91-r2.ebuild, - files/hpoj.init: - add dep to hotplug if usb in use; fix hotplug dep in init script - - 02 Mar 2004; Heinrich Wendel hpoj-0.91-r2.ebuild: - stable on x86 - -*hpoj-0.91-r2 (22 Dec 2003) - - 22 Dec 2003; Heinrich Wendel hpoj-0.90-r1.ebuild, - hpoj-0.91-r2.ebuild, hpoj-0.91.ebuild, files/udev.patch: - added udev support, removed old ebuilds - -*hpoj-0.91-r1 (12 Dec 2003) - - 12 Dec 2003; Bart Lauwers hpoj-0.91-r1.ebuild, hpoj-0.91.ebuild, hpoj-0.90-r1.ebuild: - updated ucd-snmp reference to virtuals/snmp - - 10 Dec 2003; Heinrich Wendel hpoj-0.91.ebuild: - stable - - 09 Nov 2003; Heinrich Wendel hpoj-0.91.ebuild: - added ptal-setup on upgrade notice - -*hpoj-0.91 (07 Nov 2003) - - 07 Nov 2003; Heinrich Wendel hpoj-0.91.ebuild, - files/ExMgr.cpp_patch, files/mlcd_make.patch: - bump - - 05 Nov 2003; Heinrich Wendel files/hpoj.init: - bug #32770 (hotplug) - - 09 Sep 2003; Heinrich Wendel hpoj-0.90-r1.ebuild: - removed dep on hpijs, added comment instead - - 29 Jul 2003; lanius@gentoo.org hpoj-0.90-r1.ebuild: - stable bump - - 20 Jul 2003; Heinrich Wendel hpoj-0.90-r1.ebuild, - - Added missing header - - remove comment on hpijs because it is already in deps - -*hpoj-0.90-r1 (15 Jul 2003) - - 15 Jul 2003; Heinrich Wendel hpoj-0.90-r1.ebuild, - files/hpoj.init: - fixed bugs: #23304 (init.d wrapper script), #23010 (X dep fix), - #21109 (use usb = libusb dep), #21108(init.d before cupsd) - - 20 Jun 2003; hpoj-0.90.ebuild: - stop the creation of /dosym (bug 23208) - only try to install xojpanel if built - -*hpoj-0.90 (25 Apr 2003) - 25 Apr 2003; Thomas Raschbacher hpoj-0.90.ebuild - initial import (bug #11527 ) - diff --git a/net-print/hpoj/Manifest b/net-print/hpoj/Manifest deleted file mode 100644 index 3d19b063aac3..000000000000 --- a/net-print/hpoj/Manifest +++ /dev/null @@ -1,38 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX hpoj-0.91-kernel26.patch 2708 RMD160 a095bbf4f39f1c2eb0240a4d0d84d32460f82ce1 SHA1 a69556d2279c12059037eea030417e2863f95659 SHA256 07a1188f25a698f67236f066e41cef62753aa82d3f3171eda75e2184c76f1d8b -MD5 c2e2100738f6922303f0be548c5ba8d5 files/hpoj-0.91-kernel26.patch 2708 -RMD160 a095bbf4f39f1c2eb0240a4d0d84d32460f82ce1 files/hpoj-0.91-kernel26.patch 2708 -SHA256 07a1188f25a698f67236f066e41cef62753aa82d3f3171eda75e2184c76f1d8b files/hpoj-0.91-kernel26.patch 2708 -AUX hpoj.init 210 RMD160 1645eb2ea9bbbbab720c20321dafcaa57da7f21d SHA1 c678b6807d1f8a122ea2a812a6f9ff9ae95cc464 SHA256 d278720b9db96ca172de25ad1e0d2fc0e0566ae5f2053eec61a55d105100574d -MD5 2b8258745c95cdde3dc7d0293aaaf0c4 files/hpoj.init 210 -RMD160 1645eb2ea9bbbbab720c20321dafcaa57da7f21d files/hpoj.init 210 -SHA256 d278720b9db96ca172de25ad1e0d2fc0e0566ae5f2053eec61a55d105100574d files/hpoj.init 210 -AUX udev.patch 349 RMD160 c01f7fb59291ade7e94d67ff49dfa7aa1a0db65e SHA1 4ef3ce0c80c9f000aefde06ae23d72c4ab711c64 SHA256 dd10f4e5486c41b13df5f438a984f9a6d99b98310158a2e026c73fb3a7766d68 -MD5 4f722c5c6fcc7d16dcf56c5c52db9874 files/udev.patch 349 -RMD160 c01f7fb59291ade7e94d67ff49dfa7aa1a0db65e files/udev.patch 349 -SHA256 dd10f4e5486c41b13df5f438a984f9a6d99b98310158a2e026c73fb3a7766d68 files/udev.patch 349 -DIST hpoj-0.91.tgz 542475 RMD160 916cbfc1c21306ce4e297b24af16d654e3e41788 SHA1 36785cf1a925f569ed3983b8c068620e2c9b4456 SHA256 4ddfc13e22bca7847f4f86f413fd258b1ee2f0642bc8972eeb5ff2d564235bf6 -EBUILD hpoj-0.91-r3.ebuild 3278 RMD160 a594ae25f09e718ac118ae07df4dd30d77ed5707 SHA1 7c75ef7b19d78db64d24192a2acffded90a7dd4c SHA256 3b3cd75553bd5cd2a9f1988cd161537b203e762e5fd6f898c10cb851de5a8096 -MD5 b0f5787db256b0f5c73fc9898a8eabbd hpoj-0.91-r3.ebuild 3278 -RMD160 a594ae25f09e718ac118ae07df4dd30d77ed5707 hpoj-0.91-r3.ebuild 3278 -SHA256 3b3cd75553bd5cd2a9f1988cd161537b203e762e5fd6f898c10cb851de5a8096 hpoj-0.91-r3.ebuild 3278 -MISC ChangeLog 3505 RMD160 5b5f537c6ea498edfd499e7561fbb32a0cabddab SHA1 d65636e03421e2e6d76bd33fe1b2f4a4e548e815 SHA256 86914e6beacbea45444fc91eabd6e707547306206de75dd6ca7c6cacf8f2d3c0 -MD5 53a33051e56d00fe99fcaf663bd0cb80 ChangeLog 3505 -RMD160 5b5f537c6ea498edfd499e7561fbb32a0cabddab ChangeLog 3505 -SHA256 86914e6beacbea45444fc91eabd6e707547306206de75dd6ca7c6cacf8f2d3c0 ChangeLog 3505 -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 0d9acd4b8a5218ac34b7f2620855672e files/digest-hpoj-0.91-r3 220 -RMD160 7a8fe761e207b409ce880a312ab32d7fcc9b874a files/digest-hpoj-0.91-r3 220 -SHA256 0a14ecd4a2ddd7f75e00e31b9fd78a4da22a34332bf0a062a29ea680d18b7cd0 files/digest-hpoj-0.91-r3 220 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGM0JeV3J2n04EauwRAqbkAJ9IgjcnK75yBOqep2hQWLbDD7ghQwCg1uA7 -Gr2IRcE27z/qmyvZspBTZzk= -=LxQB ------END PGP SIGNATURE----- diff --git a/net-print/hpoj/files/digest-hpoj-0.91-r3 b/net-print/hpoj/files/digest-hpoj-0.91-r3 deleted file mode 100644 index 2efdea4b1e0f..000000000000 --- a/net-print/hpoj/files/digest-hpoj-0.91-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0e083aeab9b00495aa433fa9465456e0 hpoj-0.91.tgz 542475 -RMD160 916cbfc1c21306ce4e297b24af16d654e3e41788 hpoj-0.91.tgz 542475 -SHA256 4ddfc13e22bca7847f4f86f413fd258b1ee2f0642bc8972eeb5ff2d564235bf6 hpoj-0.91.tgz 542475 diff --git a/net-print/hpoj/files/hpoj-0.91-kernel26.patch b/net-print/hpoj/files/hpoj-0.91-kernel26.patch deleted file mode 100644 index f86f003c44e8..000000000000 --- a/net-print/hpoj/files/hpoj-0.91-kernel26.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- scripts/ptal-init.in.orig 2004-02-26 03:29:54.319933782 +0100 -+++ scripts/ptal-init.in 2004-02-26 03:30:47.143429439 +0100 -@@ -86,6 +86,11 @@ - my $varLock="/var/lock"; - my $varLockSubsys="$varLock/subsys"; - my $osPlatform=`uname -s 2>/dev/null`; -+chomp $osPlatform; -+my $linuxVersion=($osPlatform eq 'Linux' ? `uname -r 2>/dev/null` : ''); -+$linuxVersion=~s/^(\s*)(\d+\.\d+)(\..*)$/$2/; -+chomp $linuxVersion; -+my $usbprintermodule = ($linuxVersion eq '2.6' ? "usblp" : "printer"); - my %devnames; - my %obsoleteDevnames; - my %configInfo; -@@ -1218,12 +1223,12 @@ - # undef -- skip USB probe - # 0 -- do nothing, proceed with USB probe - # >0 -- load printer.o --# <0 -- disable and unload printer.o -+# <0 -- disable and unload printer.o/usblp.o - sub linuxWhatShouldWeDoAboutUsbPrinterModule { - my $isSmp=&linuxIsSmp; - my $libusbSupported=&ptalMlcdSupportsLibusb; - my $usblpIsLoaded=&linuxUsblpIsLoaded; -- my $printerIsLoaded=&linuxModuleIsLoaded("printer"); -+ my $printerIsLoaded=&linuxModuleIsLoaded($usbprintermodule); - - # non-SMP: - if (!$isSmp) { -@@ -1257,9 +1262,10 @@ - } - goto allowInsmodPrinter; - -- # SMP, libusb support, some sort of printer.c functionality loaded: -+ # SMP, libusb support, some sort of printer.c/usblp.c -+ # functionality loaded: - } elsif ($usblpIsLoaded) { -- # printer.c compiled into the kernel: -+ # printer.c/usblp.c compiled into the kernel: - if (!$printerIsLoaded) { - if (!&askYN( - "\n". -@@ -1276,7 +1282,7 @@ - return undef; - } - -- # printer.c compiled and loaded as a module: -+ # printer.c/usblp.c compiled and loaded as a module: - } else { - promptDisableRmmodPrinter: - my $r=&askYN( -@@ -1297,8 +1303,9 @@ - } - } - -- # SMP, libusb support, printer.c enabled although not loaded: -- } elsif (!&linuxModuleIsDisabled("printer")) { -+ # SMP, libusb support, printer.c/usblp.c enabled although not -+ # loaded: -+ } elsif (!&linuxModuleIsDisabled($usbprintermodule)) { - goto promptDisableRmmodPrinter; - } - -@@ -1322,11 +1329,11 @@ - return 1; - } - if ($r<0) { -- $r=&linuxDisableAndUnloadModule("printer", -+ $r=&linuxDisableAndUnloadModule($usbprintermodule, - "to prevent possible system instability due to SMP+USB"); - } else { - linuxJustLoad: -- $r=&linuxInsmod("printer",$quiet); -+ $r=&linuxInsmod($usbprintermodule,$quiet); - } - if (!$r && !$quiet && - &askYN("\n*** Continue with the USB probe anyway".$msg,0)) { -@@ -1597,7 +1604,7 @@ - - } else { - my $parModulesLoaded=0; -- # Don't "modprobe printer" on SMP Linux with libusb support: -+ # Don't "modprobe printer/usblp" on SMP Linux with libusb support: - my $usbModulesLoaded= - (&ptalMlcdSupportsLibusb && - $osPlatform=~/Linux/ && &linuxIsSmp); diff --git a/net-print/hpoj/files/hpoj.init b/net-print/hpoj/files/hpoj.init deleted file mode 100644 index 925e955d75f7..000000000000 --- a/net-print/hpoj/files/hpoj.init +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/runscript -depend() { - before cupsd - after hotplug -} - -start() { - ebegin "Starting hpoj" - /usr/sbin/ptal-init start -q - eend $? -} - -stop() { - ebegin "Stopping hpoj" - /usr/sbin/ptal-init stop -q - eend $? -} diff --git a/net-print/hpoj/files/udev.patch b/net-print/hpoj/files/udev.patch deleted file mode 100644 index 809ff8a9fe13..000000000000 --- a/net-print/hpoj/files/udev.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- scripts/ptal-init.in.org 2003-12-22 16:36:49.981003792 +0100 -+++ scripts/ptal-init.in 2003-12-22 16:38:02.786653659 +0100 -@@ -42,7 +42,8 @@ - ); - my @usbWildcards=( - "/dev/usb/lp[0-9]*", -- "/dev/usblp[0-9]*" -+ "/dev/usblp[0-9]*", -+ "/dev/lp[0-9]*" - ); - # These wildcards are only used as a last resort for the ptal-printd - # "-like" template. diff --git a/net-print/hpoj/hpoj-0.91-r3.ebuild b/net-print/hpoj/hpoj-0.91-r3.ebuild deleted file mode 100644 index 8ff03895fd11..000000000000 --- a/net-print/hpoj/hpoj-0.91-r3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r3.ebuild,v 1.15 2007/04/28 12:47:19 tove Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils qt3 autotools - -DESCRIPTION="HP OfficeJet Linux driver" -HOMEPAGE="http://hpoj.sourceforge.net/" -SRC_URI="mirror://sourceforge/hpoj/${P}.tgz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~amd64 ~ppc" -IUSE="ssl scanner qt3 X snmp cups usb" - -DEPEND="qt3? ( $(qt_min_version 3.1) ) - ssl? ( >=dev-libs/openssl-0.9.6h ) - scanner? ( >=media-gfx/sane-backends-1.0.9 ) - scanner? ( || ( X? ( >=media-gfx/xsane-0.89 ) >=media-gfx/sane-frontends-1.0.9 ) ) - snmp? ( net-analyzer/net-snmp ) - cups? ( >=net-print/cups-1.1.18-r2 ) - usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug )" - -src_unpack() { - unpack ${A} - cd "${S}" - - eautoreconf -} - -src_compile() { - epatch "${FILESDIR}"/udev.patch - epatch "${FILESDIR}"/${P}-kernel26.patch - - use snmp \ - && myconf="${myconf} --with-snmp=/usr" \ - || myconf="${myconf} --without-snmp" - - use cups \ - && myconf="${myconf} --with-cups-backend=/usr" \ - || myconf="${myconf} --without-cups" - - # xojpanel - use qt3 \ - && myconf="${myconf} --with-qt=/usr/qt/3" \ - || myconf="${myconf} --without-qt" - - use scanner \ - && myconf="${myconf} --with-sane-packend=/usr" \ - || myconf="${myconf} --without-sane" - - econf ${myconf} || die "econf failed" - emake || die "compilation failed" -} - -src_install() { - cd apps/cmdline - dobin ptal-print hpojip-test ptal-connect ptal-device ptal-devid ptal-hp ptal-pml - cd ../../doc - dohtml *html - cd .. - dodoc COPYING LICENSE LICENSE.OpenSSL README - use qt3 && dobin apps/xojpanel/xojpanel - dodir /usr/include - insinto /usr/include - doins include/hpojip.h include/ptal.h - cd lib - dolib.so hpojip/libhpojip.so* - dolib.so ptal/libptal.so* - dodir /usr/lib/sane - insinto /usr/lib/sane - doins sane/libsane-hpoj.so* - dodir /usr/lib/ghostscript/filt \ - /usr/lib/ghostscript/filt/bjc600 \ - /usr/lib/ghostscript/filt/bjc600.1 \ - /usr/lib/ghostscript/filt/bjc600.16 \ - /usr/lib/ghostscript/filt/bjc600.24 \ - /usr/lib/ghostscript/filt/bjc600.24.3 \ - /usr/lib/ghostscript/filt/bjc600.32 \ - /usr/lib/ghostscript/filt/bjc600.8 \ - /usr/lib/ghostscript/filt/bjc600.8.1 \ - /usr/lib/ghostscript/filt/bjt600.32 \ - /usr/lib/ghostscript/filt/direct \ - /usr/lib/ghostscript/filt/gsif \ - /usr/lib/ghostscript/filt/indirect \ - /usr/lib/ghostscript/filt - cd .. - dosbin apps/cmdline/ptal-photod apps/cmdline/ptal-printd mlcd/ptal-mlcd scripts/ptal-cups - exeinto /usr/sbin - doexe scripts/ptal-init - dodir /usr/lib/cups/backend - dosym /usr/sbin/ptal-cups /usr/lib/cups/backend/ptal - newinitd "${FILESDIR}"/hpoj.init hpoj -} - -pkg_postinst() { - echo - einfo "You might want to emerge sys-fs/mtools for photo-card support." - echo - einfo "You might want to emerge net-print/hpijs for better printing quality." - echo - einfo "Before starting hpoj you have to set it up with 'ptal-init setup'" - echo - einfo "If you are upgrading from a previous version, re-run ptal-init setup" - einfo "as the format of the connection has changed again and your previously" - einfo "installed hpoj-device will not be recognized." - echo - einfo "net-print/hpoj is deprecated, please use net-print/hplip" - echo -} diff --git a/net-print/hpoj/metadata.xml b/net-print/hpoj/metadata.xml deleted file mode 100644 index 1fa0ca569505..000000000000 --- a/net-print/hpoj/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -printing -