Version Bump

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

4 files changed, 81 insertions, 13 deletions

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 5ba7a26c961c..946e02927b7c 100644
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/fribidi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.81 2013/08/10 22:08:07 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.82 2014/05/03 10:11:56 thev00d00 Exp $
+
+*fribidi-0.19.6 (03 May 2014)
+
+  03 May 2014; Ian Whyman <thev00d00@gentoo.org>
+  +files/fribidi-0.19.6-page-size-header.patch, +fribidi-0.19.6.ebuild:
+  Version Bump
 
 *fribidi-0.19.5-r2 (10 Aug 2013)
 
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 18957bb8e2d7..5ac5f2d81da4 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fribidi-0.19.2-nodoc.patch 326 SHA256 e72ede72adab960ed4b1f436a77511c52ce9c9529cef5880527c6c7f4adf6a65 SHA512 cebfda88ee8a073ea270f18c43e00aa3c15e4646511b161930d9afbafd67a6535423a78025e415031d7a5582243c326940cc8ce418f74a60424505a43614b674 WHIRLPOOL 6e0e35a0541991133c722f377a57ba06fdbf5a6856d5f56b9be4c263a9b024feb91701de9c4901fe41488af216f9df5bbb14075b425598ddca5e9c6b83574908
 AUX fribidi-0.19.5-signedwarning.patch 617 SHA256 920f334e80b6831bfce797b0b95b7a9bc4861ea66997756293412f70447a257d SHA512 3fa29f77adb19d2da52ff46d39d3da7662edf80d4cde98d87d3827a8b844c2e272408a611d7ef1364f72b78e801ce585a5ff89fe2a85729fa95982c3aecaedd5 WHIRLPOOL 95023548003833e46c4fe02a65900c9a175edd6acf7ffd642b6e87d32c7937b5acb017c85380024b4f253fa1c9d24074790ec2d425a0eb67a7e6c90b8a86911a
+AUX fribidi-0.19.6-page-size-header.patch 852 SHA256 ea023043f13c4cfc40126f234444c39df9d3c23c7b9a0e4cc438f8e2c5385f48 SHA512 3d8fb438832b9de217c8468ecdd61101d9fa8f5e8ee5c9e4af9b4e01e6b04e6ba35351c586767ab794dfbb8d2e05e30c2f947bf97163839f4d46aff98e9be74c WHIRLPOOL 07829e2e23fd175eaf0c487f46fa0fabadf0da1bda9889e041ec126214433a52d2eea00b4deea323002f5416ea08598ab6456b3a0ec7604a4f6f744dd52c3c8f
 DIST fribidi-0.19.5.tar.bz2 625034 SHA256 501231e4260f83fccedae1cafe983a7de87082e3f5387e0b283d016f7f4cb428 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43 WHIRLPOOL 5241696a5477f9cd1931213b14a27a21647ccabbaaaa0d2f8112a51efeeb7557b3b614bbb30500cd1ebf17fd4332007c22c42c1667e738dc2a2e94e1c182211a
+DIST fribidi-0.19.6.tar.bz2 639022 SHA256 cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e WHIRLPOOL 71a1d1b44a4d58e6e4567f21a7e9f72a925f648a817d1c59d3815c8070e48656889c91afe2c842ca56e2bd8f33c783a4bbf16864514106614a12b8394c03e674
 EBUILD fribidi-0.19.5-r1.ebuild 1348 SHA256 8dea84dd202f14402b72582cd76954f0ae930bfefddbaf057262e0c808a1ecba SHA512 62eea4309094f1b64d97714462fc41748abe6545b06d7bb9d1107e2df63c657599e630fa37abb7ffc41c7a90ed5d2bba5d93cffaa4e637fa7f19acbd8c63f230 WHIRLPOOL 42ac649924906f4165e8627d104551f2cd02d3f45dbdd4006033518bbabba1d971d1a4593e587eec005f4e3c96be404d40f82bc4e77588df98233169eeb79fd7
 EBUILD fribidi-0.19.5-r2.ebuild 1533 SHA256 c846216327ba287cc779cd6955d4bfdec1a54d80c4d82344c78e687e17c7a95f SHA512 544127ac045470cb8c8d5e730fc0d81dfe52e3d02a1ed797e7c59fad02b22f3d0177ed8c530069e2204de938fe4b8828de9215f98d3db5c07e3a725437023af5 WHIRLPOOL b4e7457852600bfea0854dc80e9befcb4ba6cf113c7f7d64fe38e6e1a430d9c720e7ec19a2ef799bdf4c3fc669a6b90f1c2e787ebf42e063759a8e205e235ae1
-MISC ChangeLog 10480 SHA256 a3de6bbfd252f36241eaadaed064774628d7d64d36f7d16899a37c363e2f13f3 SHA512 d79e52a47ec5c5c28a9a8731a0e848e2d72c2679a98d301d70e96f056ca22dde1d94b8399d2b0c47a4feb8e6a3973aa535903e146fe590c6fe8257d4fd685a72 WHIRLPOOL f43056ae973f6f7e6b4697b418781013d1875936507ee9b1687f533bfed3671a7dca3ca7926026fcf6ac1f32249367a586ea6a10ab622ac6daade10c183d74db
+EBUILD fribidi-0.19.6.ebuild 1534 SHA256 b3d9644fe5c1762879cc2f78b9d2b0911db57ed4451bc008b68915d51a380bae SHA512 ab03fa1277e7b88ca1bbcbe0bcc2161dc992fa4e534aed0900b2703893f6b2145baca4e20e880d41a6a21a463541ad1104985846d3b5f720fabc93eb786d999a WHIRLPOOL d0c21968aadb69665528bab6811e91858fc7ac8e8ea2b590cd4d074aa2559e3b2df4385b16317903bb6aa688b11e7cc695811b9fd94dbb5aaaab5565737cdbd9
+MISC ChangeLog 10649 SHA256 0e8c99188f8266b572d3758b32e026a09cec27c32480c37c9b98cfca82694192 SHA512 2c6aa08eda81270c5e58385baa18683b7a309a47c1f13925721bb4a2e12a01d65547bec3656ec9c46f1bdbdf3d91bf916b86a3179981f73b60f326215ad7f92e WHIRLPOOL d8b71eba8becb1700d1bf7a1b31750ef11f7c69314d022dd19d69f520142dc2adb138ecab77fb9005625dca6153c03787c0b4dc6707d180dabd74172768fb163
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlIGucgACgkQvFcC4BYPU0oRwgCeN+9YK5PnqTF2hoFbgQh8gtjP
-WjQAoJ5oBtjTAyooPrYE4pGha+edC4HL
-=o9Pv
------END PGP SIGNATURE-----
diff --git a/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch b/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch
new file mode 100644
index 000000000000..c2b39155eea2
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch
@@ -0,0 +1,20 @@
+diff -ur fribidi-0.19.6.old/lib/common.h fribidi-0.19.6/lib/common.h
+--- fribidi-0.19.6.old/lib/common.h	2012-12-30 00:12:59.000000000 +0000
++++ fribidi-0.19.6/lib/common.h	2014-05-03 11:04:19.969727962 +0100
+@@ -130,14 +130,8 @@
+ /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being
+  * allocated for data structure pools. */
+ #ifndef FRIBIDI_CHUNK_SIZE
+-# if HAVE_ASM_PAGE_H
+-#  ifndef __FRIBIDI_DOC
+-#   include <asm/page.h>
+-#  endif /* __FRIBIDI_DOC */
+-#  define FRIBIDI_CHUNK_SIZE (PAGE_SIZE - 16)
+-# else /* !HAVE_ASM_PAGE_H */
+-#  define FRIBIDI_CHUNK_SIZE (4096 - 16)
+-# endif	/* !HAVE_ASM_PAGE_H */
++# include <unistd.h>
++# define FRIBIDI_CHUNK_SIZE (sysconf(_SC_PAGESIZE) - 16)
+ #else /* FRIBIDI_CHUNK_SIZE */
+ # if FRIBIDI_CHUNK_SIZE < 256
+ #  error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes.
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
new file mode 100644
index 000000000000..394f90476022
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.6.ebuild,v 1.1 2014/05/03 10:11:56 thev00d00 Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools eutils autotools-multilib
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
+
+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"
+
+RESTRICT="test" #397347
+
+RDEPEND=">=dev-libs/glib-2:2[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
+		"${FILESDIR}"/${P}-page-size-header.patch
+
+	# Fix compability with dev-libs/glib >= 2.31
+	sed -i \
+		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
+		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
+		charset/fribidi-char-sets.c lib/mem.h || die
+
+	autotools-multilib_src_prepare
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	local myeconfargs=( --with-glib=yes )
+	autotools-multilib_src_configure
+}