Bump to EAPI=4. Use mirrored dillo.png (bug #370899).

Package-Manager: portage-2.2.0_alpha66/cvs/Linux i686

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index c906484bba023d1430374d8a64c80bc741d715bd..90f98f8d4741788ea70c3986682536e7ec998dff 100644 (file)
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/dillo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.96 2011/10/12 01:06:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.97 2011/10/12 01:17:54 jer Exp $
+
+  12 Oct 2011; Jeroen Roovers <jer@gentoo.org> dillo-3.0.1.ebuild:
+  Bump to EAPI=4. Use mirrored dillo.png (bug #370899).
 
   12 Oct 2011; Jeroen Roovers <jer@gentoo.org> dillo-3.0.1.ebuild:
   Commit properly patched ebuild.

diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 15183edeb045ab5a1f6b5e44d8f94a06f54546d2..352224c6e8d47c244cdc98176cd0e29f8aab69b7 100644 (file)
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -7,16 +7,17 @@ AUX dillo2-inbuf.patch 393 RMD160 e1b976f0ceb0693d2e39c0ee1f8a68db3af4f7bb SHA1
 DIST dillo-2.2.1.tar.bz2 633999 RMD160 8737abedf0377d2392eb769336f0f03616158f65 SHA1 ddee2219e356bf085e29285cdd7094f9363e0fa7 SHA256 70c5768abe8234ffc65a833c8b663f30f115011096367d63a2a0fa39d5df7181
 DIST dillo-2.2.tar.bz2 630259 RMD160 050f5bcd46042764c9bba536e6e5fd97453e1d6f SHA1 06b325a246a639d936dabfc73d005f951d23c151 SHA256 f4352970bda70404faa66d1fc90e1dcd1e3417266bf4e29759674d48804ac2ba
 DIST dillo-3.0.1.tar.bz2 625504 RMD160 bc818e8bd94dd31916151c0e2cf46b101882b5ad SHA1 fd7324d0ceee05b4dc189f06ed0483ef5ac2c28a SHA256 3e49e6ffc237792b97576bb324f6dc7e49b91f464e5de67b1dd2a811cdab73f3
+DIST dillo.png 6135 RMD160 e15bf21c6f86256967ca49d1222429660e3aeeb6 SHA1 6933b0f63b1621bdc766f2eefa39816c7a9da22f SHA256 de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3
 EBUILD dillo-2.2.1.ebuild 1524 RMD160 23b84b585503c9827edbf15f386b604d5109d2a4 SHA1 f26eeef03e7738d09cb6eeb418b89305bb8ca1c8 SHA256 38dd72654dfc5b480dc35ad2cb654a5678fa23e8208a8372474f61813076a9c5
 EBUILD dillo-2.2.ebuild 1555 RMD160 fe8eecf45d340143ff58df117965840ee4b1d577 SHA1 46bb4d34f62ab4ef2fcef8206b79e8fad35eaebf SHA256 ca08b2ba339624d10c96f812fda34172058f21b5d67e847fe261f6434551aa80
-EBUILD dillo-3.0.1.ebuild 1513 RMD160 6ae2f17805197a003cec1afa21b39a4cf4286164 SHA1 2bc7ca0bd6f01d7de3737535a991c7c884c0b714 SHA256 124d7e73416f321341eeb6aca379ab09bd4df440c9a1b7dd666118fcad0ac9f2
+EBUILD dillo-3.0.1.ebuild 1438 RMD160 45b903ef0b218985edcf03a0b642137847140919 SHA1 4819ef22592e845859107ea691d130eab5f1e38a SHA256 a7e75ae598723c9febe91fc0c8818aa49217e224873c13a02b1efb1cecec64bf
 EBUILD dillo-9999.ebuild 1510 RMD160 0a26886cb00ac85e32ce1510296de7db261470a6 SHA1 c5bc688c865fdc3ffe42eb743148a3ae4666b359 SHA256 b8d9c7bd0abd000df8f0bd8122bc96e48076372f062a788f247a50ab6a26ab4d
-MISC ChangeLog 20266 RMD160 19ba0d7d7e7e83e5dc9f609b3201faefd6e793ba SHA1 4f211b7dce78b046b423b7b54755f40b4f693865 SHA256 ce5bc4ed18f16fd96e6f842c4e0a9af08a42ae24bb7dc076ca5a84e989d82ce6
+MISC ChangeLog 20390 RMD160 bdd1c9de5e2585c1208aca861dfdf1d722c4cc50 SHA1 edf05b967dda1127cad30fe723f1d0ac303d9bb6 SHA256 6c3c72426e006567884a9660a0e71530942c7208f63ec270ac7de6729ddeeced
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6U6AAACgkQVWmRsqeSphP0cQCfVo3UfaLj1rrsm1heKIY3Mxue
-NTYAnAtdmF0S3Xt55kZIWAQeGoLHQcN5
-=qhze
+iEYEARECAAYFAk6U6ssACgkQVWmRsqeSphMfVgCfYbQEdfuP2i80BTrIcL7zr5SS
+v2gAn1ldn+iim7D9I2dXTMr5fn0JSmy3
+=CuO2
 -----END PGP SIGNATURE-----

diff --git a/www-client/dillo/dillo-3.0.1.ebuild b/www-client/dillo/dillo-3.0.1.ebuild
index 8a3f7c3c1f0a45d43f5104296d5a14f47e0225d2..9225694f4d414bdc1b5f95ed0d35e8893201b0a4 100644 (file)
--- a/www-client/dillo/dillo-3.0.1.ebuild
+++ b/www-client/dillo/dillo-3.0.1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild,v 1.2 2011/10/12 01:06:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild,v 1.3 2011/10/12 01:17:54 jer Exp $
+
+EAPI="4"
 
-EAPI="2"
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Lean FLTK2-based web browser"
 HOMEPAGE="http://www.dillo.org/"
-SRC_URI="http://www.dillo.org/download/${P}.tar.bz2"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+       mirror://gentoo/dillo.png"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -37,7 +39,7 @@ src_configure() {
 }
 
 src_compile() {
-       emake || die "make failed"
+       default
        if use doc ; then
                doxygen Doxyfile || die "doxygen failed"
        fi
@@ -45,16 +47,16 @@ src_compile() {
 
 src_install() {
        dodir /etc
-       emake DESTDIR="${D}" install || die "install failed"
+       default
 
        if use doc; then
-               dohtml html/* || die "install documentation failed"
+               dohtml html/*
        fi
        dodoc AUTHORS ChangeLog README NEWS
        docinto doc
        dodoc doc/*.txt doc/README
 
-       doicon "${FILESDIR}"/dillo.png
+       doicon "${DISTDIR}"/dillo.png
        make_desktop_entry dillo Dillo dillo
 }