Fixed glib issue, bug #318569.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

5 files changed, 86 insertions, 2 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/Manifest b/dev-libs/fribidi/Manifest
index 43e0e1c044c2..32b872668395 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fribidi-0.19.2-glib.patch 494 RMD160 21aa69bbcae00a0f5bba8898c5d41817b386953c SHA1 ad17f5784ca4ba24504f09c486272a8d91eab79e SHA256 9d5e0434d9ef50d866bb855f9db55840c9e4dfad50af404ef317effa24c416aa
+AUX fribidi-0.19.2-nodoc.patch 433 RMD160 a2698be86dcb59c403a25b7ae814bc97f0b391b0 SHA1 bd14fbf14ffecc70dc29f416117ae65096f5e76b SHA256 d87929d513ccb3da70b05be956e8d26451f7e9890f248cf20ea1e7d895fe60ca
 AUX fribidi-macos.patch 437 RMD160 f390024a41d7907d669d851ff7862e3f1bda3344 SHA1 598eb1b031d0167da52b0a25d54363ad61b3c338 SHA256 c707797eda69f8842eecf2722db59ece4c8ddd6730079f5db6c14c03065727c0
 DIST fribidi-0.10.7.tar.gz 593309 RMD160 ddc37838a1cca880a7c63c0e77cff5ed7a3fac1d SHA1 b49568f87d72a1f513e533a99bf0143dc9fc3e64 SHA256 ecea548c16f5632f0d5dbc005e595bf2f4ebfbdb0bf74c8db347662f8475450b
 DIST fribidi-0.10.9.tar.gz 621563 RMD160 31495fecd4318f9bd6217b015f65a936389c3204 SHA1 f9aae2d2084eaccbc87760401c4521e96a92a436 SHA256 b8fc7592f50bdac2182e9105e19fe54329faab35edbcf1bc66bde2e7174f87b4
@@ -6,6 +11,24 @@ DIST fribidi-0.19.2.tar.gz 668933 RMD160 4fafb4b3140bbbcf4c2c58c714b02db2d71e549
 EBUILD fribidi-0.10.7.ebuild 597 RMD160 27b8f9d61d7128b699c55e3876fac72206de66fb SHA1 e6cb30f0a6d4e0391eeae5fca8b3b988ab3e9cd6 SHA256 4dc33d493e6d02a2bdb7bbf9105f37c67b7d9624100b35f014fa65e400d2e607
 EBUILD fribidi-0.10.9.ebuild 607 RMD160 758847aeb227711d34d36e162ca931204ac595f6 SHA1 c3e222af4ead7a96c535165d3ed717f33fb7679f SHA256 d6cab50e75a793ef8ac45758a0aaa2afc23fc6975dea00703fd9c9b036b6ccda
 EBUILD fribidi-0.19.1.ebuild 665 RMD160 18ea471a1253a3ca44f3650f788871bb9beaef42 SHA1 7994fff5cc1e8573974343618d8d236987a48bb3 SHA256 82b63ec9917e897caca3b8fe2679da85401a3160d2ef72c76f3a567ca092c78f
+EBUILD fribidi-0.19.2-r1.ebuild 908 RMD160 e0897396469d8e9ce410ef347588161e122feaf0 SHA1 365958c94dec7a5da14eefaecfb2bb9e116a5579 SHA256 18a3e2f4ddce5e9a653421c8c236b8076d6f03ddfc3fd6e0abd05c8a5f733754
 EBUILD fribidi-0.19.2.ebuild 666 RMD160 47b958dd68bb4ca539c1c5fc1ce95af4bbe46bee SHA1 1c68174e11b91f5dac1c1ad2d46ece3cdd28d536 SHA256 ebe006742a5b39b32bb82b4a78dc86fb3042dd5bdadefe74da66b8b54c192cc8
-MISC ChangeLog 5217 RMD160 33a3fd70af31dd3820a635d47cef8a58f3282da4 SHA1 c5accb1d7d4691fdff2a3a8c6ca8256e49ebf995 SHA256 427ed447c6deb3b3ad01da9a67388de6ca6c03c62a185f4830b518b871e03703
+MISC ChangeLog 5432 RMD160 a16baecb7c6d38c79854ba4c3057ebd445c21619 SHA1 705c09831767b290ebf0dad309cdf3c977240578 SHA256 ca4f241f95d16eeb3861bd47be54d83769e0eb8366a2aed6292aef47608242d1
 MISC metadata.xml 228 RMD160 d65a6255b8f07a80a55bbee3b75d4fbf409e7bbb SHA1 bba2378881d0c8c6134d8bd9b3b599f564e3b7ed SHA256 9247f2e9698ec5fdf342458b10c5a7e671c4e10b1551f09de2a9e31193532bdb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJM0my3AAoJECaGw+YFKA1pfcAQAJU0kumu0NMNBaA94Zk7n3cb
+5PgslQv2pBc6iDXzM+mXoGGCzHsmMH6tiFGDp++RuaepHe9hlaoaoMtWt0/2uHHO
+4uFrcWssXChG6V1hY8c4cVb/yBfFOzjIowC4Sg8XRya0XQOa1dllAjwMZyEHzSJ6
+5MID+OUQi3mik18bu432pypw762vhPzzY4QuYnLJggDsB9SzFITkswAESYvCOr2+
+EI7FyFZQeOMYeiHKzwso6TQjDrxAnraHJfCHAUaEstn3m9rAqY+Fe3w+mk9d5gBb
+maI0Vs2CAoz57WjjfYiqFYNsgTiqVxfam6eJEQmJ9AUKsghg5VN5VyiyPkPq3Epx
+jjXVTae0pRm7P33B7j3lZj4NxBz596MnXhSDwm/GC5VmJYOxhGTp/+e+1vFcBlud
+J8jjxTGq5f1F6JAh/D5N9dndDy3ZhdqpUVlkkM93qMI51dod/1TuDC6qWwqQc9Tj
+KRpRJvSh3hT8gadItF+XU4C58KHpVXHNN5dcIpSCUAKzvVKT3d41lLsYWDG3kxqU
+IpHKzXTBGPldYyVooxVgisyr3ustpc8FT4qCl02cZJqM+CD6xqdSrxPrGC9TtwKl
+pJRphFCkikmBoNNKnZxJENM5MsXylSFPmDiau2xWE058Y3NkRG/GVnhRRGeMTlWx
+ECxkurvJfOq4jf2+3p7A
+=luUB
+-----END PGP SIGNATURE-----
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
+}