amd64/x86 stable

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 31 insertions, 33 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index d74bee065c0b..4941373a7f11 100644
--- 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/dillo-3.0.1.ebuild b/www-client/dillo/dillo-3.0.1.ebuild
index d862fa2f98e4..5073aa134fbb 100644
--- 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 5ccb76994fb2..686d9b2b5212 100644
--- 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() {