Fixed glib issue, bug #318569.

(Portage version: 2.1.9.22/cvs/Linux x86_64)

4 files changed, 62 insertions, 1 deletions

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 06c75efbd9f6..2975aa161332 100644
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.39 2010/01/23 02:52:23 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.40 2010/11/04 08:19:32 matsuu Exp $
+
+*fribidi-0.19.2-r1 (04 Nov 2010)
+
+  04 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> +fribidi-0.19.2-r1.ebuild,
+  +files/fribidi-0.19.2-glib.patch, +files/fribidi-0.19.2-nodoc.patch:
+  Fixed glib issue, bug #318569.
 
 *fribidi-0.19.2 (23 Jan 2010)
 
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-glib.patch b/dev-libs/fribidi/files/fribidi-0.19.2-glib.patch
new file mode 100644
index 000000000000..3f72f10c51c6
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.2-glib.patch
@@ -0,0 +1,13 @@
+diff -Naur fribidi-0.19.2.orig//lib/fribidi-types.h fribidi-0.19.2/lib/fribidi-types.h
+--- fribidi-0.19.2.orig//lib/fribidi-types.h	2006-01-31 12:23:13.000000000 +0900
++++ fribidi-0.19.2/lib/fribidi-types.h	2010-05-11 17:07:57.000000000 +0900
+@@ -40,8 +40,7 @@
+ 
+ #if FRIBIDI_USE_GLIB+0
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gtypes.h>
+-#  include <glib/gunicode.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # define FRIBIDI_INT8_LOCAL		gint8
+ # define FRIBIDI_INT16_LOCAL		gint16
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
new file mode 100644
index 000000000000..b8cb2645c1ac
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
@@ -0,0 +1,11 @@
+--- fribidi-0.19.2.orig/Makefile.am	2005-08-26 03:35:34.000000000 +0900
++++ fribidi-0.19.2/Makefile.am	2010-05-11 17:36:38.000000000 +0900
+@@ -9,7 +9,7 @@
+ ##############################################################################
+ 
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab charset lib bin doc test
++SUBDIRS = gen.tab charset lib bin test
+ 
+ EXTRA_DIST = bootstrap ChangeLog.old
+ 
diff --git a/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
new file mode 100644
index 000000000000..fef746cfe1e2
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild,v 1.1 2010/11/04 08:19:32 matsuu Exp $
+
+EAPI="2"
+inherit autotools eutils
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.4:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# bug #318569
+	epatch "${FILESDIR}/${P}-glib.patch"
+	epatch "${FILESDIR}/${P}-nodoc.patch"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README ChangeLog THANKS TODO || die
+}