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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 164 insertions, 2 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/Manifest b/www-client/dillo/Manifest
index f4e6ea1fe551..975e546513aa 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,13 +1,16 @@
+AUX dillo-0.8.6-gentoo.patch 590 RMD160 46b8d54bffca8368c6b02bcb100c02a34c8fe506 SHA1 39c33ae752d1226ddf1e9e58f1fcfadc2d3acf5d SHA256 d279a3257a1b6ce1070d60b3aab8a235880e01fe98cd907a9ea5b73c76732cca
 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
 AUX dillo.png 6135 RMD160 e15bf21c6f86256967ca49d1222429660e3aeeb6 SHA1 6933b0f63b1621bdc766f2eefa39816c7a9da22f SHA256 de629745e6f3a271475a501e2b94558b3deb7bf9a407bcef16426e600e1731f3
 AUX dillo2-inbuf.patch 393 RMD160 e1b976f0ceb0693d2e39c0ee1f8a68db3af4f7bb SHA1 f3033ddf7eadfd9d2cb24403f0acb2022304bf17 SHA256 29e44f3be9e37298264068662638b4e1c5c7d2c7226691dae691e9ea5234b330
 DIST dillo-0.8.6-i18n-misc-20060625.diff.bz2 258290 RMD160 b158236c62f80d7df1273863ef958704fdd7e340 SHA1 c9aabf6b5c0e4f3d3d963b0471b66724f8e00c20 SHA256 872accdc2828eb564f4e30d9471e0c52ce48d957a196d1671cd3067b7a454de3
+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-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.ebuild 1448 RMD160 b8e4302d1cf76f035f159b8675093af3de1b789e SHA1 f2651bc7a6a3733459dae86746e6fdab4c3d7f30 SHA256 75671fafd905f58e4658e9d44837d661da46540a791fc2a83491cab835e95806
-MISC ChangeLog 15943 RMD160 e870a792f72b67e00bd2234359560a32f785a9a9 SHA1 142125653d52301fa767c215ed6205e2ab29a877 SHA256 8832221f81a84d76ae08460a3542211a7f67f1ee59cfbf8d385964382429ad78
+MISC ChangeLog 16170 RMD160 df0f0e81fe5716aad48389eae51f10df0af1b7c7 SHA1 2e15095f9c7ad28ca71f4498ec176275e0d56e2a SHA256 2574ce667453b67d669405a2ba530120df2650b4435ad9f5bca766c4b0e8e9f0
 MISC metadata.xml 265 RMD160 d03285bfab732286bde355fe0ec756e0cb88a6dd SHA1 93226e7e58879e1dd0200d6df5f8ad8d0143def1 SHA256 0aa5b2b231654873313aba9afebdb90a273b222741c4787d9386973af3c1d575
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@