EAPI bump; remove unrecognized configure options; dont try to install non-existent files (bug 297337)

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

3 files changed, 27 insertions, 16 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index 185e53d214b3..b27e7d1e072d 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.15 2011/04/24 14:24:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.16 2011/06/02 18:39:41 dilfridge Exp $
+
+  02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  gutenprint-5.2.6.ebuild:
+  EAPI bump; remove unrecognized configure options; dont try to install
+  non-existent files (bug 297337)
 
   24 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   gutenprint-5.2.6.ebuild:
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 1d95d4a9e854..ced811aa4088 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX gutenprint-5.2.4-CFLAGS.patch 781 RMD160 f9c6650d899768cc3e8cb846cca388aca8c33872 SHA1 248af46ba40397d0c75b5cbf2b9ee5a99990fc22 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438
 AUX gutenprint-5.2.5-Makefile.patch 564 RMD160 c292214f0a46d3cc36e6a08ac5fbc72a739279f7 SHA1 92df0231b7ce7b779c78f3ba80670acf032e5260 SHA256 b17043d3160e754ca1bb50acf92818f13d3f7983343c97508985f42aba288462
@@ -8,13 +8,23 @@ DIST gutenprint-5.2.5.tar.bz2 5215539 RMD160 cd88cd3ffc28fcc54e1de94d2f5ee069102
 DIST gutenprint-5.2.6.tar.bz2 5283223 RMD160 ede2dea11742c77fede450880685efcde3a91967 SHA1 9fbe1ab899d5e83f34e21534cc5c1b8921c9039b SHA256 4744e1b5aab4c78a5af8da629d83d8ca3d8d217171301dc905c2e11dca5edc7e
 EBUILD gutenprint-5.1.4.ebuild 2583 RMD160 62ceb05e24d0f6155c1ef8d9b6cbbd13426359b0 SHA1 5245949bc3987db34a62ad3f5ff0977e8547bdb8 SHA256 a96c2182807829c0545cd176e17a9748067e26ac134fca2f0afa5c41eb54f660
 EBUILD gutenprint-5.2.5-r1.ebuild 2564 RMD160 79d250dc1a8424a9e6538c2d12728605492e3014 SHA1 ac0df1235b6e3a7ce57f7d9869fde976a16433ee SHA256 218a4098056f276c7840fd522245e8c2b69e086ea5b675debf9ee405ddc2fc90
-EBUILD gutenprint-5.2.6.ebuild 2551 RMD160 fab49e0e61fe1e7f1706baeb8140cc8bb3f6fd87 SHA1 8afa701273fb3428240119031389d684073939d2 SHA256 5f6032f131cb2994c6b3be9d4a303ed5ce1db6b26e3fdfd62a8fccd54142e22e
-MISC ChangeLog 18208 RMD160 0ce4af5d07051c0c7f892d3d4f2f66b7c3b353bb SHA1 36764c321d521a25b286ede0c99e908d85eb1cf6 SHA256 1c166d055879031cf9f985eca3c4da9a5f50a97a5016d8158c44c0f2fb4633d5
+EBUILD gutenprint-5.2.6.ebuild 2387 RMD160 16a3302bb8d4f6338f4823b15824dc426b932427 SHA1 10f36f3f74c5f9ab12d7c327fbf1441195ccc3ac SHA256 a105d6a4aaf927f43753acf94e2c9dded3b697ed764ff72d627ac50e11fdc8a4
+MISC ChangeLog 18399 RMD160 ffbb4adb0333a499d337dc21725b4f931c245c9b SHA1 d02610914452f333e7074f819a352f2670bea6a0 SHA256 7953be040ce6bc624feab714af643f1cce58fa664606bcf6eb9ce1b4c1e0433e
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk20MooACgkQAiZjviIA2Xh0MgCfTuwA8lHFv06q58s/ase6n88e
-bfEAn1UTjoy3lpqZyp9WXDc1EX61VsW4
-=ANCy
+iQIcBAEBCgAGBQJN59jyAAoJENwGBM22xffeoMIP/i8aHxH7dhB+BU6HYJ+SrIFG
+PbiVXUFBwFXwoDO2EE4y2He1pMaaCeYKdVrsZlWzErIDRBnxLSudqoCeylP0Wo0y
+/Snp/qNqcvmnDXbr1K8GY21X2n7KkdNs3gcJPmRWKqEmkOEcJs5I+deaRKeyJxT1
+7Ac4z9tZi71NQtqbbcKoMo9O7oKQ7gGAN9yhsjibC9d5sbLCheqYs4VemH8AlkjT
+4CTuMKR/B7zGpqZAMPVnc31KoyBFsUeMVfpyL2jeqRWEYzKMngRvVmJLx9SZ9qqB
+4PyVywkf8Yk3x9nyM6ngsKpqQvmvbsSh+ydY8EmQwjxhRWZxgvXhSEosS5FP0w7S
+xOdV1u3payvMvHF7OPvraPl+aKus1hV0YTWX4WstS5ISqWQmPtd7F7TGPazH5oC8
+ZE8EbkXYf5Vh/0qY31KQHkjJXTosMbee7yes+A1QqR8UlEEllKSO3PzkGiCwg8XS
+/w1sefwY0AxVPBIr8ZPdyD0uJLIZrkMALoZjhA5Ol0yhDkMC0TQD5FZ1OabnnfrS
+Aau5avvmvF2HlnKw/VkuxSM6W52GNWgo2Wz1p9AvLVVA8WfhSAegRbpxnnX0kCMk
+B2bD6YoNrlCh4T9NKbghcKGKRxwa8CLxUGczlvIwR6bM2G4Hh+P2Tmf26H6tB0d+
+NnxvXafte0y//Jqkt/wo
+=VTYq
 -----END PGP SIGNATURE-----
diff --git a/net-print/gutenprint/gutenprint-5.2.6.ebuild b/net-print/gutenprint/gutenprint-5.2.6.ebuild
index ed9592f6f19d..fa1b39d22a95 100644
--- a/net-print/gutenprint/gutenprint-5.2.6.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.6.ebuild,v 1.3 2011/04/24 14:24:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.6.ebuild,v 1.4 2011/06/02 18:39:41 dilfridge Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit autotools flag-o-matic eutils multilib
 
@@ -56,26 +56,22 @@ src_configure() {
 
 	econf \
 		--enable-test \
-		--enable-epson \
 		--with-ghostscript \
-		--with-user-guide \
-		--with-samples \
-		--with-escputil \
 		--disable-translated-cups-ppds \
 		--enable-nls \
 		$(use_with readline) \
 		$(use_with gimp gimp2) \
 		$(use_with gimp gimp2-as-gutenprint) \
 		$(use_with cups) \
-		${myconf} || die "econf failed"
+		${myconf}
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt}
 	dohtml doc/FAQ.html
-	dohtml -r doc/gutenprintui2/html doc/gutenprint/developer-html
+	dohtml -r doc/gutenprintui2/html
 	rm -fR "${D}"/usr/share/gutenprint/doc
 	if ! use gtk && ! use gimp; then
 		rm -f "${D}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc