Fix broken autotools handling.

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/net-print/hpoj/ChangeLog b/net-print/hpoj/ChangeLog
index 70926e9fdb9980eb88e8bd73049896e22dd57c53..bd3eff467517cf4e0ec25d50942dd344cbe005d8 100644 (file)
--- a/net-print/hpoj/ChangeLog
+++ b/net-print/hpoj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/hpoj
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.24 2006/06/24 04:48:21 cardoe Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/ChangeLog,v 1.25 2007/01/04 16:55:43 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> hpoj-0.91-r3.ebuild:
+  Fix broken autotools handling.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> hpoj-0.91-r3.ebuild:
   USE flag change qt->qt3/qt4 bug #137785

diff --git a/net-print/hpoj/Manifest b/net-print/hpoj/Manifest
index e315248b483d46e94cdf93292ed14c2b83dcf1f6..26fceea7742f835f27a74c5b0989781260b86777 100644 (file)
--- a/net-print/hpoj/Manifest
+++ b/net-print/hpoj/Manifest
@@ -13,26 +13,26 @@ AUX udev.patch 349 RMD160 c01f7fb59291ade7e94d67ff49dfa7aa1a0db65e SHA1 4ef3ce0c
 MD5 4f722c5c6fcc7d16dcf56c5c52db9874 files/udev.patch 349
 RMD160 c01f7fb59291ade7e94d67ff49dfa7aa1a0db65e files/udev.patch 349
 SHA256 dd10f4e5486c41b13df5f438a984f9a6d99b98310158a2e026c73fb3a7766d68 files/udev.patch 349
-DIST hpoj-0.91.tgz 542475
-EBUILD hpoj-0.91-r3.ebuild 3221 RMD160 0add40de6b76f351dcd8131c06a1518bca5cf55c SHA1 b7e326b481e93072cf240ae0c57ae868a7bed3f0 SHA256 48342bab3ff4537fbcb1dfd1cb414abcbfb035e1f91e25494c515d01cf0fdb67
-MD5 b1554cab7b33b768856fa993bd7b8263 hpoj-0.91-r3.ebuild 3221
-RMD160 0add40de6b76f351dcd8131c06a1518bca5cf55c hpoj-0.91-r3.ebuild 3221
-SHA256 48342bab3ff4537fbcb1dfd1cb414abcbfb035e1f91e25494c515d01cf0fdb67 hpoj-0.91-r3.ebuild 3221
-MISC ChangeLog 3314 RMD160 cc7ae473de79d253b1fbfb6e5164130cc92f9058 SHA1 13fb2717163e037d7fa06dc65a0f28a64679fc16 SHA256 837aab2eb165e851feeb1320d0d719bc5a756b80fb167735688c9ba2df38660a
-MD5 5cd3824a819b3b57bfc4a38819a613a3 ChangeLog 3314
-RMD160 cc7ae473de79d253b1fbfb6e5164130cc92f9058 ChangeLog 3314
-SHA256 837aab2eb165e851feeb1320d0d719bc5a756b80fb167735688c9ba2df38660a ChangeLog 3314
+DIST hpoj-0.91.tgz 542475 RMD160 916cbfc1c21306ce4e297b24af16d654e3e41788 SHA1 36785cf1a925f569ed3983b8c068620e2c9b4456 SHA256 4ddfc13e22bca7847f4f86f413fd258b1ee2f0642bc8972eeb5ff2d564235bf6
+EBUILD hpoj-0.91-r3.ebuild 3296 RMD160 87be832c1a9f89231063fa32b74260c07db1fc7b SHA1 820ff66d0ee419bf67d83e4ebbbf3a8ceccfba37 SHA256 0335d645ffa30df9a7219c30220f247df428eaac280f3518a3581333453bc6bb
+MD5 a9a88afbb6124e72010a0b6600fdfa6a hpoj-0.91-r3.ebuild 3296
+RMD160 87be832c1a9f89231063fa32b74260c07db1fc7b hpoj-0.91-r3.ebuild 3296
+SHA256 0335d645ffa30df9a7219c30220f247df428eaac280f3518a3581333453bc6bb hpoj-0.91-r3.ebuild 3296
+MISC ChangeLog 3425 RMD160 5ba901cd096afb0eef7dc831ceda5b0ddabb1f2a SHA1 1b96addd51dde078adaf8dd4290c606c4f1ba803 SHA256 ad2df4198f7cfeedced574b6920ec69349e2a63ba813e454c3d57d547e2b149c
+MD5 395947ca323f4609445d646f5ee9dafe ChangeLog 3425
+RMD160 5ba901cd096afb0eef7dc831ceda5b0ddabb1f2a ChangeLog 3425
+SHA256 ad2df4198f7cfeedced574b6920ec69349e2a63ba813e454c3d57d547e2b149c ChangeLog 3425
 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 7b10c1855f92a1d1551de2c65128176f files/digest-hpoj-0.91-r3 58
-RMD160 6bf2f1a400737b7edfc46a23e18560f15efe6dc8 files/digest-hpoj-0.91-r3 58
-SHA256 ba0cdb8934e91c5f763a83d91ebfdfd8c54ec291a81859bab0c5a3f6bba85a26 files/digest-hpoj-0.91-r3 58
+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 v1.4.3 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEnMQgoeSe8B0zEfwRAn0hAJ9PEwJSVc8z7Pmin50G2UAfREZ6PQCdHeKI
-vDcc4JphAdaxDwyxj+K8WHI=
-=74lO
+iD8DBQFFnTGWAiZjviIA2XgRAofwAKDmnWdupTdoc0EksQPH+6D/90Z25QCgtLsj
+F+F5/ZcG/qv6b673r9WckKs=
+=dOeJ
 -----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
index 761da4e580e8df9de7c213c2ae72a02cd7d050b9..2efdea4b1e0f124532b70d58eacef076d82454c0 100644 (file)
--- a/net-print/hpoj/files/digest-hpoj-0.91-r3
+++ b/net-print/hpoj/files/digest-hpoj-0.91-r3
@@ -1 +1,3 @@
 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/hpoj-0.91-r3.ebuild b/net-print/hpoj/hpoj-0.91-r3.ebuild
index bdb3155030231d0365171fd6576822d38334cf07..8d8f24c5cdb9afeeac02c0f94fde800ca7a7cc3e 100644 (file)
--- a/net-print/hpoj/hpoj-0.91-r3.ebuild
+++ b/net-print/hpoj/hpoj-0.91-r3.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.13 2006/06/24 04:48:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpoj/hpoj-0.91-r3.ebuild,v 1.14 2007/01/04 16:55:43 flameeyes Exp $
 
-inherit eutils qt3
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils qt3 autotools
 
 DESCRIPTION="HP OfficeJet Linux driver"
 HOMEPAGE="http://hpoj.sourceforge.net/"
@@ -12,13 +15,20 @@ 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 )
+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 )"
+       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
@@ -41,8 +51,6 @@ src_compile() {
        && myconf="${myconf} --with-sane-packend=/usr" \
        || myconf="${myconf} --without-sane"
 
-       libtoolize --copy --force
-
        econf ${myconf} || die "econf failed"
        emake || die "compilation failed"
 }