cleanups, bug #78062

(Portage version: 2.0.51.19)

5 files changed, 9 insertions, 116 deletions

diff --git a/net-print/hpoj/ChangeLog b/net-print/hpoj/ChangeLog
index 6cbe2f2a3d77..cda008279ce7 100644
--- a/net-print/hpoj/ChangeLog
+++ b/net-print/hpoj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hpoj
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.20 2005/06/01 00:41:01 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.21 2005/06/07 15:04:06 lanius Exp $
+
+  07 Jun 2005; Heinrich Wendel <lanius@gentoo.org> -hpoj-0.91-r2.ebuild,
+  hpoj-0.91-r3.ebuild:
+  cleanups, bug #78062
 
   01 Jun 2005; Heinrich Wendel <lanius@gentoo.org> hpoj-0.91-r2.ebuild,
   hpoj-0.91-r3.ebuild:
diff --git a/net-print/hpoj/Manifest b/net-print/hpoj/Manifest
index 5b08b5b51bd4..940891c0a2b1 100644
--- a/net-print/hpoj/Manifest
+++ b/net-print/hpoj/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 62eacb3066158c1e5a2baba86b29be80 hpoj-0.91-r2.ebuild 3059
 MD5 6a3f3bb0745a75f0a33c35ac3917a8d7 ChangeLog 2799
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 45796958c4b46f9d9b377c4c522d2770 hpoj-0.91-r3.ebuild 3107
+MD5 ab2e15415de7d10c4adf676a124ad034 hpoj-0.91-r3.ebuild 3135
 MD5 e78c4ef74538d9b47f113f580ce4bf28 files/hpoj-0.91-kernel26.patch.bz2 1191
-MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r2 58
 MD5 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r3 58
 MD5 2b8258745c95cdde3dc7d0293aaaf0c4 files/hpoj.init 210
 MD5 4f722c5c6fcc7d16dcf56c5c52db9874 files/udev.patch 349
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCnQVzevY57Fted3ERAl9iAJ4liy32/XuTurzWK2Tzi6FDUGRvAACgwNvI
-UB3yvOeTrBXhBiSwaBH5tqc=
-=Umnk
------END PGP SIGNATURE-----
diff --git a/net-print/hpoj/files/digest-hpoj-0.91-r2 b/net-print/hpoj/files/digest-hpoj-0.91-r2
deleted file mode 100644
index 761da4e580e8..000000000000
--- a/net-print/hpoj/files/digest-hpoj-0.91-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e083aeab9b00495aa433fa9465456e0 hpoj-0.91.tgz 542475
diff --git a/net-print/hpoj/hpoj-0.91-r2.ebuild b/net-print/hpoj/hpoj-0.91-r2.ebuild
deleted file mode 100644
index 077da8818db5..000000000000
--- a/net-print/hpoj/hpoj-0.91-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r2.ebuild,v 1.10 2005/06/01 00:41:01 lanius Exp $
-
-inherit eutils
-
-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"
-IUSE="ssl scanner qt X snmp cups usb"
-
-DEPEND="qt?      ( >=x11-libs/qt-3.1.0-r1 )
-	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 sys-apps/hotplug )"
-
-src_compile() {
-	epatch ${FILESDIR}/udev.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 qt \
-	&& 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 qt && 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
-	exeinto /etc/init.d
-	newexe ${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
-}
diff --git a/net-print/hpoj/hpoj-0.91-r3.ebuild b/net-print/hpoj/hpoj-0.91-r3.ebuild
index ffaa16c6a76d..de01de29c42a 100644
--- a/net-print/hpoj/hpoj-0.91-r3.ebuild
+++ b/net-print/hpoj/hpoj-0.91-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7 2005/06/01 00:41:01 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r3.ebuild,v 1.8 2005/06/07 15:04:06 lanius Exp $
 
 inherit eutils
 
@@ -41,6 +41,8 @@ src_compile() {
 	&& myconf="${myconf} --with-sane-packend=/usr" \
 	|| myconf="${myconf} --without-sane"
 
+	libtoolize --copy --force
+
 	econf ${myconf} || die "econf failed"
 	emake || die "compilation failed"
 }