Replaced new i18n patch. Added -j1 to emake install cause parallel install borked.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 160 insertions, 1 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index f3c932fbc27d..7cc32cec16ed 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/dillo
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.62 2008/10/22 15:02:07 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.63 2008/10/28 14:56:08 matsuu Exp $
+
+*dillo-0.8.6-r1 (28 Oct 2008)
+
+  28 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/dillo-0.8.6-gentoo.patch, +dillo-0.8.6-r1.ebuild:
+  Replaced new i18n patch. Added -j1 to emake install cause parallel install
+  borked.
 
   22 Oct 2008; Ben de Groot <yngwin@gentoo.org> dillo-2.0.ebuild:
   Do not die when doc useflag is disabled.
diff --git a/www-client/dillo/dillo-0.8.6-r1.ebuild b/www-client/dillo/dillo-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..7dae2afc24dd
--- /dev/null
+++ b/www-client/dillo/dillo-0.8.6-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6-r1.ebuild,v 1.1 2008/10/28 14:56:08 matsuu Exp $
+
+inherit flag-o-matic eutils autotools
+
+S2="${WORKDIR}/dillo-gentoo-extras-patch4"
+DILLO_I18N_P="${P}-i18n-misc-20070916"
+
+DESCRIPTION="Lean GTK+-based web browser"
+HOMEPAGE="http://www.dillo.org/"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/dillo-gentoo-extras-patch4.tar.bz2
+	http://teki.jpn.ph/pc/software/${DILLO_I18N_P}.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+MISC_IUSE="nls truetype"
+#IUSE="${MISC_IUSE} fltk ipv6 ssl"
+IUSE="${MISC_IUSE} ipv6 ssl"
+
+DEPEND="=x11-libs/gtk+-1.2*
+	>=media-libs/jpeg-6b
+	>=sys-libs/zlib-1.1.3
+	>=media-libs/libpng-1.2.1
+	ssl? ( dev-libs/openssl )"
+#	fltk? ( >=x11-libs/fltk-2 )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ../${DILLO_I18N_P}.diff
+	epatch "${FILESDIR}"/${PN}-build-fix.patch
+	epatch "${FILESDIR}"/${PN}-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-ac_subst.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+
+	if [ "${DILLO_ICONSET}" = "kde" ]
+	then
+		einfo "Using Konqueror style icon set"
+		cp "${S2}"/pixmaps.konq.h "${S}"/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "gnome" ]
+	then
+		einfo "Using Ximian style icon set"
+		cp "${S2}"/pixmaps.ximian.h "${S}"/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "mozilla" ]
+	then
+		einfo "Using Netscape style icon set"
+		cp "${S2}"/pixmaps.netscape.h "${S}"/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "cobalt" ]
+	then
+		einfo "Using Cobalt style icon set"
+		cp "${S2}"/pixmaps.cobalt.h "${S}"/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "bold" ]
+	then
+		einfo "Using bold style icon set"
+		cp "${S2}"/pixmaps.bold.h "${S}"/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "trans" ]
+	then
+		einfo "Using transparent style icon set"
+		cp "${S2}"/pixmaps.trans.h "${S}"/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "trad" ]
+	then
+		einfo "Using the traditional icon set"
+		cp "${S2}"/pixmaps.trad.h "${S}"/src/pixmaps.h
+	else
+		einfo "Using default Dillo icon set"
+	fi
+}
+
+src_compile() {
+	replace-cpu-flags k6 pentium
+	is-flag -O? || append-flags "-O2"
+
+	local myconf
+
+	# misc features
+	myconf="$(use_enable nls)
+		$(use_enable truetype anti-alias)
+		--disable-gtktest
+		--disable-dlgui
+		--enable-tabs
+		--enable-meta-refresh"
+
+	myconf="${myconf}
+		$(use_enable ipv6)
+		$(use_enable ssl)"
+	#	$(use_enable fltk dlgui)
+
+	econf ${myconf} || die
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/share/icons/${PN}
+	emake -j1 DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog* README NEWS
+	docinto doc
+	dodoc doc/*.txt doc/README
+
+	insinto /usr/share/icons/${PN}
+	doins "${S2}"/icons/*.png
+}
+
+pkg_postinst() {
+	elog "This ebuild for dillo comes with different toolbar icons"
+	elog "If you want mozilla style icons then try"
+	elog "	DILLO_ICONSET=\"mozilla\" emerge dillo"
+	elog
+	elog "If you prefer konqueror style icons then try"
+	elog "	DILLO_ICONSET=\"kde\" emerge dillo"
+	elog
+	elog "If you prefer ximian gnome style icons then try"
+	elog "	DILLO_ICONSET=\"gnome\" emerge dillo"
+	elog
+	elog "If you prefer cobalt style icons then try"
+	elog "	DILLO_ICONSET=\"cobalt\" emerge dillo"
+	elog
+	elog "If you prefer bold style icons then try"
+	elog "	DILLO_ICONSET=\"bold\" emerge dillo"
+	elog
+	elog "If you prefer transparent style icons then try"
+	elog "	DILLO_ICONSET=\"trans\" emerge dillo"
+	elog
+	elog "If you prefer the traditional icons then try"
+	elog "	DILLO_ICONSET=\"trad\" emerge dillo"
+	elog
+	elog "If the DILLO_ICONSET variable is not set, you will get the"
+	elog "default iconset"
+	elog
+	elog "To see what the icons look like, please point your browser to:"
+	elog "http://dillo.auriga.wearlab.de/Icons/"
+	elog
+}
diff --git a/www-client/dillo/files/dillo-0.8.6-gentoo.patch b/www-client/dillo/files/dillo-0.8.6-gentoo.patch
new file mode 100644
index 000000000000..c85b02f676e8
--- /dev/null
+++ b/www-client/dillo/files/dillo-0.8.6-gentoo.patch
@@ -0,0 +1,13 @@
+diff -Naur dillo-0.8.6.orig/po/Makefile.in.in dillo-0.8.6/po/Makefile.in.in
+--- dillo-0.8.6.orig/po/Makefile.in.in	2008-08-21 08:10:49.000000000 +0900
++++ dillo-0.8.6/po/Makefile.in.in	2008-08-21 08:12:57.000000000 +0900
+@@ -27,8 +27,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-#mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@