Added misc patch back.

(Portage version: 2.0.51.22-r1)

5 files changed, 26 insertions, 18 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 6873b4a51ada..00313baba7e1 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/dillo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.32 2005/06/26 09:04:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.33 2005/06/27 15:31:50 usata Exp $
+
+*dillo-0.8.5-r1 (27 Jun 2005)
+
+  27 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> -dillo-0.8.3-r4.ebuild,
+  +dillo-0.8.5-r1.ebuild:
+  Added misc patch back.
 
   26 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> dillo-0.8.4-r2.ebuild:
   Stable on ppc.
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index eeeab95b46d3..54c312251612 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,15 +1,17 @@
+MD5 60d230a5b481f39f54b5d358851c25e2 ChangeLog 11798
+MD5 6aaf996a92a716cabacc4808c48f8c24 dillo-0.8.5-r1.ebuild 3613
+MD5 2193d4a3532b99be305ba4d59f6ae074 dillo-0.8.4.ebuild 3573
 MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
 MD5 b1e9b59819ae9e74d5ebf4dbc31efd23 dillo-0.8.5.ebuild 3623
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 4a1d96c3478e17c65d06e09388d89993 dillo-0.8.4-r1.ebuild 3596
-MD5 60d230a5b481f39f54b5d358851c25e2 ChangeLog 11798
 MD5 3b8ac4260193f9a184cec89f3a85a2d3 dillo-0.8.3-r4.ebuild 3638
-MD5 2193d4a3532b99be305ba4d59f6ae074 dillo-0.8.4.ebuild 3573
+MD5 4a1d96c3478e17c65d06e09388d89993 dillo-0.8.4-r1.ebuild 3596
 MD5 c97b33e22344af77a9f501d04cd4cd87 dillo-0.8.4-r2.ebuild 3598
+MD5 8114dfcae2f9f3437c043ed6953f219d files/digest-dillo-0.8.5-r1 226
 MD5 47c572d76913ed4ec3608d3f840f9c67 files/digest-dillo-0.8.4 226
-MD5 cec29ab3305c35980bc16ecc1eac7b8d files/digest-dillo-0.8.4-r2 226
-MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
-MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
+MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 deb91ab61005bccf824ad864ea0ea66a files/digest-dillo-0.8.5 142
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r4 226
-MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
+MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
+MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
+MD5 cec29ab3305c35980bc16ecc1eac7b8d files/digest-dillo-0.8.4-r2 226
diff --git a/www-client/dillo/dillo-0.8.3-r4.ebuild b/www-client/dillo/dillo-0.8.5-r1.ebuild
index 4499f0492983..b6b960185c87 100644
--- a/www-client/dillo/dillo-0.8.3-r4.ebuild
+++ b/www-client/dillo/dillo-0.8.5-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3-r4.ebuild,v 1.7 2005/02/06 17:34:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.5-r1.ebuild,v 1.1 2005/06/27 15:31:50 usata Exp $
 
 inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20041206"
+DILLO_I18N_P="${P}-i18n-misc-20050620"
 
 DESCRIPTION="Lean GTK+-based web browser"
 HOMEPAGE="http://www.dillo.org/"
@@ -15,7 +15,7 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ~mips ~arm ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~arm ~ppc64"
 MISC_IUSE="nls truetype"
 IUSE="${MISC_IUSE} ipv6 ssl"
 
@@ -31,8 +31,8 @@ DEPEND="sys-devel/autoconf
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ../${DILLO_I18N_P}.diff
-	epatch ${FILESDIR}/dillo-format-string-vulnerability.diff
+	epatch ../${DILLO_I18N_P}.diff || die
+	sh autogen.sh || die
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
@@ -65,15 +65,15 @@ src_unpack() {
 	else
 		einfo "Using default Dillo icon set"
 	fi
-
-	cd ${S}; sh autogen.sh || die
 }
 
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+	append-flags "-O"
 
 	local myconf
 
+	# misc features
 	myconf="$(use_enable nls)
 		$(use_enable truetype anti-alias)
 		--enable-tabs
diff --git a/www-client/dillo/files/digest-dillo-0.8.3-r4 b/www-client/dillo/files/digest-dillo-0.8.3-r4
deleted file mode 100644
index ec9bf532eb21..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.3-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 be772ec9361bcc01515ae0da61de9bda dillo-0.8.3.tar.bz2 418714
-MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
-MD5 0eca06ae9a11b6ffa3c506591c1f4497 dillo-0.8.3-i18n-misc-20041206.diff.bz2 216604
diff --git a/www-client/dillo/files/digest-dillo-0.8.5-r1 b/www-client/dillo/files/digest-dillo-0.8.5-r1
new file mode 100644
index 000000000000..39b8ed6a85b9
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.5-r1
@@ -0,0 +1,3 @@
+MD5 d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 424795
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 dfe4b882f2424d5eb4f9bc526df7019c dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152