Remove old ebuild. Version bump, fixes bug 274908 and 276432.

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

3 files changed, 72 insertions, 3 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index a3f66c4692f0..4176946d549d 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2009/04/17 15:11:02 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.72 2009/07/04 19:08:46 yngwin Exp $
+
+*dillo-2.1.1 (04 Jul 2009)
+
+  04 Jul 2009; Ben de Groot <yngwin@gentoo.org> +dillo-2.1.1.ebuild:
+  Remove old ebuild. Version bump, fixes bug 274908 and 276432.
 
 *dillo-2.0-r1 (17 Apr 2009)
 
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index ac08fd16558e..edebe1c26ddf 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -9,11 +9,13 @@ DIST dillo-0.8.6-i18n-misc-20060625.diff.bz2 258290 RMD160 b158236c62f80d7df1273
 DIST dillo-0.8.6-i18n-misc-20070916.diff.bz2 315567 RMD160 4816689ed5bb8ccebdce324652e4dbf6061573db SHA1 87cc329b907ea6a3b91c5c970e65742b5069c251 SHA256 938a4cbe5dfc48fa9bd92bd25ae86a237f7e091064be981ce2ccc7eed8c5ac7f
 DIST dillo-0.8.6.tar.bz2 441739 RMD160 062cff85b330a5b443ddc81a356e81f930677cbb SHA1 ee03b11ba6b75d3180ca906d8275bd35e8765995 SHA256 47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
 DIST dillo-2.0.tar.bz2 551569 RMD160 f457e5a031d8a0e682be50ee16cbfba3fea34eaa SHA1 9bde7eab5c835e13508d63a190a8bcec4e94553a SHA256 847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
+DIST dillo-2.1.1.tar.bz2 612711 RMD160 4b8fe423e3a0fd0e461cc8e1795bac39ad47d3b6 SHA1 eb252663b9480e53e0376d75b81130404ccf40ce SHA256 8eec025872030fc1419fb93ee41dbdf380a6d1f75f4d51aec5eee9a9a4aa4477
 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-2.1.1.ebuild 1494 RMD160 212a5432a94aaf3d9e66f22037dc35199a41d74b SHA1 2c05e3c7919a6c59fdb06092bae45144a7bf7857 SHA256 0ad022a38516f79a29c2e2be2749007f563e7ac25cc262c738e17b737be4fe59
 EBUILD dillo-9999.ebuild 1486 RMD160 747982bb508257d0c3fbc98ba92e547406bfca3f SHA1 147697ad832b869fc9a7a9c432bde05f6445efe9 SHA256 e7834bc4327e9af9eb0bb7ddfbc6523cadea30a88084f86cf5e4a66839d5b76d
-MISC ChangeLog 17222 RMD160 845bc698ca03fb9a763a6daafc1b62ce427f9f16 SHA1 055d9c4df116ea6817f12bd25ca4b969ad0720ff SHA256 07dfc931e03e02c250ed19d0d3c72831fab517a73aa7c4369af75d6d5362fd64
+MISC ChangeLog 17384 RMD160 c29ba125b7b78565fbafe8a68132bb067493b16d SHA1 2d1391bb78d2aa93063663b7ac195723c04c513e SHA256 05a9c230422831d1e94a2fbf066cabaca1e696dfe3e5245e5ea009fcdb550821
 MISC metadata.xml 265 RMD160 d03285bfab732286bde355fe0ec756e0cb88a6dd SHA1 93226e7e58879e1dd0200d6df5f8ad8d0143def1 SHA256 0aa5b2b231654873313aba9afebdb90a273b222741c4787d9386973af3c1d575
diff --git a/www-client/dillo/dillo-2.1.1.ebuild b/www-client/dillo/dillo-2.1.1.ebuild
new file mode 100644
index 000000000000..38bcc1205a96
--- /dev/null
+++ b/www-client/dillo/dillo-2.1.1.ebuild
@@ -0,0 +1,62 @@
+# 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.1.1.ebuild,v 1.1 2009/07/04 19:08:46 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
+}
+
+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"
+}