Fix bug 266497

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 87 insertions, 6 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index ff3c7c4a5f4b..a3f66c4692f0 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/dillo
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.70 2009/04/10 15:57:12 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.71 2009/04/17 15:11:02 yngwin Exp $
+
+*dillo-2.0-r1 (17 Apr 2009)
+
+  17 Apr 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/dillo-2.0-enable-ssl.patch, +dillo-2.0-r1.ebuild, dillo-9999:
+  Add patch from bug 266497. Use append-ldflags function.
 
 *dillo-9999 (10 Apr 2009)
 
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 4a9d998fecd5..ac08fd16558e 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,4 +1,5 @@
 AUX dillo-0.8.6-gentoo.patch 590 RMD160 46b8d54bffca8368c6b02bcb100c02a34c8fe506 SHA1 39c33ae752d1226ddf1e9e58f1fcfadc2d3acf5d SHA256 d279a3257a1b6ce1070d60b3aab8a235880e01fe98cd907a9ea5b73c76732cca
+AUX dillo-2.0-enable-ssl.patch 221 RMD160 8a0ff040d439b24db575b5ed7d86b6e5d8f51779 SHA1 c2972863ff2154f1e5673bb991ddd757c2454246 SHA256 82eabbd0aa2a003713551d199e847f79e4d0a2ecaa945314cad2e2ffb4c5d1a7
 AUX dillo-ac_subst.patch 517 RMD160 277b3d55d7f99ba612eb2263002e4888d62f5d9d SHA1 60ef12ca8217d0370614967d2e74afec1c9d2131 SHA256 753fc722a2947c46ffc2bda6ef84f90c0cd2f880381c874636ea201cb8f4a49a
 AUX dillo-asneeded.patch 1894 RMD160 892d979625bb338802d038c370422c33d9501edb SHA1 c6ac90247a6f344cee5dde70dbc55ad6e449b458 SHA256 36069751fe0fd5ecc9e60b387217a7c30da5000ecadc0379f6b39255d7c5f633
 AUX dillo-build-fix.patch 631 RMD160 06930ca452554bd4dcc140eb85a9cc9016c4107b SHA1 2eb478e3b05de223c574de925be9d9f1de71f6df SHA256 a6ae597926744dcb48e670da5ee24daade11631ddbca728bc8b2775af9277571
@@ -11,7 +12,8 @@ DIST dillo-2.0.tar.bz2 551569 RMD160 f457e5a031d8a0e682be50ee16cbfba3fea34eaa SH
 DIST dillo-gentoo-extras-patch4.tar.bz2 98800 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 SHA1 7011f67113b1f811d94aa88e5185cbd1daf8bd8d SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05
 EBUILD dillo-0.8.6-r1.ebuild 3887 RMD160 94d53757fe5861c0ee4ef4313cb40b5cf4c347cc SHA1 68c631f2c9a671d836479e765eec635488b71add SHA256 816e2792390e276ed4dd85f305f6b302f35bbc821ff9e8772dc3612fc9867615
 EBUILD dillo-0.8.6.ebuild 3723 RMD160 b198f29d565878152bfef0a63a7efaeb73a0d7a0 SHA1 7ef789985f47b02905fac69d734baa78dde1afda SHA256 6fec12fedb84793d38050aca7d6a7e83be0dc378f8b027c5862b145e1409c81f
+EBUILD dillo-2.0-r1.ebuild 1550 RMD160 74251cdca18bfd83dab93aa8207b8e6863ab96ac SHA1 93b082182ff03fb54c748f8213ffcc693050a66f SHA256 e249aeac5b36c9f0c80e31dd0ff25d302cb1ff3de44584cf71986447df4fc9fe
 EBUILD dillo-2.0.ebuild 1486 RMD160 91c14e1beefc072028101855a5685dcb1d6d105f SHA1 397cd411eee4d57f41b07c074506d9b50c359720 SHA256 579f087673e1a7d41c4f0c6bf54f005b946804410dfedfbfe6fb3ca96eb5edbd
-EBUILD dillo-9999.ebuild 1479 RMD160 76186c83e1be87ac9872397c41ae0f9e16c36f68 SHA1 e02f49cdf138e811c6e67afb79175bf2136d0828 SHA256 c0fe542cee9a7e4d229e1fae0ad32f7269e742185dab6544b74e637d95c8af03
-MISC ChangeLog 17015 RMD160 2a878d480da32ecef861decb40fc9f63e151db00 SHA1 28dfd589baa580ba6f8d70951504f0e4129693ce SHA256 49f122df2bf28ae098bb40db83df794b911f80ac98e0f1186187b1959429ecea
+EBUILD dillo-9999.ebuild 1486 RMD160 747982bb508257d0c3fbc98ba92e547406bfca3f SHA1 147697ad832b869fc9a7a9c432bde05f6445efe9 SHA256 e7834bc4327e9af9eb0bb7ddfbc6523cadea30a88084f86cf5e4a66839d5b76d
+MISC ChangeLog 17222 RMD160 845bc698ca03fb9a763a6daafc1b62ce427f9f16 SHA1 055d9c4df116ea6817f12bd25ca4b969ad0720ff SHA256 07dfc931e03e02c250ed19d0d3c72831fab517a73aa7c4369af75d6d5362fd64
 MISC metadata.xml 265 RMD160 d03285bfab732286bde355fe0ec756e0cb88a6dd SHA1 93226e7e58879e1dd0200d6df5f8ad8d0143def1 SHA256 0aa5b2b231654873313aba9afebdb90a273b222741c4787d9386973af3c1d575
diff --git a/www-client/dillo/dillo-2.0-r1.ebuild b/www-client/dillo/dillo-2.0-r1.ebuild
new file mode 100644
index 000000000000..142dcb937a4a
--- /dev/null
+++ b/www-client/dillo/dillo-2.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.0-r1.ebuild,v 1.1 2009/04/17 15:11:02 yngwin 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 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl"
+
+RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
+	sys-libs/zlib
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/dillo2-inbuf.patch
+	use ssl && epatch "${FILESDIR}"/${P}-enable-ssl.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
+
+	elog "Dillo has installed a default configuration into /etc/dillorc"
+	elog "You can copy this to ~/.dillo/ and customize it"
+}
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 9e39f31e049c..bf04c9131063 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 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.1 2009/04/10 15:57:12 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-9999.ebuild,v 1.2 2009/04/17 15:11:02 yngwin Exp $
 
 EAPI="2"
-inherit eutils multilib mercurial
+inherit eutils flag-o-matic multilib mercurial
 
 DESCRIPTION="Lean FLTK2-based web browser"
 HOMEPAGE="http://www.dillo.org/"
@@ -30,7 +30,7 @@ src_prepare() {
 }
 
 src_configure() {
-	LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)/fltk" \
+	append-ldflags "-L/usr/$(get_libdir)/fltk"
 	econf  \
 		$(use_enable gif) \
 		$(use_enable ipv6) \
diff --git a/www-client/dillo/files/dillo-2.0-enable-ssl.patch b/www-client/dillo/files/dillo-2.0-enable-ssl.patch
new file mode 100644
index 000000000000..fb61f52de830
--- /dev/null
+++ b/www-client/dillo/files/dillo-2.0-enable-ssl.patch
@@ -0,0 +1,10 @@
+--- ./dpi/https.c.orig	2009-04-17 17:56:15.000000000 +0900
++++ ./dpi/https.c	2009-04-17 17:56:28.000000000 +0900
+@@ -69,7 +69,6 @@
+ 
+ 
+ #define ENABLE_SSL
+-#undef ENABLE_SSL
+ #ifdef ENABLE_SSL
+ 
+ #include <openssl/ssl.h>