Pass --with-glib=yes to ensure fribidi.pc has "Requires: glib-2.0" line wrt #345621. Only #include glib.h for dev-libs/glib >= 2.31 compability wrt #415721. Thanks to Thomas Sachau for reporting both bugs.

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

5 files changed, 138 insertions, 8 deletions

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 1e0613b8e52e..fb0d7d56c178 100644
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.52 2012/05/15 13:01:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.53 2012/05/15 13:35:32 ssuominen Exp $
+
+*fribidi-0.19.2-r2 (15 May 2012)
+
+  15 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +fribidi-0.19.2-r2.ebuild, +files/fribidi-0.19.2-glib-2.31.patch:
+  Pass --with-glib=yes to ensure fribidi.pc has "Requires: glib-2.0" line wrt
+  #345621. Only #include glib.h for dev-libs/glib >= 2.31 compability wrt
+  #415721. Thanks to Thomas Sachau for reporting both bugs.
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> fribidi-0.19.2-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 2127f2588d3d..fe5bfaf36eb8 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fribidi-0.19.2-glib-2.31.patch 1827 RMD160 a282ca46af20c2c86ddb1c97ae1cd48fad743c3d SHA1 8259e801ff205af04252a3b7edf8438b29bd62f4 SHA256 837873920365aa212006a619288449008f1bb1fa94514143bf0b079a7d029824
 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-0.19.2-nodoc.patch 326 RMD160 a986955daba89b15d4d478a71120e0fe57d02b54 SHA1 5bde76c840a10b523277822cd00d4dd5293da634 SHA256 e72ede72adab960ed4b1f436a77511c52ce9c9529cef5880527c6c7f4adf6a65
 DIST fribidi-0.10.7.tar.gz 593309 RMD160 ddc37838a1cca880a7c63c0e77cff5ed7a3fac1d SHA1 b49568f87d72a1f513e533a99bf0143dc9fc3e64 SHA256 ecea548c16f5632f0d5dbc005e595bf2f4ebfbdb0bf74c8db347662f8475450b
 DIST fribidi-0.19.2.tar.gz 668933 RMD160 4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 SHA1 3889469d96dbca3d8522231672e14cca77de4d5e SHA256 49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
 EBUILD fribidi-0.10.7.ebuild 597 RMD160 27b8f9d61d7128b699c55e3876fac72206de66fb SHA1 e6cb30f0a6d4e0391eeae5fca8b3b988ab3e9cd6 SHA256 4dc33d493e6d02a2bdb7bbf9105f37c67b7d9624100b35f014fa65e400d2e607
 EBUILD fribidi-0.19.2-r1.ebuild 1010 RMD160 5838c8d7a9ad5b8e7b639883bde3f7e574de0546 SHA1 9514e0517989f0ea1d3d957164a4e8a8bb96f242 SHA256 bc66d631a7344ceb9a56c909054e779ff908a3a8d92f607058154aee7f63e5ee
-MISC ChangeLog 6832 RMD160 58424b6c0aec129b683b981ab5aba4550b5d8219 SHA1 cef49f25cc9e8ecf9cdac2e82717f6e9376e8723 SHA256 dbaa8bf942dfa0fd32865316548154cc8a016d0c0aa8f64bed08c42458f05716
+EBUILD fribidi-0.19.2-r2.ebuild 1145 RMD160 a817f8ea132b6d982e0f0a24625dcf7df9785e1d SHA1 c8e556f506a92d11bc13dfc343f247e737a2eef3 SHA256 0fca493a235250567ca9cbfa43f22021dca812368f3d988cd3113e2728cfda12
+MISC ChangeLog 7202 RMD160 fa918e5e7eba722171b78611011153ebafdf39d5 SHA1 9ceed74d47d58015df9ac3f29a13dd739580b091 SHA256 293d1f6814a1fe1920aa6147d75592934a36e694d19cbd350df3f6ea01cc1f93
 MISC metadata.xml 206 RMD160 83ccfb8760990aa9505ff3fc783b007757a28b8f SHA1 751236ca8239ebc0f626ebaec962c541d06a08dc SHA256 ad4b3a76027f2a686de5578c6b1251011dd917a10fcf9fd8d16105b35c2f991b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+yU8QACgkQvFcC4BYPU0pgMwCeOBP2XEcj+VVwLpV1eca6wJ26
-U2IAoLcnUbuOTgUjIR8HHouLETMYw2tK
-=7fNK
+iQEcBAEBAgAGBQJPslsCAAoJEEdUh39IaPFN+csH/j/w9wo88jLFZa6jORF5cqIN
+ngIu/M+XX4BYGa4/8Rl6o1imrNiCY2B1hjeNjzyb5PLAhIS0ZzM5EHSrVYwHaJOz
+U5hUflTwoK56Xga595F6dSlPA5Ui8eGqcNcLGZiYivjpByKaZAOvCxsMYjAYw9QF
+dGbnVcXU8lsHcPNzYYiA6sxs2e5UXwtNLC0rblMl/1h5MICM5tahF/pphyNx4Kzr
+4ztF55NHfImL0VFNOjx1PlHxQ8NxbN9h8sZhrANR3DaVUi6c94kVPSnnQMOYQTIP
+mW0RdFKDkHHCOqwdE1XaxhuOvybRU2X5915WH+/OlklJYtHdu1BkglM1N06gi1A=
+=+7t4
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-glib-2.31.patch b/dev-libs/fribidi/files/fribidi-0.19.2-glib-2.31.patch
new file mode 100644
index 000000000000..446a2f395bce
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.2-glib-2.31.patch
@@ -0,0 +1,74 @@
+http://bugs.gentoo.org/318569
+http://bugs.gentoo.org/415721
+
+--- charset/fribidi-char-sets.c
++++ charset/fribidi-char-sets.c
+@@ -114,7 +114,7 @@
+ };
+ 
+ #if FRIBIDI_USE_GLIB+0
+-# include <glib/gstrfuncs.h>
++# include <glib.h>
+ # define fribidi_strcasecmp g_ascii_strcasecmp
+ #else /* !FRIBIDI_USE_GLIB */
+ static char
+--- lib/common.h
++++ lib/common.h
+@@ -57,7 +57,7 @@
+ #  define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P
+ # endif	/* !SIZEOF_VOID_P */
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gmem.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # ifndef fribidi_malloc
+ #  define fribidi_malloc g_try_malloc
+@@ -65,12 +65,12 @@
+ # endif	/* !fribidi_malloc */
+ # ifndef fribidi_assert
+ #  ifndef __FRIBIDI_DOC
+-#   include <glib/gmessages.h>
++#   include <glib.h>
+ #  endif /* !__FRIBIDI_DOC */
+ #  define fribidi_assert g_assert
+ # endif	/* !fribidi_assert */
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gmacros.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # ifndef FRIBIDI_BEGIN_STMT
+ #  define FRIBIDI_BEGIN_STMT G_STMT_START {
+--- lib/fribidi-common.h
++++ lib/fribidi-common.h
+@@ -62,7 +62,7 @@
+ 
+ #if FRIBIDI_USE_GLIB+0
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gmacros.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # define FRIBIDI_BEGIN_DECLS		G_BEGIN_DECLS
+ # define FRIBIDI_END_DECLS		G_END_DECLS
+--- lib/fribidi-types.h
++++ lib/fribidi-types.h
+@@ -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
+--- lib/mem.h
++++ lib/mem.h
+@@ -42,7 +42,7 @@
+ #if FRIBIDI_USE_GLIB+0
+ 
+ #ifndef __FRIBIDI_DOC
+-# include <glib/gmem.h>
++# include <glib.h>
+ #endif /* !__FRIBIDI_DOC */
+ 
+ #define FriBidiMemChunk GMemChunk
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
index b8cb2645c1ac..8649db285528 100644
--- a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
+++ b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
@@ -1,5 +1,5 @@
---- 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
+--- Makefile.am
++++ Makefile.am
 @@ -9,7 +9,7 @@
  ##############################################################################
  
diff --git a/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild b/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild
new file mode 100644
index 000000000000..ad9bea589d11
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/05/15 13:35:32 ssuominen Exp $
+
+EAPI=4
+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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README ChangeLog THANKS TODO"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glib-2.31.patch \
+		"${FILESDIR}"/${P}-nodoc.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	econf \
+		$(use_enable static-libs static) \
+		--with-glib=yes
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}