Clean up patch.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 13 insertions, 76 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 8e42dece7703..9b186ef16b24 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/dillo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.128 2014/05/03 20:55:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.129 2014/08/23 09:46:30 jer Exp $
+
+  23 Aug 2014; Jeroen Roovers <jer@gentoo.org> -dillo-3.0.2.ebuild,
+  files/dillo2-inbuf.patch:
+  Clean up patch.
 
 *dillo-3.0.4 (03 May 2014)
 
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 76a3b8546c7f..23d79bfffe8f 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dillo2-inbuf.patch 393 SHA256 29e44f3be9e37298264068662638b4e1c5c7d2c7226691dae691e9ea5234b330 SHA512 5447b86df1225c0ea7e8e330071e2c6e4ad84a0a2478569d95769ed701f2a3703742df49eb60f1014815f8b264e9e1860bd096989ad42b6fd81f80a6b842d7b3 WHIRLPOOL 43a3abd512b59ece54b4919a19c3ae468818bbf3c4e8e3de34c2ee9650d65cece169b1320fc176f586d9a477b8c908f8e729bd3028cc1be3449c78b1e66da925
-DIST dillo-3.0.2.tar.bz2 640894 SHA256 b4f2cd7c1be9f09e705f68c095813ea5bb9d72870338fc36c61d687e042950d6 SHA512 510b8d7201f73a60c44ced752fddad1ee9083042771da991e8267a118eb639704aa13113ff884f52bd4027ebcd6ab76042a9cebd1d50d1fcab22c5605b9cedf4 WHIRLPOOL df079d175c082b2fe25f9e24222392aea0226720ce8ba8053f2ae005deed7dd3d4974156dab39ee16ab38096c3942e47cceabfe0d867de3889ff365c903f10a7
+AUX dillo2-inbuf.patch 313 SHA256 ec40892c1e4183b96bb88b8da03205ff77c5adf6664af3ec5fafd2437401895d SHA512 d68a21d64eb81341afdccdf1e409e6d12ca88ee2f016b327365b36ff71e015aa38e325b6127f77e45a6d995f38b9a88e90fb375145342fb8d29731ce2105c9ae WHIRLPOOL 81126839c05233189f8f4b06178fc43ac98b3d4fb61e6f96ab7633dac7aaa11e798f661985ea788392e90efe1bea1b8945b1371fb48ef9a69e9bd6151b2de130
 DIST dillo-3.0.3.tar.bz2 685824 SHA256 48241ca96d4c2f4bf83ebeb40c741c990fab0d6b0f7b9766a64234e481008dd2 SHA512 6feabc19b31deb099bc974be28e009b688338b7cf726e2c7d917cfa07e2c28bfba3ef09be9427e5156bf195623516ce81f8b8ef3c5c426bfac7de505c70a5ef8 WHIRLPOOL 7321acc181f5042139423ea7d62060e669651da04d13e6a6c5367fa7d2eff5629f58a777e037e38fccba895562101831f812d753c3cc24010fce56bcd7d77cfa
 DIST dillo-3.0.4.tar.bz2 738826 SHA256 ee2bab25010dd27b18ba80259df6eb8f6b549f5af596539c08eed0b70322df39 SHA512 57513342026288255f3a2a783f206a24b9b29a03f4721d34f6e43111d61b248c56e1212abdb51adcc826c4ca081f9fa5157247c00eda95d9b5287556fe9da175 WHIRLPOOL ac3c248960db329c24c0b138126bc4164c88d7844401f7d28fde3d16b656fb2cbc6ed2e8f43a3d42ecec268a9b9269f96a72b4ce2de1c33b777ca54b1d18e608
 DIST dillo.png 6135 SHA256 de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833 WHIRLPOOL 13c584d7186f2c9f158ae9cf5921f75040c6c58a5eec2f0a04e6251b9c7057246308be2f0726cbf9d83ec1d07a9538251f159e05cc610bf05adcbb4f8c1e3b09
-EBUILD dillo-3.0.2.ebuild 1437 SHA256 bee91733d3dd6ab7ce4e6f555784a4d0828067d3d7aaba9813ff5068f4395623 SHA512 41ef07f1a7694a70ee8058db72d7c6da4e522ada3a2a58703b93a52cfd68b111dbcdc703acb123cf622481e15da8d690f510d90fb5ac8f2a89a12e80a7af10a1 WHIRLPOOL 02abbc9ccb4c2e990c957d6a6c8a5fb0ef4f907f811d823dc8aa99aa6883736fc4d9d7641ca6e18e7d827c4da813e57a378a50589b5e16330aa052da80cb667d
 EBUILD dillo-3.0.3.ebuild 1461 SHA256 789562f2cf4ef7b4ebb09548cae6117701154bc627b75b31f4cf1d78617352e7 SHA512 f2186dd1354fb922430f8bd7a6889b4eeef6c5719037659acb3e60cbd649adf15142e37f4b922fab90a79bcd4403e0fd60cc19776b4af07a22defebf7e82515e WHIRLPOOL 62ed4b60138afeabbc5a0f773d5f3902e29a7957cbce2ccf11923e0423ec59175dc5ec727d75474da50a9c13a2d03b94a0a1384e0e7975fde2ba4f8ca2ac1cb8
 EBUILD dillo-3.0.4.ebuild 1469 SHA256 e99c0ec976a73b4e8811d13805203b08f88533325292220c833ecc2081c95fb2 SHA512 90d6a63dd236057300c9ce82d8b772c061047101a4a23a741bd340e1d199c3ea9cd2adae01a10ebccab1e96591ba24528e58c39373403fbc2b6f97dd2d250262 WHIRLPOOL bf2099a3fda37b2e31e5d707bdbe3e08cb8068aee5b54cdd29f1097921e36749ee1d7e09347c3b05db5578ab880dd8cef26df052794fb66ff14f6e6a2ba9de71
-MISC ChangeLog 23848 SHA256 80046cad9e57ace87b58a647f1da41b1bd3ad911b3ccffddcbccc2cba42deef7 SHA512 48a8cebc34d5da53c9d32ee420b28d2105d1ce8fa35318224d79de42e3ce68232c6c6c78af33ee01e16192464856387e65219d307c6a1c496cd38954bd402879 WHIRLPOOL e88c5ded3d279d5291337366c8a6798ffa5ba9b3ba43430b87943558e46210bfbe94e14d46598162eebebd4fa5d8d777261a222e810bd0ac803d35e3c21eae62
+MISC ChangeLog 23963 SHA256 5b6a5cf5f55c4d216caf8ad5ffdc6ad0b9e31fc328f698c6a2d3552b8a3c73fc SHA512 582a88e1cd2b0c446437be6a172cc4f4b6d17ddd99126c27e6a150515a37036a39df1e01701fc89d8eeb1f572dd78c6f0afe2e0dab4f9a2e3bb0762f0bf0365a WHIRLPOOL e5a4a2b05a1ae517ad63d01d18128341004495a9cd78b92e24d8f889b6056e26c7716810f2f97da6ec40d9ccca1b2ccd9c8ffde112683df69ffb651853f8fa04
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNlV8AACgkQVWmRsqeSphOg8ACfdUQnZ2jYImLS3JVrzC3kYdPs
-0OIAn26h37gqXNRwFhw3yK0RQagUzfKo
-=80Rd
+iEYEAREIAAYFAlP4YvcACgkQVWmRsqeSphNJNwCeMxjoy7gUiYu9XNulaQUH0yKu
+odYAnij8DqQGlDe5ABv+7/1mZw+IF3vf
+=OmAY
 -----END PGP SIGNATURE-----
diff --git a/www-client/dillo/dillo-3.0.2.ebuild b/www-client/dillo/dillo-3.0.2.ebuild
deleted file mode 100644
index 0837b9e9ca14..000000000000
--- a/www-client/dillo/dillo-3.0.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.2.ebuild,v 1.11 2012/07/29 16:11:36 armin76 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/${PN}.png"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="sys-libs/zlib
-	>=x11-libs/fltk-1.3:1[-cairo]
-	jpeg? ( virtual/jpeg )
-	png? ( >=media-libs/libpng-1.2:0 )
-	ssl? ( dev-libs/openssl:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}2-inbuf.patch
-}
-
-src_configure() {
-	append-ldflags "-L/usr/$(get_libdir)/fltk"
-
-	econf  \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable gif) \
-		$(use_enable ipv6) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable ssl)
-}
-
-src_compile() {
-	default
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	dodir /etc
-	default
-
-	use doc && dohtml html/*
-	dodoc AUTHORS ChangeLog README NEWS
-	dodoc doc/*.txt doc/README
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} 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/dillo2-inbuf.patch b/www-client/dillo/files/dillo2-inbuf.patch
index b97498dba51b..bc351c252fe6 100644
--- a/www-client/dillo/files/dillo2-inbuf.patch
+++ b/www-client/dillo/files/dillo2-inbuf.patch
@@ -1,6 +1,5 @@
-=== modified file 'src/form.cc'
---- src/form.cc	2008-10-21 21:02:31 +0000
-+++ src/form.cc	2008-10-21 21:02:53 +0000
+--- a/src/form.cc
++++ b/src/form.cc
 @@ -1240,8 +1240,9 @@
     int rc = 0;
     Dstr *output;