old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 4941373a7f11c8a08424fa5f2bc279501b02e5bc..c890efaea9727324eaf01a6d6ee6c0726e4e3b12 100644 (file)
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/dillo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.101 2012/01/05 18:07:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.102 2012/01/05 18:12:31 ssuominen Exp $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> dillo-2.2.ebuild:
+  Backport dillo.png move to mirrors (#370899)
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>  -dillo-2.2.1.ebuild,
+  -dillo-9999.ebuild, -files/dillo.png:
+  old
 
   05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> dillo-3.0.1.ebuild:
   amd64/x86 stable wrt #395917

diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index ea1e6974f986055ab4277372e0d97bc2f0a6bdbb..8b6a168a3c8eba68ff586a93867249fb553c272d 100644 (file)
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -2,28 +2,24 @@
 Hash: SHA1
 
 AUX dillo-2.2-libpng14.patch 574 RMD160 2c5ceaa5e95a81101409b9bc118f501c8071c10f SHA1 2c435deba26efaaafce8235528f5ea1c97063eee SHA256 3161e6abc0a09cf2efe6461cc15d32ed22b2a06262393e62599b43d1207dfa6d
-AUX dillo.png 6135 RMD160 e15bf21c6f86256967ca49d1222429660e3aeeb6 SHA1 6933b0f63b1621bdc766f2eefa39816c7a9da22f SHA256 de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3
 AUX dillo2-inbuf.patch 393 RMD160 e1b976f0ceb0693d2e39c0ee1f8a68db3af4f7bb SHA1 f3033ddf7eadfd9d2cb24403f0acb2022304bf17 SHA256 29e44f3be9e37298264068662638b4e1c5c7d2c7226691dae691e9ea5234b330
-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-3.0.2.tar.bz2 640894 RMD160 418fa4926a86290dbbbc36942ceb1bac1d3bd407 SHA1 1d1258ee7d18c8ca0eabaf100f2f611c6be03f87 SHA256 b4f2cd7c1be9f09e705f68c095813ea5bb9d72870338fc36c61d687e042950d6
 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-2.2.ebuild 1502 RMD160 9599f8e4dace2f1a9791d4f3a17acd556e9eab7f SHA1 5b0b00ea5f97d2416315fcec6619ffa80a4d701b SHA256 ac8f18e6bb01ae71fe3f3b8522d1c68cd6192139781ee00cd9dc0dab80ff7a2c
 EBUILD dillo-3.0.1.ebuild 1414 RMD160 eb3a33077095fc9879dbbab77e4b9d366017af49 SHA1 7488dc24c21c9a05f08d5a9daae626704b4e7692 SHA256 406e23dda2eb8e740f41dd448c9ccb0a4ac64d2cf109431cc80cde3676458145
 EBUILD dillo-3.0.2.ebuild 1417 RMD160 5837fde374591a9381fb63897e36763b34f0d050 SHA1 7664d705a07e45a4b646bf89e486b086af3c2df5 SHA256 b3adffe7613cad7a2a70e76b6bec92857774b6ae74a669f1e3e594623119741f
-EBUILD dillo-9999.ebuild 1510 RMD160 0a26886cb00ac85e32ce1510296de7db261470a6 SHA1 c5bc688c865fdc3ffe42eb743148a3ae4666b359 SHA256 b8d9c7bd0abd000df8f0bd8122bc96e48076372f062a788f247a50ab6a26ab4d
-MISC ChangeLog 20885 RMD160 9567a68c518645f7d0efb0f8192270d59dd5cfd4 SHA1 c2238e2a6630fc8ee050cefbcdef1ccf9e14d32d SHA256 96fa67ba6d4e114623b929625a0e97f121e1e0f7cea76aa73d29c752ce117beb
+MISC ChangeLog 21128 RMD160 9aa60d2f5e7ee59827b11ae56bd502a013505a60 SHA1 9a2a0efb50984b77404ad41d827b5e467848e354 SHA256 2c362848ab14ab43b5e1550a19cac7dfbfa8cd4a270cb263cb60234e8cd73cad
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBeZeAAoJEEdUh39IaPFN/XwH/3A8m56XJTz8uyRJUH9q6DbI
-h9GPvgSzBC41ufEgPwuHZnAQQ4G0zjchbY90bpk83f9KtZl67OZYRbJu9UkoAbRf
-qGmK2LSrR5uUIJ4Y7yc1TqlB/WgdVfbkVHJHJfHXxv/vq8r0h+Xvlu19R2HnNItg
-WB7VJfqUFcs7FIdGLFgHrtHtX0UUuoWOX8rLYlobFVRUNIANkAwoFc/fJgAGxn86
-7/53UXRNrPMZ6Hu22h+1uHJ0mZsVqg5SLrmYX0QGvM0wvQG4QWMGFUw1OfsVv9RV
-qkmk6OpA8xU+0qTUdaTeZTbXT1do7t0KNKCeItKET22BBCSifF2Pzmd831SoC3k=
-=lQVR
+iQEcBAEBAgAGBQJPBeeUAAoJEEdUh39IaPFNxOUH/1GAqLsYpM1ttV3wVJooxMhK
+JBlunNzT1cQVSaAdhCHMjFeiI31QxPpymeV7Sy92eiNwWx7jkitV5lXcrnSqeVdo
+CDFwLeQihAm7XtYpbxRFtQLzzaqRfga2rR0nVQW+mbTnbljJguEdLX/yCQVlDoTR
+hOrqycWPhDGu6LkjBRBWCsexCOZ4fZqL9NiLmHABmnpWWKpcCaQ8PjWsrfST6zgo
+/bdg8WU96wm1XVYnAbSsZtmOOfOmz/DXks2ZDC0XjkdpdjPxUX2ZN69k82PajIeW
+zNtQXkmQrKa4KHfjXVpzdAt7L6OGB2EgQF0x/hCWDmrx6bFh1g6jSvpbE1L8i2I=
+=hXOR
 -----END PGP SIGNATURE-----

diff --git a/www-client/dillo/dillo-2.2.1.ebuild b/www-client/dillo/dillo-2.2.1.ebuild
deleted file mode 100644 (file)
index 2068beb..0000000
--- a/www-client/dillo/dillo-2.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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-2.2.1.ebuild,v 1.1 2011/08/01 15:38:08 patrick Exp $
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
-       sys-libs/zlib
-       jpeg? ( virtual/jpeg )
-       png? ( media-libs/libpng )
-       ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )"
-
-src_prepare() {
-       epatch "${FILESDIR}"/dillo2-inbuf.patch
-}
-
-src_configure() {
-       append-ldflags "-L/usr/$(get_libdir)/fltk"
-       econf  \
-               $(use_enable gif) \
-               $(use_enable ipv6) \
-               $(use_enable jpeg) \
-               $(use_enable png) \
-               $(use_enable ssl)
-}
-
-src_compile() {
-       emake || die "make failed"
-       if use doc ; then
-               doxygen Doxyfile || die "doxygen failed"
-       fi
-}
-
-src_install() {
-       dodir /etc
-       emake DESTDIR="${D}" install || die "install failed"
-
-       if use doc; then
-               dohtml html/* || die "install documentation failed"
-       fi
-       dodoc AUTHORS ChangeLog README NEWS
-       docinto doc
-       dodoc doc/*.txt doc/README
-
-       doicon "${FILESDIR}"/dillo.png
-       make_desktop_entry dillo Dillo dillo
-}
-
-pkg_postinst() {
-       elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
-       elog "You can copy this to ~/.dillo/ and customize it"
-}

diff --git a/www-client/dillo/dillo-2.2.ebuild b/www-client/dillo/dillo-2.2.ebuild
index fec3d2d35b0021b4f2a2ce8e3739ec3006f11905..e60262c96703b07689ca628ac32786a65369094e 100644 (file)
--- a/www-client/dillo/dillo-2.2.ebuild
+++ b/www-client/dillo/dillo-2.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.10 2010/11/08 12:38:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.11 2012/01/05 18:12:31 ssuominen Exp $
 
-EAPI="2"
+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/${PN}.png"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,13 +18,14 @@ IUSE="doc +gif ipv6 +jpeg +png ssl"
 RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
        sys-libs/zlib
        jpeg? ( virtual/jpeg )
-       png? ( media-libs/libpng )
-       ssl? ( dev-libs/openssl )"
+       png? ( media-libs/libpng:0 )
+       ssl? ( dev-libs/openssl:0 )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
 src_prepare() {
-       epatch "${FILESDIR}"/dillo2-inbuf.patch \
+       epatch \
+               "${FILESDIR}"/dillo2-inbuf.patch \
                "${FILESDIR}"/${P}-libpng14.patch
 }
 
@@ -38,25 +40,25 @@ src_configure() {
 }
 
 src_compile() {
-       emake || die "make failed"
-       if use doc ; then
-               doxygen Doxyfile || die "doxygen failed"
+       emake || die
+       if use doc; then
+               doxygen Doxyfile || die
        fi
 }
 
 src_install() {
        dodir /etc
-       emake DESTDIR="${D}" install || die "install failed"
+       emake DESTDIR="${D}" install || die
 
        if use doc; then
-               dohtml html/* || die "install documentation failed"
+               dohtml html/* || die
        fi
        dodoc AUTHORS ChangeLog README NEWS
        docinto doc
        dodoc doc/*.txt doc/README
 
-       doicon "${FILESDIR}"/dillo.png
-       make_desktop_entry dillo Dillo dillo
+       doicon "${DISTDIR}"/dillo.png
+       make_desktop_entry dillo Dillo
 }
 
 pkg_postinst() {

diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
deleted file mode 100644 (file)
index 740e790..0000000
--- a/www-client/dillo/dillo-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-9999.ebuild,v 1.5 2010/11/08 12:38:58 nelchael Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib mercurial
-
-DESCRIPTION="Lean FLTK2-based web browser"
-HOMEPAGE="http://www.dillo.org/"
-EHG_REPO_URI="http://hg.dillo.org/dillo"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
-       sys-libs/zlib
-       jpeg? ( virtual/jpeg )
-       png? ( media-libs/libpng )
-       ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-       epatch "${FILESDIR}"/dillo2-inbuf.patch
-       ./autogen.sh
-}
-
-src_configure() {
-       append-ldflags "-L/usr/$(get_libdir)/fltk"
-       econf  \
-               $(use_enable gif) \
-               $(use_enable ipv6) \
-               $(use_enable jpeg) \
-               $(use_enable png) \
-               $(use_enable ssl)
-}
-
-src_compile() {
-       emake || die "make failed"
-       if use doc ; then
-               doxygen Doxyfile || die "doxygen failed"
-       fi
-}
-
-src_install() {
-       dodir /etc
-       emake DESTDIR="${D}" install || die "install failed"
-
-       if use doc; then
-               dohtml html/* || die "install documentation failed"
-       fi
-       dodoc AUTHORS ChangeLog README NEWS
-       docinto doc
-       dodoc doc/*.txt doc/README
-
-       doicon "${FILESDIR}"/dillo.png
-       make_desktop_entry dillo Dillo dillo
-}
-
-pkg_postinst() {
-       elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
-       elog "You can copy this to ~/.dillo/ and customize it"
-}

diff --git a/www-client/dillo/files/dillo.png b/www-client/dillo/files/dillo.png
deleted file mode 100644 (file)
index 8d57203..0000000
Binary files a/www-client/dillo/files/dillo.png and /dev/null differ