projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0d090e)
amd64/x86 stable
authorSamuli Suominen <ssuominen@gentoo.org>
Thu, 5 Jan 2012 18:07:21 +0000 (18:07 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Thu, 5 Jan 2012 18:07:21 +0000 (18:07 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

www-client/dillo/ChangeLog patch | blob | history
www-client/dillo/Manifest patch | blob | history
www-client/dillo/dillo-3.0.1.ebuild patch | blob | history
www-client/dillo/dillo-3.0.2.ebuild patch | blob | history

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index d74bee065c0bb01f253f21e6c374b55347763dca..4941373a7f11c8a08424fa5f2bc279501b02e5bc 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.100 2011/12/12 00:31:59 jer Exp $
+# 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 $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> dillo-3.0.1.ebuild:
+  amd64/x86 stable wrt #395917
 
 *dillo-3.0.2 (12 Dec 2011)
 
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 5e4a531673600af61f007576e821dccb4606db2a..ea1e6974f986055ab4277372e0d97bc2f0a6bdbb 100644 (file)
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -11,15 +11,19 @@ DIST dillo-3.0.2.tar.bz2 640894 RMD160 418fa4926a86290dbbbc36942ceb1bac1d3bd407
 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 1437 RMD160 abe906718620ce540e37a694ae8d918fc83de4d1 SHA1 0790af94e16aaa3c1c2e86d372ea114fd16f7f75 SHA256 cf95a92a7e3324908611d1df4aa1a31782f328ed278417558c861d384137c2fe
-EBUILD dillo-3.0.2.ebuild 1437 RMD160 6385173dbfd7cd7f2aa74438c8b1019d89684e1e SHA1 7f51db6bd5ada32dd88bca240216dcef7ac308cd SHA256 bd0e3da7240b544655c4a8fa6f427900f54af6806411b14c871f89fbb3583e1f
+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 20773 RMD160 889255b771ee0fdbe6d7c16212a122c6d8b9d4e0 SHA1 39d06414b14b2a02610990e70700352d736d9004 SHA256 56864b75592d55a67d627722f0cef4150a073736bc4dde280020f37a52c37990
+MISC ChangeLog 20885 RMD160 9567a68c518645f7d0efb0f8192270d59dd5cfd4 SHA1 c2238e2a6630fc8ee050cefbcdef1ccf9e14d32d SHA256 96fa67ba6d4e114623b929625a0e97f121e1e0f7cea76aa73d29c752ce117beb
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7lS4UACgkQVWmRsqeSphP83wCfXelzr3Tz7vm0LWDqvP3dm8aP
-3GQAn1zR/2/4tllCgFSwBi7KXi8KHGbL
-=EYZe
+iQEcBAEBAgAGBQJPBeZeAAoJEEdUh39IaPFN/XwH/3A8m56XJTz8uyRJUH9q6DbI
+h9GPvgSzBC41ufEgPwuHZnAQQ4G0zjchbY90bpk83f9KtZl67OZYRbJu9UkoAbRf
+qGmK2LSrR5uUIJ4Y7yc1TqlB/WgdVfbkVHJHJfHXxv/vq8r0h+Xvlu19R2HnNItg
+WB7VJfqUFcs7FIdGLFgHrtHtX0UUuoWOX8rLYlobFVRUNIANkAwoFc/fJgAGxn86
+7/53UXRNrPMZ6Hu22h+1uHJ0mZsVqg5SLrmYX0QGvM0wvQG4QWMGFUw1OfsVv9RV
+qkmk6OpA8xU+0qTUdaTeZTbXT1do7t0KNKCeItKET22BBCSifF2Pzmd831SoC3k=
+=lQVR
 -----END PGP SIGNATURE-----
diff --git a/www-client/dillo/dillo-3.0.1.ebuild b/www-client/dillo/dillo-3.0.1.ebuild
index d862fa2f98e49df363963f489906c71f8ab556bc..5073aa134fbba67fb82130b4944128cd99bfa0bc 100644 (file)
--- a/www-client/dillo/dillo-3.0.1.ebuild
+++ b/www-client/dillo/dillo-3.0.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 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-3.0.1.ebuild,v 1.5 2011/10/12 15:47:41 jer Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild,v 1.6 2012/01/05 18:07:21 ssuominen Exp $
 
+EAPI=4
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Lean FLTK based web browser"
@@ -13,14 +12,14 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc +gif ipv6 +jpeg +png ssl"
 
-RDEPEND="=x11-libs/fltk-1.3*[-cairo]
-       sys-libs/zlib
+RDEPEND="sys-libs/zlib
+       >=x11-libs/fltk-1.3:1[-cairo]
        jpeg? ( virtual/jpeg )
-       png? ( media-libs/libpng )
-       ssl? ( dev-libs/openssl )"
+       png? ( >=media-libs/libpng-1.2:0 )
+       ssl? ( dev-libs/openssl:0 )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
@@ -40,8 +39,8 @@ src_configure() {
 
 src_compile() {
        default
-       if use doc ; then
-               doxygen Doxyfile || die "doxygen failed"
+       if use doc; then
+               doxygen Doxyfile || die
        fi
 }
 
@@ -49,15 +48,13 @@ src_install() {
        dodir /etc
        default
 
-       if use doc; then
-               dohtml html/*
-       fi
+       use doc && dohtml html/*
        dodoc AUTHORS ChangeLog README NEWS
        docinto doc
        dodoc doc/*.txt doc/README
 
        doicon "${DISTDIR}"/dillo.png
-       make_desktop_entry dillo Dillo dillo
+       make_desktop_entry ${PN} Dillo
 }
 
 pkg_postinst() {
diff --git a/www-client/dillo/dillo-3.0.2.ebuild b/www-client/dillo/dillo-3.0.2.ebuild
index 5ccb76994fb2b5cf92ec032261e2d018da4d5164..686d9b2b52128c9a147e6f421e8280e786c2dc67 100644 (file)
--- a/www-client/dillo/dillo-3.0.2.ebuild
+++ b/www-client/dillo/dillo-3.0.2.ebuild
@@ -1,35 +1,35 @@
 # 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.2.ebuild,v 1.1 2011/12/12 00:31:59 jer Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild,v 1.2 2012/01/05 18:07:21 ssuominen Exp $
 
+EAPI=4
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Lean FLTK based web browser"
 HOMEPAGE="http://www.dillo.org/"
 SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
-       mirror://gentoo/dillo.png"
+       mirror://gentoo/${PN}.png"
 
 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-1.3*[-cairo]
-       sys-libs/zlib
+RDEPEND="sys-libs/zlib
+       >=x11-libs/fltk-1.3:1[-cairo]
        jpeg? ( virtual/jpeg )
-       png? ( media-libs/libpng )
-       ssl? ( dev-libs/openssl )"
+       png? ( >=media-libs/libpng-1.2:0 )
+       ssl? ( dev-libs/openssl:0 )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
 src_prepare() {
-       epatch "${FILESDIR}"/dillo2-inbuf.patch
+       epatch "${FILESDIR}"/${PN}2-inbuf.patch
 }
 
 src_configure() {
        append-ldflags "-L/usr/$(get_libdir)/fltk"
+
        econf  \
                $(use_enable gif) \
                $(use_enable ipv6) \
@@ -40,8 +40,8 @@ src_configure() {
 
 src_compile() {
        default
-       if use doc ; then
-               doxygen Doxyfile || die "doxygen failed"
+       if use doc; then
+               doxygen Doxyfile || die
        fi
 }
 
@@ -49,15 +49,13 @@ src_install() {
        dodir /etc
        default
 
-       if use doc; then
-               dohtml html/*
-       fi
+       use doc && dohtml html/*
        dodoc AUTHORS ChangeLog README NEWS
        docinto doc
        dodoc doc/*.txt doc/README
 
-       doicon "${DISTDIR}"/dillo.png
-       make_desktop_entry dillo Dillo dillo
+       doicon "${DISTDIR}"/${PN}.png
+       make_desktop_entry ${PN} Dillo
 }
 
 pkg_postinst() {
Unnamed repository; edit this file 'description' to name the repository.