subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/fontconfig\/"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2024-02-14 Thread Sam James

commit: ade3abb3586f5cd46401afa207c323a5e7e38169
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 14 18:21:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 14 18:22:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3abb3

media-libs/fontconfig: fix -lm linkage for `fabs`

Signed-off-by: Sam James  gentoo.org>

 .../files/fontconfig-2.14.2-math-fabs.patch| 42 ++
 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild  |  3 +-
 media-libs/fontconfig/fontconfig-2.15.0.ebuild |  3 +-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.2-math-fabs.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.2-math-fabs.patch
new file mode 100644
index ..669e4ebbd65f
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.2-math-fabs.patch
@@ -0,0 +1,42 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/309
+
+From 81d410310ffee8761819e72151ec25efde2f5b24 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 14 Feb 2024 18:12:46 +
+Subject: [PATCH] meson: detect-and-use `-lm` for `fabs` in fcmatch
+
+We had a bug report in Gentoo of a sparc64 build failure with -O0:
+```
+FAILED: src/libfontconfig.so.1.13.0
+sparc64-unknown-linux-gnu-gcc  -o src/libfontconfig.so.1.13.0 
src/libfontconfig.so.1.13.0.p/fcatomic.c.o 
src/libfontconfig.so.1.13.0.p/fccache.c.o 
src/libfontconfig.so.1.13.0.p/fccfg.c.o 
src/libfontconfig.so.1.13.0.p/fccharset.c.o 
src/libfontconfig.so.1.13.0.p/fccompat.c.o 
src/libfontconfig.so.1.13.0.p/fcdbg.c.o 
src/libfontconfig.so.1.13.0.p/fcdefault.c.o 
src/libfontconfig.so.1.13.0.p/fcdir.c.o 
src/libfontconfig.so.1.13.0.p/fcformat.c.o 
src/libfontconfig.so.1.13.0.p/fcfreetype.c.o 
src/libfontconfig.so.1.13.0.p/fcfs.c.o 
src/libfontconfig.so.1.13.0.p/fcptrlist.c.o 
src/libfontconfig.so.1.13.0.p/fchash.c.o 
src/libfontconfig.so.1.13.0.p/fcinit.c.o 
src/libfontconfig.so.1.13.0.p/fclang.c.o 
src/libfontconfig.so.1.13.0.p/fclist.c.o 
src/libfontconfig.so.1.13.0.p/fcmatch.c.o 
src/libfontconfig.so.1.13.0.p/fcmatrix.c.o 
src/libfontconfig.so.1.13.0.p/fcname.c.o 
src/libfontconfig.so.1.13.0.p/fcobjs.c.o 
src/libfontconfig.so.1.13.0.p/fcpat.c.o 
src/libfontconfig.so.1.13.0.p/fcrange.c.o src/libfontconf
 ig.so.1.13.0.p/fcserialize.c.o src/libfontconfig.so.1.13.0.p/fcstat.c.o 
src/libfontconfig.so.1.13.0.p/fcstr.c.o 
src/libfontconfig.so.1.13.0.p/fcweight.c.o 
src/libfontconfig.so.1.13.0.p/fcxml.c.o 
src/libfontconfig.so.1.13.0.p/ftglue.c.o -Wl,--as-needed -Wl,--no-undefined 
-shared -fPIC -Wl,--start-group -Wl,-soname,libfontconfig.so.1 -m64 -g -O0 
-mno-app-regs -mcpu=ultrasparc -mtune=ultrasparc -mno-vis -mno-vis2 -mno-vis3 
-mno-vis4 -mno-vis4b -mno-cbcond -mno-fmaf -mno-fsmuld -mno-popc -mno-subxc 
-fno-builtin -fno-fast-math -Wl,-O1 -Wl,--as-needed -Wl,--no-keep-memory 
/usr/lib64/libfreetype.so /usr/lib64/libexpat.so -Wl,--end-group -pthread
+/usr/lib/gcc/sparc64-unknown-linux-gnu/12/../../../../sparc64-unknown-linux-gnu/bin/ld:
 src/libfontconfig.so.1.13.0.p/fcmatch.c.o: in function `FcCompareRange':
+/var/tmp/portage/media-libs/fontconfig-2.14.2-r3/work/fontconfig-2.14.2-.sparc64/../fontconfig-2.14.2/src/fcmatch.c:220:
 undefined reference to `fabs'
+```
+
+Ask Meson to detect `-lm` and add the missing `-lm` for `fabs` usage.
+
+Signed-off-by: Sam James 
+--- a/meson.build
 b/meson.build
+@@ -23,7 +23,7 @@ freetype_req = '>= 21.0.15'
+ freetype_req_cmake = '>= 2.8.1'
+ 
+ cc = meson.get_compiler('c')
+-
++math_dep = cc.find_library('m', required: false)
+ 
+ freetype_dep = dependency('freetype2', method: 'pkg-config', version: 
freetype_req, required: false)
+ 
+--- a/src/meson.build
 b/src/meson.build
+@@ -65,7 +65,7 @@ libfontconfig = library('fontconfig',
+   fc_sources, alias_headers, ft_alias_headers, fclang_h, fccase_h, 
fcobjshash_h,
+   c_args: c_args + fc_extra_c_args,
+   include_directories: incbase,
+-  dependencies: deps,
++  dependencies: [deps, math_dep],
+   install: true,
+   soversion: soversion,
+   version: libversion,
+-- 
+GitLab

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index 2d4a41d85739..1f3f04e3cc61 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,6 +66,7 @@ PATCHES=(
 
# Patches from upstream (can usually be removed with next version bump)
"${FILESDIR}"/${P}-fix-sysroot-fc-cache.patch
+   "${FILESDIR}"/${PN}-2.14.2-math-fabs.patch
 )
 
 DOC_CONTENTS="Please make fontconfig configuration changes using

diff --git a/media-libs/fontconfig/fontconfig-2.15.0.ebuild 
b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
index 01f18ac3a8ab..87e30591256d

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-12-27 Thread Sam James

commit: 298b3feabd749cd7ceb8839ff61cfacfcbbded65
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 20:55:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 20:57:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=298b3fea

media-libs/fontconfig: drop 2.14.2-r2

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 231 --
 1 file changed, 231 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
deleted file mode 100644
index ddbb23ce8ebb..
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="https://fontconfig.org/;
-SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
-
-LICENSE="MIT"
-SLOT="1.0"
-if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-fi
-IUSE="doc nls test"
-RESTRICT="!test? ( test )"
-
-# - Check minimum freetype & other deps on bumps. See
-#   
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
-#   Note that FT versioning is confusing, need to map it using
-#   
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
-#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
-#   
https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
-#
-# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
-#   default and used by every distro. See bug #283191.
-#
-# - There's a test-only dep on json-c.
-#   It might become an optional(?) runtime dep in future though. Who knows.
-#   Keep an eye on it.
-RDEPEND="
-   >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-   >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
-   virtual/libintl[${MULTILIB_USEDEP}]
-   !elibc_Darwin? ( !elibc_SunOS? ( 
sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
-   elibc_Darwin? ( sys-libs/native-uuid )
-   elibc_SunOS? ( sys-libs/libuuid )
-"
-DEPEND="
-   ${RDEPEND}
-   test? ( dev-libs/json-c )
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-util/gperf
-   virtual/pkgconfig
-   doc? (
-   =app-text/docbook-sgml-dtd-3.1*
-   app-text/docbook-sgml-utils[jadetex]
-   )
-   nls? ( >=sys-devel/gettext-0.19.8 )
-"
-PDEPEND="virtual/ttf-fonts"
-# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
-# when cross-compiling.
-IDEPEND="app-eselect/eselect-fontconfig"
-
-PATCHES=(
-   # bug #130466 + make liberation default
-   "${FILESDIR}"/${PN}-2.14.0-latin-update.patch
-   # Avoid test failure (bubblewrap doesn't work within sandbox)
-   "${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
-
-   # Patches from upstream (can usually be removed with next version bump)
-)
-
-DOC_CONTENTS="Please make fontconfig configuration changes using
-\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-overwritten. If you need to reset your configuration to upstream defaults,
-delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
-
-src_prepare() {
-   default
-
-   # Test needs network access
-   # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
-   # On bumps, please check to see if this has been fixed
-   # to allow local access!
-   sed -i -e '/test-crbug1004254/d' test/meson.build || die
-}
-
-multilib_src_configure() {
-   local addfonts=(
-   "${EPREFIX}"/usr/local/share/fonts
-   )
-
-   # Harvest some font locations, such that users can benefit from the
-   # host OS's installed fonts
-   case ${CHOST} in
-   *-darwin*)
-   addfonts+=(
-   /Library/Fonts
-   /System/Library/Fonts
-   )
-   ;;
-
-   *-solaris*)
-   [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-   addfonts+=( /usr/X/lib/X11/fonts/TrueType )
-   [[ -d /usr/X/lib/X11/fonts/Type1 ]] &&
-   addfonts+=( /usr/X/lib/X11/fonts/Type1 )
-   ;;
-
-   *-linux-gnu)
-   use prefix && [[ -d /usr/share/fonts ]] && \
-   addfonts+=( /usr/share/fonts )
-   ;;
-   esac
-
-   local emesonargs=(
-   # USE=doc only controls the additional bits

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-12-27 Thread Sam James

commit: f077e4e450a18e21a9787b0f408bdec74302b3a1
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 20:54:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 20:57:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f077e4e4

media-libs/fontconfig: add 2.15.0

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 media-libs/fontconfig/fontconfig-2.15.0.ebuild | 231 +
 2 files changed, 232 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 330e1e1816f4..77d112707da0 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1 +1,2 @@
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 
4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d
 SHA512 
23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
+DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 
17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533
 SHA512 
754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417

diff --git a/media-libs/fontconfig/fontconfig-2.15.0.ebuild 
b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
new file mode 100644
index ..01f18ac3a8ab
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/;
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   
https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+   >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+   virtual/libintl[${MULTILIB_USEDEP}]
+   !elibc_Darwin? ( !elibc_SunOS? ( 
sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+   elibc_Darwin? ( sys-libs/native-uuid )
+   elibc_SunOS? ( sys-libs/libuuid )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-libs/json-c )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-util/gperf
+   virtual/pkgconfig
+   doc? (
+   =app-text/docbook-sgml-dtd-3.1*
+   app-text/docbook-sgml-utils[jadetex]
+   )
+   nls? ( >=sys-devel/gettext-0.19.8 )
+"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="app-eselect/eselect-fontconfig"
+
+PATCHES=(
+   # bug #130466 + make liberation default
+   "${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+   # Avoid test failure (bubblewrap doesn't work within sandbox)
+   "${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+   # Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+   default
+
+   # Test needs network access
+   # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+   # On bumps, please check to see if this has been fixed
+   # to allow local access!
+   sed -i -e '/test-crbug1004254/d' test/meson.build || die
+}
+
+multilib_src_configure() {
+   local addfonts=(
+   "${EPREFIX}"/usr/local/share/fonts
+   )
+
+   # Harvest some font locations, such that users can

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-12-01 Thread Arthur Zamarin

commit: 4e83a45f9f72ddad8f4058cef80a5daaaf64e7c4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  1 16:00:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  1 16:00:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e83a45f

media-libs/fontconfig: Stabilize 2.14.2-r3 ppc, #914803

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index 4c699cd752df..2d4a41d85739 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2023-11-30 Thread Matt Turner

commit: f225d76a1bd43a38280f7c524bfffd413f7c5a68
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec  1 00:02:32 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec  1 00:11:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f225d76a

media-libs/fontconfig: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/fontconfig/Manifest |   2 -
 .../files/fontconfig-2.14.0-docbook.patch  |  29 ---
 .../fontconfig-2.14.1-gperf-meson-debugging.patch  |  23 ---
 .../files/fontconfig-2.14.1-gperf-meson.patch  |  79 
 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild  | 224 -
 media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild  | 218 
 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 216 
 7 files changed, 791 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 1577f159cec8..330e1e1816f4 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1 @@
-DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
-DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 
4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73
 SHA512 
ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 
4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d
 SHA512 
23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
deleted file mode 100644
index b9d5e8e5b5e2..
--- a/media-libs/fontconfig/files/fontconfig-2.14.0-docbook.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/223
-
-From d4a8381169984246dbb14b7a810abd170d7d0afd Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sat, 2 Apr 2022 02:36:24 +0100
-Subject: [PATCH] configure.ac: allow disabling docbook
-
-Sometimes we might want to build docs (install man pages, etc)
-but allow disabling use of docbook.
-
-Bug: https://bugs.gentoo.org/310157
-Signed-off-by: Sam James 
 a/configure.ac
-+++ b/configure.ac
-@@ -736,7 +736,13 @@ dnl 
===
- # Let people not build/install docs if they don't have docbook
- #
- 
--AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+AC_ARG_ENABLE(docbook,
-+  [AS_HELP_STRING([--disable-docbook],
-+  [Disable building docs with docbook2html (default: no)])],,)
-+
-+if test x$enable_docbook != xno; then
-+  AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+fi
- 
- AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
- 

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
deleted file mode 100644
index fb5e8a14f8b8..
--- a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/240
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
-
-From c42eb5b503a44b0b062b041d2e8a0138ce21a0c7 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH 
-Date: Thu, 27 Oct 2022 12:32:07 +0900
-Subject: [PATCH] Fix the build issue on meson when -g option is added to
- c_args
-
-Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
 a/src/cutout.py
-+++ b/src/cutout.py
-@@ -24,7 +24,8 @@ if __name__== '__main__':
- break
- 
- cpp = args[1]
--ret = subprocess.run(cpp + host_cargs + [args[0].input], 
stdout=subprocess.PIPE, check=True)
-+cpp_args = [i for i in host_cargs + [args[0].input] if not 
i.startswith('-g')]
-+ret = subprocess.run(cpp + cpp_args, stdout=subprocess.PIPE, check=True)
- 
- stdout = ret.stdout.decode('utf8')
- 
-GitLab

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
deleted file mode 100644
index 5565012cad65..
--- a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a07e2f1e8ad049772cd24b7daa0a4a168f33bfba.patch
-
-From

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-28 Thread Sam James

commit: 6542d920eb7871ad521b5a31297345d9e05f5b8f
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 09:05:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 09:05:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6542d920

media-libs/fontconfig: Stabilize 2.14.2-r3 amd64, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index fa40bd84fd2e..4c699cd752df 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-27 Thread Sam James

commit: a38c6e2fe2a403c2d19dd913d2852bd1c3376ae6
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 05:12:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 05:12:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38c6e2f

media-libs/fontconfig: Stabilize 2.14.2-r3 sparc, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index e290068d7f9d..fa40bd84fd2e 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-27 Thread Sam James

commit: 179a7ac4d7ee40e61c40500e6169516f46848f7c
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 04:35:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 04:35:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179a7ac4

media-libs/fontconfig: Stabilize 2.14.2-r3 hppa, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index cf3cc2c3b177..e290068d7f9d 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-27 Thread Sam James

commit: f8a57908a30418daa75deb5fb03ca007509abc28
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 07:44:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 07:44:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a57908

media-libs/fontconfig: Stabilize 2.14.2-r3 ppc64, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index 42d0156851ea..cf3cc2c3b177 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-26 Thread Sam James

commit: b165482265682a0253691351b0fe8d19e5dc9a74
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 05:23:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 05:23:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1654822

media-libs/fontconfig: Stabilize 2.14.2-r3 x86, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index 027a7b21b085..42d0156851ea 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-26 Thread Sam James

commit: e3ef4e8b144bb4b298e5174c9dd4d7ab8e8a7313
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 04:58:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 04:58:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ef4e8b

media-libs/fontconfig: Stabilize 2.14.2-r3 arm64, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index 96304138a93a..027a7b21b085 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-09-26 Thread Sam James

commit: 0a59587f67c410d8742b42b387b2910e86ba3bc3
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 04:50:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 04:50:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a59587f

media-libs/fontconfig: Stabilize 2.14.2-r3 arm, #914803

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
index bc66c7a0108d..96304138a93a 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-06-01 Thread Sam James

commit: 2a658b27ccfee064163e47cedcaddfff1972fb22
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 07:56:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 07:56:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a658b27

media-libs/fontconfig: Stabilize 2.14.2-r2 ppc, #907581

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 326fe29eb6a0..8cdf57a4f8a2 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-06-01 Thread Sam James

commit: 15d7395d809458aac4d8e2664054967f9169844c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 06:30:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 06:30:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d7395d

media-libs/fontconfig: Stabilize 2.14.2-r2 ppc64, #907581

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index d3451d058b22..326fe29eb6a0 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-06-01 Thread Sam James

commit: ce0391cf197ef76f93e0f46086e85997ff0b8f0f
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 06:26:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 06:26:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0391cf

media-libs/fontconfig: Stabilize 2.14.2-r2 hppa, #907581

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index bf64e70f7015..d3451d058b22 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-05-31 Thread Sam James

commit: 3132dfd019dc7e261a39af61fc37c224a94ea793
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:28:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:28:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3132dfd0

media-libs/fontconfig: Stabilize 2.14.2-r2 x86, #907581

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index a5619f8d3f6f..bf64e70f7015 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-05-31 Thread Sam James

commit: 91ae0a13270a06962162190d41bc0c0be6be9e4d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:21:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:21:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ae0a13

media-libs/fontconfig: Stabilize 2.14.2-r2 arm64, #907581

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 4b02ba185bd0..19f571a87205 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-05-31 Thread Sam James

commit: fed602ac05ec8d3aba05d80e06e63f422435a91a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:21:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:21:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed602ac

media-libs/fontconfig: Stabilize 2.14.2-r2 arm, #907581

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 19f571a87205..a5619f8d3f6f 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/files/, media-libs/fontconfig/

2023-05-30 Thread Sam James

commit: cd25a4746a974454ffc7906a86df0e24a791a6ed
Author: Sam James  gentoo  org>
AuthorDate: Tue May 30 17:26:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 30 17:26:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd25a474

media-libs/fontconfig: backport fix for fc-cache w/ sysroot

Closes: https://bugs.gentoo.org/907424
Signed-off-by: Sam James  gentoo.org>

 .../fontconfig-2.14.2-fix-sysroot-fc-cache.patch   |  60 ++
 media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild  | 232 +
 2 files changed, 292 insertions(+)

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.14.2-fix-sysroot-fc-cache.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.2-fix-sysroot-fc-cache.patch
new file mode 100644
index ..8568d5f4a99f
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.2-fix-sysroot-fc-cache.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/907424
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/2ef790a0dbbab24235d1b8c0325ab4414de5f0a9
+
+From 2ef790a0dbbab24235d1b8c0325ab4414de5f0a9 Mon Sep 17 00:00:00 2001
+From: Tom Anderson 
+Date: Thu, 9 Feb 2023 01:31:26 +
+Subject: [PATCH] Fix filepaths added when scanning with sysroot
+
+This fixes a regression introduced by 76f88e780.  When
+using FONTCONFIG_SYSROOT=/home/tom/test_fonts, strace
+reveals that fontconfig attempted to open /test_fonts/Ahem.ttf
+instead of /home/tom/test_fonts/Ahem.ttf.  The fix is to use
+`s_dir` instead of `dir` in `file_prefix`.
+--- a/src/fcdir.c
 b/src/fcdir.c
+@@ -201,7 +201,7 @@ FcDirScanConfig (FcFontSet *set,
+ DIR   *d;
+ struct dirent *e;
+ FcStrSet  *files;
+-FcChar8   *file_prefix, *s_dir = NULL;
++FcChar8   *file_prefix = NULL, *s_dir = NULL;
+ FcChar8   *base;
+ const FcChar8 *sysroot = FcConfigGetSysRoot (config);
+ FcBoolret = FcTrue;
+@@ -213,16 +213,6 @@ FcDirScanConfig (FcFontSet*set,
+ if (!set && !dirs)
+   return FcTrue;
+ 
+-/* freed below */
+-file_prefix = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + 
FC_MAX_FILE_LEN + 1);
+-if (!file_prefix) {
+-  ret = FcFalse;
+-  goto bail;
+-}
+-strcpy ((char *) file_prefix, (char *) dir);
+-strcat ((char *) file_prefix, FC_DIR_SEPARATOR_S);
+-base = file_prefix + strlen ((char *) file_prefix);
+-
+ if (sysroot)
+   s_dir = FcStrBuildFilename (sysroot, dir, NULL);
+ else
+@@ -232,6 +222,16 @@ FcDirScanConfig (FcFontSet*set,
+   goto bail;
+ }
+ 
++/* freed below */
++file_prefix = (FcChar8 *) malloc (strlen ((char *) s_dir) + 1 + 
FC_MAX_FILE_LEN + 1);
++if (!file_prefix) {
++  ret = FcFalse;
++  goto bail;
++}
++strcpy ((char *) file_prefix, (char *) s_dir);
++strcat ((char *) file_prefix, FC_DIR_SEPARATOR_S);
++base = file_prefix + strlen ((char *) file_prefix);
++
+ if (FcDebug () & FC_DBG_SCAN)
+   printf ("\tScanning dir %s\n", s_dir);
+   
+-- 
+GitLab

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
new file mode 100644
index ..c4f8f60b690d
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r3.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/;
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   
https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+   >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+   virtual/libintl[${MULTILIB_USEDEP}]
+   !elibc_Darwin? ( !elibc_SunOS? (

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-05-01 Thread Sam James

commit: 0bf6b78077bc32b04e291aadc3497f0b110ab7bf
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 10:27:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 10:32:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf6b780

media-libs/fontconfig: add freedesktop-gitlab upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/fontconfig/metadata.xml 
b/media-libs/fontconfig/metadata.xml
index 9d47487ee8ab..e01b392843dd 100644
--- a/media-libs/fontconfig/metadata.xml
+++ b/media-libs/fontconfig/metadata.xml
@@ -8,5 +8,6 @@
Fontconfig is a font configuration and customization 
library, which does not depend on the X Window System. It is designed to locate 
fonts within the system and select them according to requirements specified by 
applications.

cpe:/a:fontconfig_project:fontconfig
+   fontconfig/fontconfig

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-04-27 Thread Sam James

commit: 994cc012905d733e8dbfb0fa94d7eade79223345
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 27 06:37:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 27 06:39:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994cc012

media-libs/fontconfig: don't override user prefs. on antialiasing

2.14.2 installed 10-sub-pixel-none.conf unconditionally outside of our own
preference management system (eselect). For versions 2.14.2 <= x <= 2.14.2-r2,
delete that file if it's installed.

Closes: https://bugs.gentoo.org/900681
Signed-off-by: Sam James  gentoo.org>

 ...ontconfig-2.14.2-r1.ebuild => fontconfig-2.14.2-r2.ebuild} | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
similarity index 94%
rename from media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
rename to media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 025d4099fc68..ceae1d19f3e5 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -208,6 +208,17 @@ pkg_postinst() {
 
readme.gentoo_print_elog
 
+   local ver
+   for ver in ${REPLACING_VERSIONS} ; do
+   # 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+   if ver_test ${ver} -lt 2.14.2-r2 && ver_test ${ver} -ge 2.14.2 
; then
+   if [[ -e 
"${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then
+   einfo "Deleting 10-sub-pixel-none.conf from bad 
fontconfig-2.14.2 (bug #900681)"
+   rm 
"${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die
+   fi
+   fi
+   done
+
if [[ -z ${ROOT} ]] ; then
multilib_pkg_postinst() {
ebegin "Creating global font cache for ${ABI}"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-04-14 Thread Sam James

commit: aea637aa112edbe47f15e12f1d073bbfa0808977
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 15 03:24:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 15 03:37:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea637aa

media-libs/fontconfig: don't enable subpixel rendering by default

This changed in 2.14.2 inadvertently. We have our own mechanism for users
to choose this (eselect-fontconfig) but the default for this option was 
installing
/etc/fonts/conf.d/10-sub-pixel-none.conf.

Stop doing that and now it installs /etc/fonts/conf.avail/10-no-sub-pixel.conf.

Closes: https://bugs.gentoo.org/900681
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild | 220 ++
 1 file changed, 220 insertions(+)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
new file mode 100644
index ..025d4099fc68
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/;
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   
https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+   >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+   virtual/libintl[${MULTILIB_USEDEP}]
+   !elibc_Darwin? ( !elibc_SunOS? ( 
sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+   elibc_Darwin? ( sys-libs/native-uuid )
+   elibc_SunOS? ( sys-libs/libuuid )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-libs/json-c )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-util/gperf
+   virtual/pkgconfig
+   doc? (
+   =app-text/docbook-sgml-dtd-3.1*
+   app-text/docbook-sgml-utils[jadetex]
+   )
+   nls? ( >=sys-devel/gettext-0.19.8 )
+"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
+
+PATCHES=(
+   # bug #130466 + make liberation default
+   "${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+   # Avoid test failure (bubblewrap doesn't work within sandbox)
+   "${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+   # Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+   default
+
+   # Test needs network access
+   # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+   # On bumps, please check to see if this has been fixed
+   # to allow local access!
+   sed -i -e '/test-crbug1004254/d' test/meson.build || die
+}
+
+multilib_src_configure() {
+   local addfonts=(
+   "${EPREFIX}"/usr/local/share/fonts
+   )
+
+   # Harvest some font locations, such that users can benefit from the
+   # host OS's installed fonts
+   case ${CHOST} in
+   *-darwin*)
+   addfonts+=(
+   /Library/Fonts
+   /System/Library/Fonts
+   )
+   ;;
+
+   *-solaris*)
+   [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+   addfonts+=( /usr/X/lib/X11/fonts/TrueType )
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-04 Thread Arthur Zamarin

commit: c995f2ade39977114f61eff8dcaaae57cda0c593
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 18:19:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 18:19:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c995f2ad

media-libs/fontconfig: Stabilize 2.14.2 hppa, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index 54eb6a2885c4..950f3e3d8665 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-04 Thread Arthur Zamarin

commit: 4914f2726c07058da0ad86d79d4d175459492b0d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:48:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:48:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4914f272

media-libs/fontconfig: Stabilize 2.14.2 ppc64, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index 6f673e9ce5f1..54eb6a2885c4 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-04 Thread Arthur Zamarin

commit: 514717ab6417356b8c992b8e7deaa50972079676
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 09:26:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 09:26:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514717ab

media-libs/fontconfig: Stabilize 2.14.2 ppc, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index e734bc087e06..6f673e9ce5f1 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-03 Thread Arthur Zamarin

commit: c260b3aa68a135e099dbc3e60f8788016c3e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:57:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:57:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c260

media-libs/fontconfig: Stabilize 2.14.2 x86, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index ee38a78b519d..e734bc087e06 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-03 Thread Arthur Zamarin

commit: 6309f71ee6494a16a76456c052e13bcc5e2d5baa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:56:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:56:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6309f71e

media-libs/fontconfig: Stabilize 2.14.2 amd64, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index 23c7052f2882..ee38a78b519d 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-03 Thread Arthur Zamarin

commit: 542d27b3b40f5d62d4f78e3994d011b4066f0dc5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:49:58 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:49:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542d27b3

media-libs/fontconfig: Stabilize 2.14.2 sparc, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index fa78c89d8221..23c7052f2882 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-03 Thread Arthur Zamarin

commit: 928372ead3e4d6dad17b669b10478556297d1738
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:39:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:39:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=928372ea

media-libs/fontconfig: Stabilize 2.14.2 arm64, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index d758939b17d7..fa78c89d8221 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-03-03 Thread Arthur Zamarin

commit: 8972018a825a9aaf7ab63d4c5c9776e10037f436
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:32:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:32:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8972018a

media-libs/fontconfig: Stabilize 2.14.2 arm, #899412

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index a7eb1fcf0c0c..d758939b17d7 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2023-01-29 Thread Sam James

commit: 1b664ed0a515f87fee504d984a3dfd4b0d3bcd4e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 29 09:03:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 29 09:03:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b664ed0

media-libs/fontconfig: add 2.14.2

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 media-libs/fontconfig/fontconfig-2.14.2.ebuild | 216 +
 2 files changed, 217 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index cba7bf04f021..1577f159cec8 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 
4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73
 SHA512 
ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
+DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 
4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d
 SHA512 
23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085

diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
new file mode 100644
index ..a7eb1fcf0c0c
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/;
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   
https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+   >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+   virtual/libintl[${MULTILIB_USEDEP}]
+   !elibc_Darwin? ( !elibc_SunOS? ( 
sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+   elibc_Darwin? ( sys-libs/native-uuid )
+   elibc_SunOS? ( sys-libs/libuuid )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-libs/json-c )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-util/gperf
+   virtual/pkgconfig
+   doc? (
+   =app-text/docbook-sgml-dtd-3.1*
+   app-text/docbook-sgml-utils[jadetex]
+   )
+   nls? ( >=sys-devel/gettext-0.19.8 )
+"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
+
+PATCHES=(
+   # bug #130466 + make liberation default
+   "${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+   # Avoid test failure (bubblewrap doesn't work within sandbox)
+   "${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+   # Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+   default
+
+   # Test needs network access
+   #

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/files/

2022-10-30 Thread Sam James

commit: bd054ea5d06a3e84dd37805f21745f1e48d332ae
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Oct 30 07:53:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 30 09:26:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd054ea5

media-libs/fontconfig: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28033
Signed-off-by: Sam James  gentoo.org>

 .../files/fontconfig-2.10.2-docbook.patch  | 16 --
 .../files/fontconfig-2.13.93-latin-update.patch| 62 --
 2 files changed, 78 deletions(-)

diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch 
b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
deleted file mode 100644
index 94bea6327148..
--- a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/310157
 fontconfig-2.10.2-orig/configure.ac
-+++ fontconfig-2.10.2/configure.ac
-@@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
- # Let people not build/install docs if they don't have docbook
- #
- 
--AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+AC_ARG_ENABLE(docbook,   [  --disable-docbookDon't 
build documentation],,)
-+
-+if test x$enable_docbook != xno; then
-+  AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+fi
- 
- AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
- 

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
deleted file mode 100644
index 910f0c7ef565..
--- a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
+++ /dev/null
@@ -1,62 +0,0 @@
 fontconfig-2.13.93/conf.d/60-latin.conf
-+++ fontconfig-2.13.93/conf.d/60-latin.conf
-@@ -5,44 +5,47 @@
-   
-   serif
-   
-+  Liberation Serif
-   DejaVu Serif
-   Times New Roman
--  Thorndale AMT
-   Luxi Serif
-   Nimbus Roman No9 L
-   Nimbus Roman
-   Times
-+  Thorndale AMT
-   
-   
-   
-   sans-serif
-   
-+  Liberation Sans
-   DejaVu Sans
--  Verdana
-   Arial
--  Albany AMT
-   Luxi Sans
-   Nimbus Sans L
-   Nimbus Sans
-   Helvetica
-   Lucida Sans Unicode
-   BPG Glaho International 
-+  Verdana
-   Tahoma 
-+  Albany AMT
-   
-   
-   
-   monospace
-   
-+  Liberation Mono
-   DejaVu Sans Mono
-   Inconsolata
-   Andale Mono
-   Courier New
--  Cumberland AMT
-   Luxi Mono
-   Nimbus Mono L
-   Nimbus Mono
-   Nimbus Mono PS
-   Courier
-+  Cumberland AMT
-   
-   
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-10-29 Thread Sam James

commit: e428bed9b70852cea705a8d1a151d66d2bf3c4dd
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 19:11:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 19:11:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e428bed9

media-libs/fontconfig: add Python BDEPEND

Closes: https://bugs.gentoo.org/878429
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
index 2cf958c879d3..582a9b5420d0 100644
--- a/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit multilib meson-multilib readme.gentoo-r1
+PYTHON_COMPAT=( python3_{8..11} )
+inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="https://fontconfig.org/;
@@ -43,6 +44,7 @@ DEPEND="
test? ( dev-libs/json-c )
 "
 BDEPEND="
+   ${PYTHON_DEPS}
dev-util/gperf
virtual/pkgconfig
doc? (

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-10-29 Thread Sam James

commit: 56a47ec9b1e5ff490d34979a53c8e2b54c842ab6
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 19:09:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 19:11:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a47ec9

media-libs/fontconfig: fix doc install

Closes: https://bugs.gentoo.org/878595
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
index 1b69d23f740f..2cf958c879d3 100644
--- a/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
@@ -160,7 +160,7 @@ multilib_src_install_all() {
fi
 
if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
-   mv "${ED}"/usr/share/doc/fontconfig/* 
"${ED}"/usr/share/doc/${P} || die
+   mv "${ED}"/usr/share/doc/fontconfig/* 
"${ED}"/usr/share/doc/${PF} || die
rm -rf "${ED}"/usr/share/doc/fontconfig || die
fi

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-10-28 Thread Sam James

commit: ae3cdef3792c2f680eb534e262c30b297f78dcee
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 11:23:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 11:23:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3cdef3

media-libs/fontconfig: fix cache-dir for meson

In 2.14.1, we lost setting the cache dir in the transition to Meson.

Without this, it'd default to /var/lib/cache/fontconfig.

Closes: https://bugs.gentoo.org/878471
Signed-off-by: Sam James  gentoo.org>

 .../fontconfig/{fontconfig-2.14.1.ebuild => fontconfig-2.14.1-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/fontconfig/fontconfig-2.14.1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
similarity index 99%
rename from media-libs/fontconfig/fontconfig-2.14.1.ebuild
rename to media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
index 0cc0f9683203..1b69d23f740f 100644
--- a/media-libs/fontconfig/fontconfig-2.14.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild
@@ -124,6 +124,7 @@ multilib_src_configure() {
$(meson_feature test tests)
 
-Dcache-build=disabled
+   -Dcache-dir="${EPREFIX}"/var/cache/fontconfig
-Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts
-Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" )
-Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-10-27 Thread Sam James

commit: 2cc16a18373ff815d78b47c004cf7ffdf9c932b6
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 27 23:45:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 27 23:45:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc16a18

media-libs/fontconfig: drop 2.13.93

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest  |   1 -
 media-libs/fontconfig/fontconfig-2.13.93.ebuild | 198 
 2 files changed, 199 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 0ea3b7ff5d5e..cba7bf04f021 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1,2 @@
-DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 
4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73
 SHA512 
ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db

diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
deleted file mode 100644
index 1c12de903df3..
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="https://fontconfig.org/;
-SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
-
-LICENSE="MIT"
-SLOT="1.0"
-[[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-# Test test-bz106632 is known to be broken, see bug #751232
-# and would require several backports. It will be fixed in
-# next version.
-# check-missing-doc is known to be broken, see bug #733608
-# because fontconfig-2.13.1-static_build.patch introduces a
-# function FcStrBuildFilename which is lacking documentation.
-# However, backporting isn't worth it. Will be fixed in
-# next version.
-RESTRICT="test"
-
-BDEPEND="dev-util/gperf
-   >=sys-devel/gettext-0.19.8
-   virtual/pkgconfig
-   doc? (
-   =app-text/docbook-sgml-dtd-3.1*
-   app-text/docbook-sgml-utils[jadetex]
-   )"
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-   >=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-   !elibc_Darwin? ( !elibc_SunOS? ( 
sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
-   elibc_Darwin? ( sys-libs/native-uuid )
-   elibc_SunOS? ( sys-libs/libuuid )
-   virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-PDEPEND="virtual/ttf-fonts"
-# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
-# it is natively usable in BROOT to update ROOT when cross-compiling.
-BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
-RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-   "${FILESDIR}"/${PN}-2.13.93-latin-update.patch # 130466 + make 
liberation default
-
-   # Patches from upstream (can usually be removed with next version bump)
-)
-
-pkg_setup() {
-   DOC_CONTENTS="Please make fontconfig configuration changes using
-   \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will 
be
-   overwritten. If you need to reset your configuration to upstream 
defaults,
-   delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge 
fontconfig."
-}
-
-src_prepare() {
-   default
-   eautoreconf
-
-   # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/272
-   # Please remove on next version bump!
-   if [[ "${PV}" == 2.13.93 ]] ; then
-   local sgmlfile
-   for sgmlfile in doc/*.fncs ; do
-   touch -r ${sgmlfile} ${sgmlfile//.fncs/.sgml} || die
-   done
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2022-10-26 Thread Sam James

commit: bc7faf4170568a07dcb742e474f7c8a0a89eedf2
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 27 04:02:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 27 04:46:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7faf41

media-libs/fontconfig: add 2.14.1

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 .../fontconfig-2.14.1-gperf-meson-debugging.patch  |  23 +++
 .../files/fontconfig-2.14.1-gperf-meson.patch  |  79 
 media-libs/fontconfig/fontconfig-2.14.1.ebuild | 215 +
 4 files changed, 318 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 24cff4b4b53f..0ea3b7ff5d5e 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
+DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 
4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73
 SHA512 
ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
new file mode 100644
index ..fb5e8a14f8b8
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/240
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
+
+From c42eb5b503a44b0b062b041d2e8a0138ce21a0c7 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Thu, 27 Oct 2022 12:32:07 +0900
+Subject: [PATCH] Fix the build issue on meson when -g option is added to
+ c_args
+
+Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
+--- a/src/cutout.py
 b/src/cutout.py
+@@ -24,7 +24,8 @@ if __name__== '__main__':
+ break
+ 
+ cpp = args[1]
+-ret = subprocess.run(cpp + host_cargs + [args[0].input], 
stdout=subprocess.PIPE, check=True)
++cpp_args = [i for i in host_cargs + [args[0].input] if not 
i.startswith('-g')]
++ret = subprocess.run(cpp + cpp_args, stdout=subprocess.PIPE, check=True)
+ 
+ stdout = ret.stdout.decode('utf8')
+ 
+GitLab

diff --git a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch 
b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
new file mode 100644
index ..5565012cad65
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
@@ -0,0 +1,79 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a07e2f1e8ad049772cd24b7daa0a4a168f33bfba.patch
+
+From a07e2f1e8ad049772cd24b7daa0a4a168f33bfba Mon Sep 17 00:00:00 2001
+From: Christopher Degawa 
+Date: Tue, 25 Oct 2022 14:41:05 -0500
+Subject: [PATCH] meson: modify gperf test to remove sh dependency
+
+modifies the gperf test to instead rely on a file input
+rather than piping in using sh, as sh is often not reliable
+on Windows due to paths.
+
+Also changes the if else ladder into a foreach loop.
+
+Signed-off-by: Christopher Degawa 
+--- /dev/null
 b/meson-cc-tests/gperf.txt
+@@ -0,0 +1 @@
++foo,bar
+--- a/meson.build
 b/meson.build
+@@ -315,39 +315,33 @@ if fc_configdir.startswith(fc_baseconfigdir + '/')
+   fonts_conf.set('CONFIGDIR', fc_configdir.split(fc_baseconfigdir + '/')[1])
+ endif
+ 
+-# It will automatically fallback to subproject if not found on system
+-gperf = find_program('gperf')
++gperf = find_program('gperf', required: false)
++gperf_len_type = ''
+ 
+-sh = find_program('sh', required : false)
+-
+-if not sh.found() # host_machine.system() == 'windows' or not sh.found()
+-  # TODO: This is not always correct
+-  if cc.get_id() == 'msvc'
+-gperf_len_type = 'size_t'
+-  else
+-gperf_len_type = 'unsigned'
+-  endif
+-else
++if gperf.found()
+   gperf_test_format = '''
+   #include 
+   const char * in_word_set(const char *, @0@);
+   @1@
+   '''
+-  gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
+-  gperf_snippet = run_command(sh, '-c', 
gperf_snippet_format.format(gperf.full_path()),
+-check: true)
+-  gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-08-30 Thread Sam James

commit: 4bd15b43a94a36344204afb52c3105ce1a9e55a0
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 30 18:39:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 30 19:06:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd15b43

media-libs/fontconfig: limit multilib features

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.93.ebuild   | 4 ++--
 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index deaa7fcd009a..1c12de903df3 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -98,9 +98,9 @@ multilib_src_configure() {
esac
 
local myeconfargs=(
-   $(use_enable doc docbook)
+   $(multilib_native_use_enable doc docbook)
$(use_enable static-libs static)
-   --enable-docs
+   $(multilib_native_enable docs)
--localstatedir="${EPREFIX}"/var
--with-default-fonts="${EPREFIX}"/usr/share/fonts
--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 49b2629b5331..96da5cf7b37c 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -104,11 +104,11 @@ multilib_src_configure() {
esac
 
local myeconfargs=(
-   $(use_enable doc docbook)
+   $(multilib_native_use_enable doc docbook)
$(use_enable static-libs static)
 
# man pages. We split out the docbook parts into its own flag.
-   --enable-docs
+   $(multilib_native_enable docs)
# We handle this ourselves.
--disable-cache-build
# See comment above *DEPEND. We use Expat instead.

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/files/, media-libs/fontconfig/

2022-08-17 Thread Matt Turner

commit: 08eb7f258111a6fbe509078306fec729e92d37be
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Aug 18 02:45:51 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Aug 18 02:53:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08eb7f25

media-libs/fontconfig: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/fontconfig/Manifest |   1 -
 .../files/fontconfig-2.12.3-latin-update.patch |  68 -
 .../files/fontconfig-2.13.1-proper_homedir.patch   | 313 -
 ...1-revert_delete_.uuid_for_empty_directory.patch |  43 ---
 .../files/fontconfig-2.13.1-static_build.patch |  91 --
 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild  | 182 
 6 files changed, 698 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index a42cf3ac9874..24cff4b4b53f 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1,2 @@
-DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc

diff --git a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch 
b/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch
deleted file mode 100644
index 397781e87acd..
--- a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch
+++ /dev/null
@@ -1,68 +0,0 @@
 fontconfig-2.12.3/conf.d/60-latin.conf
-+++ fontconfig-2.12.3/conf.d/60-latin.conf
-@@ -4,47 +4,50 @@
-   
-   serif
-   
--  Bitstream Vera Serif
-+  Liberation Serif
-   DejaVu Serif
-   Times New Roman
--  Thorndale AMT
-   Luxi Serif
-   Nimbus Roman No9 L
-   Nimbus Roman
-   Times
-+  Thorndale AMT
-+  Bitstream Vera Serif
-   
-   
-   
-   sans-serif
-   
--  Bitstream Vera Sans
-+  Liberation Sans
-   DejaVu Sans
--  Verdana
-   Arial
--  Albany AMT
-   Luxi Sans
-   Nimbus Sans L
-   Nimbus Sans
-   Helvetica
-   Lucida Sans Unicode
-   BPG Glaho International 
-+  Verdana
-   Tahoma 
-+  Albany AMT
-+  Bitstream Vera Sans
-   
-   
-   
-   monospace
-   
--  Bitstream Vera Sans Mono
-+  Liberation Mono
-   DejaVu Sans Mono
-   Inconsolata
-   Andale Mono
-   Courier New
--  Cumberland AMT
-   Luxi Mono
-   Nimbus Mono L
-   Nimbus Mono
-   Nimbus Mono PS
-   Courier
-+  Cumberland AMT
-+  Bitstream Vera Sans Mono
-   
-   
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-28 Thread Arthur Zamarin

commit: de3ceea123412679ba48bf8bc7f95314e329ce7f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jun 28 19:27:07 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun 28 19:27:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3ceea1

media-libs/fontconfig: Stabilize 2.14.0-r1 arm, #854384

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 69ea498c3ba3..49b2629b5331 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-28 Thread Arthur Zamarin

commit: 6fb4e8f374c656191cad949147e95cb5f338543e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jun 28 19:08:19 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun 28 19:08:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb4e8f3

media-libs/fontconfig: Stabilize 2.14.0-r1 sparc, #854384

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 8f9c8f70e887..69ea498c3ba3 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-27 Thread Agostino Sarubbo

commit: c6741d0db363c2a6660e76caf6454ffb57a67bc4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 27 07:37:30 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 27 07:37:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6741d0d

media-libs/fontconfig: x86 stable wrt bug #854384

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index cf91abba126d..8f9c8f70e887 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-27 Thread Agostino Sarubbo

commit: 16ba48dc758bf4e9b9581fd0b2751be18259f0d6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 27 07:33:20 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 27 07:33:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ba48dc

media-libs/fontconfig: amd64 stable wrt bug #854384

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 6b42c3a9d2ab..cf91abba126d 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-26 Thread Arthur Zamarin

commit: d3b68401c09af5214fef3c98f360be448f6de707
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 26 17:43:37 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 26 17:43:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b68401

media-libs/fontconfig: Stabilize 2.14.0-r1 hppa, #854384

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 4003ab1a0fb0..6b42c3a9d2ab 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-26 Thread Arthur Zamarin

commit: 1cf721a06bd9b8bf538c0224479b3da379c12c89
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 26 17:24:21 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 26 17:24:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf721a0

media-libs/fontconfig: Stabilize 2.14.0-r1 arm64, #854384

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 221e0db34dd8..4003ab1a0fb0 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-26 Thread Arthur Zamarin

commit: 275e9c163020a533c1b1091b8face6a3ab458525
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 26 17:19:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 26 17:19:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275e9c16

media-libs/fontconfig: Stabilize 2.14.0-r1 ppc, #854384

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index c679fb307f50..221e0db34dd8 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-06-26 Thread Arthur Zamarin

commit: eec0f395df20f58056500bff759ad379e61b6b36
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 26 17:18:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 26 17:18:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec0f395

media-libs/fontconfig: Stabilize 2.14.0-r1 ppc64, #854384

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index e476d074801d..c679fb307f50 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-05-06 Thread WANG Xuerui

commit: a6ed855eb818b61c0b5a1b6806595ad13059db9d
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat May  7 04:05:11 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat May  7 04:27:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ed855e

media-libs/fontconfig: keyword 2.14.0-r1 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 569d95035ed8..e476d074801d 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz;
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-04-22 Thread Sam James

commit: ae4f6dc77756ea346a2578ae15316d07849ac4ac
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 22 17:41:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 22 17:43:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae4f6dc7

media-libs/fontconfig: cleanup ROOT test

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 media-libs/fontconfig/fontconfig-2.13.93.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index ddf062068696..b00c1b232b14 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -170,7 +170,7 @@ pkg_postinst() {
 
readme.gentoo_print_elog
 
-   if [[ ${ROOT} == "" ]]; then
+   if [[ -z ${ROOT} ]]; then
multilib_pkg_postinst() {
ebegin "Creating global font cache for ${ABI}"
"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf

diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index a47819b7d743..deaa7fcd009a 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -186,7 +186,7 @@ pkg_postinst() {
 
readme.gentoo_print_elog
 
-   if [[ ${ROOT} == "" ]] ; then
+   if [[ -z ${ROOT} ]] ; then
multilib_pkg_postinst() {
ebegin "Creating global font cache for ${ABI}"
"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-04-01 Thread Sam James

commit: 65773d96c6f753ab95a0ede710e56ccb8ad0cf3e
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  2 04:04:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  2 04:04:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65773d96

media-libs/fontconfig: drop /var/cache too

Not sure why I didn't see this earlier?

Closes: https://bugs.gentoo.org/587492
Signed-off-by: Sam James  gentoo.org>

 .../{fontconfig-2.14.0.ebuild => fontconfig-2.14.0-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
similarity index 99%
rename from media-libs/fontconfig/fontconfig-2.14.0.ebuild
rename to media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 3a7bd142a1aa..569d95035ed8 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -181,7 +181,7 @@ multilib_src_install_all() {
 
# We allow the cache generation to make this later
# bug #587492
-   rm -r "${ED}"/var/cache/fontconfig || die
+   rm -r "${ED}"/var/cache/ || die
 }
 
 pkg_preinst() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-04-01 Thread Sam James

commit: b72f98ce17892d6cfd4b215cb990e1c03c6854e8
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  2 03:14:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  2 03:14:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72f98ce

media-libs/fontconfig: simplify

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0.ebuild
index 9dd90e46ee33..3a7bd142a1aa 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0.ebuild
@@ -50,7 +50,7 @@ BDEPEND="dev-util/gperf
 PDEPEND="virtual/ttf-fonts"
 # We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
 # when cross-compiling.
-IDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
 
 PATCHES=(
# bug #310157

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-04-01 Thread Sam James

commit: 0cb5ae3bce3829f502279f59e5fb95a37f1b1965
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  2 02:32:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  2 03:07:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb5ae3b

media-libs/fontconfig: use IDEPEND in 2.14.0

Bug: https://github.com/gentoo/gentoo/pull/21503
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.14.0.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.14.0.ebuild 
b/media-libs/fontconfig/fontconfig-2.14.0.ebuild
index 64af2b159179..9dd90e46ee33 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0.ebuild
@@ -47,8 +47,10 @@ BDEPEND="dev-util/gperf
=app-text/docbook-sgml-dtd-3.1*
app-text/docbook-sgml-utils[jadetex]
)"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-   virtual/ttf-fonts"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
 
 PATCHES=(
# bug #310157

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-04-01 Thread Sam James

commit: c1d90c29867fe33c76c7d4705da7740b1522cc87
Author: David Michael  gmail  com>
AuthorDate: Thu Jul  1 19:23:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  2 03:07:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d90c29

media-libs/fontconfig: install the eselect module in BROOT

This updates the dependencies to put eselect-fontconfig in both
BDEPEND and RDEPEND to approximate IDEPEND as closely as possible.
(Currently autotools.eclass is blocking EAPI 8 everywhere.)  This
allows using "eselect fontconfig" commands to configure $ROOT when
installing a staging root.

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21503
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.93.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index 72b70d969b41..a47819b7d743 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -41,8 +41,11 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
elibc_SunOS? ( sys-libs/libuuid )
virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-   virtual/ttf-fonts"
+PDEPEND="virtual/ttf-fonts"
+# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
+# it is natively usable in BROOT to update ROOT when cross-compiling.
+BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
+RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2022-04-01 Thread Sam James

commit: 7ad7b980f0cc6497bed201469ce0d5949260d558
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  1 23:20:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  2 03:07:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad7b980

media-libs/fontconfig: add 2.14.0

- Clean up ebuild
- Rebased patches (and submitted our docbook one upstream)
- Add json-c test-only dependency
- Scrub patches
- Drop global scope usage from 2.13.93 while at it (fixes previous cleanup)
- Rely on cache generation to create /var/cache/fontconfig

Closes: https://bugs.gentoo.org/587492
Closes: https://bugs.gentoo.org/710184
Closes: https://bugs.gentoo.org/785100
Fixes: 35ac56d0683de8ad8ab4316b109ef77a88a77300
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 .../files/fontconfig-2.10.2-docbook.patch  |   6 +-
 .../files/fontconfig-2.13.1-proper_homedir.patch   |  10 --
 .../files/fontconfig-2.13.1-static_build.patch |  10 --
 .../files/fontconfig-2.14.0-docbook.patch  |  29 +
 .../files/fontconfig-2.14.0-latin-update.patch |  66 ++
 .../fontconfig-2.14.0-skip-bubblewrap-tests.patch  |  14 ++
 media-libs/fontconfig/fontconfig-2.13.93.ebuild|   2 -
 ...fig-2.13.93.ebuild => fontconfig-2.14.0.ebuild} | 141 -
 9 files changed, 196 insertions(+), 83 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 21aef1e5b150..a42cf3ac9874 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
+DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 
880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff
 SHA512 
a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc

diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch 
b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
index 33d6549c8147..94bea6327148 100644
--- a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
@@ -1,6 +1,6 @@
-diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac 
fontconfig-2.10.2/configure.ac
 fontconfig-2.10.2-orig/configure.ac2012-11-26 09:21:13.0 
+0100
-+++ fontconfig-2.10.2/configure.ac 2013-01-05 15:40:54.541682239 +0100
+https://bugs.gentoo.org/310157
+--- fontconfig-2.10.2-orig/configure.ac
 fontconfig-2.10.2/configure.ac
 @@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
  # Let people not build/install docs if they don't have docbook
  #

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
index 19aee94ba988..71c27f56f644 100644
--- a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] Fix the issue that '~' wasn't extracted to the 
proper homedir
 this behavior was broken by d1f48f11. this change fixes it back to the correct 
behavior.
 
 https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
-diff --git a/src/fccfg.c b/src/fccfg.c
-index d7c48e8..4a53581 100644
 --- a/src/fccfg.c
 +++ b/src/fccfg.c
 @@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
@@ -40,8 +38,6 @@ index d7c48e8..4a53581 100644
  return file;
  }
  
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 79bcede..9f4d48a 100644
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
 @@ -91,6 +91,22 @@ test_bz106632_CFLAGS =  
\
@@ -67,9 +63,6 @@ index 79bcede..9f4d48a 100644
  EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) 
out.expected-long-family-names out.expected-no-long-family-names
  
  CLEANFILES=out out1 out2 fonts.conf out.expected
-diff --git a/test/test-issue110.c b/test/test-issue110.c
-new file mode 100644
-index 000..28a3bd2
 --- /dev/null
 +++ b/test/test-issue110.c
 @@ -0,0 +1,245 @@
@@ -318,6 +311,3 @@ index 000..28a3bd2
 +return retval;
 +}
 +
--- 
-2.18.0
-

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2022-03-10 Thread Sam James

commit: 35ac56d0683de8ad8ab4316b109ef77a88a77300
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 10 22:50:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 10 22:50:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ac56d0

media-libs/fontconfig: fix commands in global scope

Closes: https://bugs.gentoo.org/788070
Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 6 +++---
 media-libs/fontconfig/fontconfig-2.13.93.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 6b51d5adc5b4..ddf062068696 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,8 +54,6 @@ PATCHES=(
"${FILESDIR}"/${P}-proper_homedir.patch
 )
 
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
 pkg_setup() {
DOC_CONTENTS="Please make fontconfig configuration changes using
\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will 
be
@@ -102,6 +100,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
+   MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
default
 
# avoid calling this multiple times, bug #459210

diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index 329ec7d1678e..a88e04398db3 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -110,6 +110,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
+   MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
default
 
# avoid calling this multiple times, bug #459210

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig-infinality/, profiles/, ...

2021-04-25 Thread Andreas Sturmlechner

commit: ad786546291e4c835181777e08e5529dfa109aa9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 25 22:37:52 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 25 22:46:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad786546

media-libs/fontconfig-infinality: Remove last-rited package

Bug: https://bugs.gentoo.org/550592
Bug: https://bugs.gentoo.org/768303
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/fontconfig-infinality/Manifest  |  2 -
 media-libs/fontconfig-infinality/files/Xresources  |  9 
 .../fontconfig-infinality-20130404.ebuild  | 56 --
 media-libs/fontconfig-infinality/metadata.xml  | 11 -
 profiles/package.mask  |  1 -
 5 files changed, 79 deletions(-)

diff --git a/media-libs/fontconfig-infinality/Manifest 
b/media-libs/fontconfig-infinality/Manifest
deleted file mode 100644
index cd42f5813cb..000
--- a/media-libs/fontconfig-infinality/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST fontconfig-infinality-20130404.tar.xz 23344 BLAKE2B 
8531a8cab3ab37c7d8c23c992ad9ecb3473e92918569c1f77b0345be61d9f0bec968447bdd63898ca6197f210a5c79117433a1aa9e7eb4ff4f7b479a4817476a
 SHA512 
742206795523509a7d195f194394ef3f67a9022b46f194ea369f7388c0c59842d29573fd2719f616dcc2378a4b527b93cdd3cf787b7a1728c875c7e1aa5a5417
-DIST fontconfig-nyx-2.tar.xz 1376 BLAKE2B 
35853d469bc1e38d7ccbc0346e26e8c1d885db86d4b81f7c341b64a2914fc0b8fdc5f7e449800e8b305163e7dca1bc60f7ed912674f5a4acd2e6e79cdb0c939b
 SHA512 
7863c41f67b02a37d9d3b438bcd1d6ece2bf42310ea61090f4d6384e22893a4ffbb2f7bc349511f40ba4570784f14e5656506de6b7e60f6da9c9eaba252beb1d

diff --git a/media-libs/fontconfig-infinality/files/Xresources 
b/media-libs/fontconfig-infinality/files/Xresources
deleted file mode 100644
index c65472e2400..000
--- a/media-libs/fontconfig-infinality/files/Xresources
+++ /dev/null
@@ -1,9 +0,0 @@
-! basic settings for infinality
-
-Xft.antialias:  1
-Xft.autohint:   0
-Xft.dpi:96
-Xft.hinting:1
-Xft.hintstyle:  hintfull
-Xft.lcdfilter:  lcddefault
-Xft.rgba:   rgb

diff --git 
a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild 
b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
deleted file mode 100644
index 044748c7606..000
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo
-
-DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
-HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/;
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
-   nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-2.tar.xz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+nyx"
-
-DEPEND=""
-RDEPEND="app-eselect/eselect-fontconfig
-   app-eselect/eselect-infinality
-   app-eselect/eselect-lcdfilter"
-PDEPEND="media-libs/freetype:2[infinality]
-   >=x11-libs/libXft-2.3.0
-   nyx? ( media-fonts/croscorefonts )"
-
-src_configure() {
-   :
-}
-
-src_compile() {
-   :
-}
-
-src_install() {
-   DOC_CONTENTS="Use eselect fontconfig enable 52-infinality.conf to 
enable the
-   configuration. Then use eselect infinality to set your fontconfig style 
and
-   eselect lcdfilter to set freetype variables. If you run into trouble 
with
-   applications not being able to find Type-1 fonts, then comment out the
-   relevant lines in ${EPREFIX}/etc/fonts/infinality/infinality.conf"
-
-   dodoc infinality/{CHANGELOG,CHANGELOG.pre_git,README}
-   readme.gentoo_create_doc
-
-   insinto /etc/fonts/conf.avail
-   doins conf.avail/52-infinality.conf
-
-   insinto /etc/fonts/infinality
-   doins -r infinality/{conf.src,styles.conf.avail,infinality.conf}
-
-   insinto /etc/X11/
-   doins "${FILESDIR}"/Xresources
-
-   if use nyx ; then
-   insinto /etc/fonts/infinality/styles.conf.avail
-   doins -r "${WORKDIR}"/nyx
-   fi
-}

diff --git a/media-libs/fontconfig-infinality/metadata.xml 
b/media-libs/fontconfig-infinality/metadata.xml
deleted file mode 100644
index 0b45bdc8b86..000
--- a/media-libs/fontconfig-infinality/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-fo...@gentoo.org
-Fonts
-  
-  
-Additional style using croscorefonts
-  
-

diff --git a/profiles/package.mask b/profiles/package.mask
index fea7622ee37..30c5615959c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -358,7 +358,6 @@ app-editors/beaver
 app-eselect/eselect-infinality
 app-eselect/eselect-lcdfilter
 media-libs/fontconfig-ultimate
-media-libs/fontconfig-infinality
 
 # Jonas Stein  (2021-03-27)
 # Upstream is gone. Open

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2021-01-13 Thread Lars Wendler

commit: b0f701a775a9f787c59018f388772b3fc31b3da6
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 11:43:15 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 13:18:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f701a7

media-libs/fontconfig: Removed old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/fontconfig/Manifest |   2 -
 .../fontconfig-2.13.0-add-missing-lintl.patch  |  34 
 .../files/fontconfig-2.13.0-locale.patch   | 177 -
 .../fontconfig/files/fontconfig-2.13.0-names.patch |  93 ---
 media-libs/fontconfig/fontconfig-2.12.6.ebuild | 160 ---
 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild  | 169 
 6 files changed, 635 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 684dfc449fd..86eb4310757 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1 @@
-DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 
48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f
 SHA512 
2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B 
bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a
 SHA512 
f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
deleted file mode 100644
index 6bea02b1fca..000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH 
-Date: Fri, 9 Mar 2018 11:55:43 +0900
-Subject: Fix the build issue again on MinGW with enabling nls
-

- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1ff065b..2111ce0 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -82,7 +82,7 @@ AM_CPPFLAGS =
\
-   -DFC_CACHEDIR='"$(FC_CACHEDIR)"'\
-   -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'  \
-   -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
--LDADD  = $(INTLLIBS)
-+LDADD  = $(LIBINTL)
- 
- EXTRA_DIST += makealias
- 
-@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
- libfontconfig_la_LDFLAGS =\
-   -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
- 
--libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) 
$(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
-+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) 
$(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
- 
- libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
- 
--- 
-cgit v1.1
-

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
deleted file mode 100644
index 002e493a409..000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-https://bugs.gentoo.org/650332
-Do not set locale in the library.
-Patch from upstream.
-
 a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -41,6 +41,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #if defined (_WIN32)
- #define STRICT
-@@ -302,6 +303,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
- int   c;
- 
-+setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
- while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1)
- #else
 a/fc-cat/fc-cat.c
-+++ b/fc-cat/fc-cat.c
-@@ -40,6 +40,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef ENABLE_NLS
- #include 
-@@ -271,6 +272,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
- int   c;
- 
-+setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
- while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1)
- #else
 a/fc-conflist/fc-conflist.c
-+++ b/fc-conflist/fc-conflist.c
-@@ -38,6 +38,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef ENABLE_NLS
- #include 
-@@ -102,6 +103,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
- int   c;
- 
-+setlocale

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2021-01-13 Thread Lars Wendler

commit: 11a04d7749c8f49b6bbc6683b00ec3be08e48dd9
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 13 12:43:28 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 13 13:18:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a04d77

media-libs/fontconfig: Bump to version 2.13.93

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/fontconfig/Manifest |   1 +
 .../files/fontconfig-2.13.93-latin-update.patch|  62 +++
 media-libs/fontconfig/fontconfig-2.13.93.ebuild| 195 +
 3 files changed, 258 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 86eb4310757..21aef1e5b15 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1 +1,2 @@
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
+DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 
2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a
 SHA512 
1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
new file mode 100644
index 000..910f0c7ef56
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
@@ -0,0 +1,62 @@
+--- fontconfig-2.13.93/conf.d/60-latin.conf
 fontconfig-2.13.93/conf.d/60-latin.conf
+@@ -5,44 +5,47 @@
+   
+   serif
+   
++  Liberation Serif
+   DejaVu Serif
+   Times New Roman
+-  Thorndale AMT
+   Luxi Serif
+   Nimbus Roman No9 L
+   Nimbus Roman
+   Times
++  Thorndale AMT
+   
+   
+   
+   sans-serif
+   
++  Liberation Sans
+   DejaVu Sans
+-  Verdana
+   Arial
+-  Albany AMT
+   Luxi Sans
+   Nimbus Sans L
+   Nimbus Sans
+   Helvetica
+   Lucida Sans Unicode
+   BPG Glaho International 
++  Verdana
+   Tahoma 
++  Albany AMT
+   
+   
+   
+   monospace
+   
++  Liberation Mono
+   DejaVu Sans Mono
+   Inconsolata
+   Andale Mono
+   Courier New
+-  Cumberland AMT
+   Luxi Mono
+   Nimbus Mono L
+   Nimbus Mono
+   Nimbus Mono PS
+   Courier
++  Cumberland AMT
+   
+   
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-12-27 Thread Fabian Groffen

commit: 579cd61047e36ca43884d7055d4432c125b70e4e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 17:42:46 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 17:46:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=579cd610

media-libs/fontconfig: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 media-libs/fontconfig/fontconfig-2.12.6.ebuild| 2 +-
 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild 
b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 7ee4930332c..82f8ca27e28 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 552899d93ac..53f7689e891 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig-ultimate/

2020-12-01 Thread Aaron Bauman

commit: f375a2b661aeeb7566b32cfb7f4ca3bed4805525
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Dec  1 23:28:24 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Dec  2 00:31:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f375a2b6

media-libs/fontconfig-ultimate: drop old

Signed-off-by: Aaron Bauman  gentoo.org>

 media-libs/fontconfig-ultimate/Manifest|   1 -
 .../fontconfig-ultimate-2015.04.ebuild | 110 -
 2 files changed, 111 deletions(-)

diff --git a/media-libs/fontconfig-ultimate/Manifest 
b/media-libs/fontconfig-ultimate/Manifest
index 913db010df2..b968e8cd486 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,2 +1 @@
-DIST fontconfig-ultimate-2015.04.tar.gz 455899 BLAKE2B 
5b9395da2c9091965ddbd65d536932a925c81d2a872f790bf946b2dbb7eea0ebae3a258f88b3628a67b26022cb489aa4a4cdc98cfb4d67b3f1d83907c9f21e5b
 SHA512 
cdf11c298c9746c720dd6a4e1d361aa16244fdd46630fa00fea03d6d57956b6cee41b3ea439c84d81756a11d63768e4672851c9692a87944b6688a9763a06096
 DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 
291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e
 SHA512 
2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9

diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild 
b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
deleted file mode 100644
index 0a217240ac4..000
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo versionator
-
-MY_PV=$(replace_all_version_separators "-")
-DESCRIPTION="A set of font rendering and replacement rules for 
fontconfig-infinality"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-eselect/eselect-infinality
-   app-eselect/eselect-lcdfilter
-   media-libs/fontconfig-infinality
-   media-libs/freetype:2[infinality]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DISABLE_AUTOFORMATTING="1"
-DOC_CONTENTS="1. Disable all rules but 52-infinality.conf using eselect 
fontconfig
-2. Enable one of the \"ultimate\" presets using eselect infinality
-3. Select ultimate lcdfilter settings using eselect lcdfilter"
-
-BLACKLIST="43-wqy-zenhei-sharp.conf"
-
-src_prepare() {
-   pushd fontconfig_patches/fonts-settings || die
-   rm ${BLACKLIST} || die
-   popd
-
-   # Generate lcdfilter config
-   echo -e "# FONTCONFIG ULTIMATE STYLE 
#\n" \
-   > "${T}"/ultimate || die
-
-   local infinality_style
-   infinality_style=$(sed --quiet \
-   -e 's/^USE_STYLE="*\([1-9]\)"*/\1/p' \
-   freetype/infinality-settings.sh) || die
-
-   if ! [ -n "$infinality_style" ]; then
-   ewarn "Missing USE_STYLE variable in package source."
-   infinality_style=1
-   fi
-
-   sed --quiet \
-   -e '/INFINALITY_FT_FILTER_PARAMS=/p' \
-   freetype/infinality-settings.sh \
-   | sed --quiet \
-   -e "${infinality_style} s/[ \t]*export[ \t]*//p" \
-   >> "${T}"/ultimate
-   assert
-
-   sed --quiet \
-   -e '/INFINALITY_FT_FILTER_PARAMS/ d' \
-   -e 's/^[ \t]*export[ \t]*INFINALITY_FT/INFINALITY_FT/p' \
-   freetype/infinality-settings.sh \
-   >> "${T}"/ultimate || die
-}
-
-src_install() {
-   insinto /etc/fonts/infinality/conf.src.ultimate
-   doins conf.d.infinality/*.conf
-   doins fontconfig_patches/{ms,free,combi}/*.conf
-
-   # Cut a list of default .conf files out of Makefile.am
-   local default_configs config fonts_settings
-   default_configs=$(sed --quiet \
-   -e ':again' \
-   -e '/\\$/ N' \
-   -e 's/\\\n/ /' \
-   -e 't again' \
-   -e 's/^CONF_LINKS =//p' \
-   conf.d.infinality/Makefile.am) || die
-
-   # Install per-font settings
-   pushd fontconfig_patches/fonts-settings || die
-   doins *.conf
-   fonts_settings=$(echo *.conf)
-   popd
-
-   # Install font presets
-   pushd fontconfig_patches/ms || die
-   for config in ${default_configs} ${fonts_settings} *.conf; do
-   dosym ../../conf.src.ultimate/"${config}" \
-   
/etc/fonts/infinality/styles.conf.avail/ultimate-ms/"${config}"
-   done
-   popd
-   pushd fontconfig_patches/free || die
-   for config in ${default_configs} ${fonts_settings}

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-11-19 Thread Agostino Sarubbo

commit: ec41b07d2c7c78ee66d76c7ec4bebfbc8bee04c8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 19 11:17:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 19 11:17:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec41b07d

media-libs/fontconfig: ppc64 stable wrt bug #733558

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index e9c9981d7d6..70a15b893a0 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-11-17 Thread Agostino Sarubbo

commit: 00b77181693f8696b1b98cf12017855fd81f74e7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 18 06:55:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 18 06:55:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b77181

media-libs/fontconfig: ppc stable wrt bug #733558

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 67e8256b5fc..e9c9981d7d6 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-11-17 Thread Agostino Sarubbo

commit: 2a3aecfc70dfa06636f6bca0e6ea79980496cd2e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 19:04:02 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 19:04:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3aecfc

media-libs/fontconfig: s390 stable wrt bug #733558

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index d9f8fcff7f5..67e8256b5fc 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-31 Thread Mikle Kolyada

commit: 88d02efdd132cac214639d5d635927c0d62da81f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 31 11:10:03 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 31 11:10:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d02efd

media-libs/fontconfig: Stabilize 2.13.1-r2 amd64, #733558

Signed-off-by: Mikle Kolyada  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 778a4b6b7db..d9f8fcff7f5 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-29 Thread Sergei Trofimovich

commit: 99cd445f0ba04aa2c84ea4d0cbbbf7eaee79f9f7
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 29 15:16:48 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 29 22:06:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99cd445f

media-libs/fontconfig: stable 2.13.1-r2 for hppa, bug #733558

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index e0f13287448..778a4b6b7db 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-29 Thread Sergei Trofimovich

commit: 09d8899e7eb2a27decce7577ee64e823f5fbcbda
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 29 15:10:11 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 29 22:05:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d8899e

media-libs/fontconfig: stable 2.13.1-r2 for sparc, bug #733558

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 9f41d16c050..e0f13287448 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-28 Thread Thomas Deutschmann

commit: 59819908c3f48c417c0b30c89dad441d8cfb1937
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 28 19:37:55 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 28 19:38:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59819908

media-libs/fontconfig: RESTRICT=test

- Test doc/check-missing-doc [Bug 733608] is failing because
  fontconfig-2.13.1-static_build.patch introduces a new function
  named "FcStrBuildFilename" but doesn't add required documentation
  the test is checking for.

- Test test-bz106632 [Bug 751232] is a known test failure. Backport
  would require 4 patches (5771c48, c44fda2, 3a45b8e, a8c4fc5).

Restricting tests for now because backporting those fixes for
tests only isn't worth it and everything will be fixed in next
release.

Closes: https://bugs.gentoo.org/733608
Closes: https://bugs.gentoo.org/751232
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index ac09fa689f0..1e359fc3dea 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -15,6 +15,16 @@ SLOT="1.0"
 KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
+# Test test-bz106632 is known to be broken, see bug #751232
+# and would require several backports. It will be fixed in
+# next version.
+# check-missing-doc is known to be broken, see bug #733608
+# because fontconfig-2.13.1-static_build.patch introduces a
+# function FcStrBuildFilename which is lacking documentation.
+# However, backporting isn't worth it. Will be fixed in
+# next version.
+RESTRICT="test"
+
 BDEPEND="dev-util/gperf
>=sys-devel/gettext-0.19.8
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-28 Thread Thomas Deutschmann

commit: cd56cd5a13ffabbb703d240aa1622463b739a219
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 28 19:38:48 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 28 19:38:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd56cd5a

media-libs/fontconfig: x86 stable (bug #733558)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 1e359fc3dea..9f41d16c050 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-20 Thread Sam James

commit: 292f2e74b0b45d1ad26840ccdd47dfa31e4fd564
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 09:49:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 09:49:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292f2e74

media-libs/fontconfig: Stabilize 2.13.1-r2 arm64, #733558

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 6d4dcd6b432..ac09fa689f0 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 BDEPEND="dev-util/gperf

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2020-10-20 Thread Sam James

commit: 1e4dcaba4cab3c5eeedce7568e9dbaed5d9a7e2f
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 09:45:06 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 09:45:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4dcaba

media-libs/fontconfig: Stabilize 2.13.1-r2 arm, #733558

Signed-off-by: Sam James  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 8ccc0a90994..6d4dcd6b432 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 IUSE="doc static-libs"
 
 BDEPEND="dev-util/gperf

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, net-libs/rest/, dev-libs/libuv/, media-video/mjpegtools/, ...

2020-06-13 Thread Mike Gilbert

commit: 5008bbcb72fc5e5889b0ab9f94aae16fc3698a57
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun May 31 02:42:45 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 13 16:58:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5008bbcb

Remove MULTILIB_USEDEP from all virtual/pkgconfig dependencies

Bug: https://bugs.gentoo.org/723112
Signed-off-by: Mike Gilbert  gentoo.org>

 app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild   | 2 +-
 app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild   | 2 +-
 app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild | 2 +-
 app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild | 2 +-
 app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild | 2 +-
 app-crypt/heimdal/heimdal-7.5.0.ebuild| 2 +-
 app-crypt/heimdal/heimdal-7.6.0.ebuild| 2 +-
 app-crypt/heimdal/heimdal-7.7.0-r1.ebuild | 2 +-
 app-crypt/libsecret/libsecret-0.18.8.ebuild   | 2 +-
 app-crypt/libsecret/libsecret-0.20.2.ebuild   | 2 +-
 app-crypt/libsecret/libsecret-0.20.3.ebuild   | 2 +-
 .../gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild| 2 +-
 .../gallium-nine-standalone/gallium-nine-standalone-.ebuild   | 2 +-
 dev-cpp/gtkmm/gtkmm-2.24.5.ebuild | 2 +-
 dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild| 2 +-
 dev-cpp/pangomm/pangomm-2.42.0.ebuild | 2 +-
 dev-cpp/pangomm/pangomm-2.42.1.ebuild | 2 +-
 dev-libs/atk/atk-2.34.1.ebuild| 2 +-
 dev-libs/atk/atk-2.36.0.ebuild| 2 +-
 dev-libs/fribidi/fribidi-1.0.9.ebuild | 2 +-
 dev-libs/fstrm/fstrm-0.3.0.ebuild | 2 +-
 dev-libs/glib/glib-2.62.6.ebuild  | 2 +-
 dev-libs/glib/glib-2.64.3.ebuild  | 2 +-
 dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild| 2 +-
 dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild  | 2 +-
 dev-libs/json-glib/json-glib-1.4.4.ebuild | 2 +-
 dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild  | 2 +-
 dev-libs/libcroco/libcroco-0.6.13.ebuild  | 2 +-
 dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild| 2 +-
 dev-libs/libevdev/libevdev-1.9.0.ebuild   | 2 +-
 dev-libs/libevdev/libevdev-.ebuild| 2 +-
 dev-libs/libgudev/libgudev-233-r1.ebuild  | 2 +-
 dev-libs/libgusb/libgusb-0.3.3.ebuild | 2 +-
 dev-libs/libgusb/libgusb-0.3.4.ebuild | 2 +-
 dev-libs/libindicator/libindicator-12.10.1-r201.ebuild| 2 +-
 dev-libs/libindicator/libindicator-12.10.1-r301.ebuild| 2 +-
 dev-libs/libuv/libuv-1.35.0.ebuild| 2 +-
 dev-libs/libuv/libuv-1.37.0.ebuild| 2 +-
 dev-libs/libuv/libuv-1.38.0-r1.ebuild | 2 +-
 dev-libs/libuv/libuv-.ebuild  | 2 +-
 dev-libs/nss/nss-3.51.1.ebuild| 2 +-
 dev-libs/nss/nss-3.51.ebuild  | 2 +-
 dev-libs/nss/nss-3.52.1-r1.ebuild | 2 +-
 dev-libs/nss/nss-3.52.ebuild  | 2 +-
 dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild   | 2 +-
 dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild | 2 +-
 dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild | 2 +-
 dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild | 2 +-
 dev-python/subunit/subunit-1.2.0-r1.ebuild| 2 +-
 dev-python/subunit/subunit-1.4.0.ebuild   | 2 +-
 dev-util/umockdev/umockdev-0.11.3.ebuild  | 2 +-
 dev-util/umockdev/umockdev-0.12.1.ebuild  | 2 +-
 eclass/gstreamer.eclass   | 2 +-
 eclass/xorg-2.eclass  | 8 ++--
 eclass/xorg-3.eclass  | 8 ++--
 gnome-base/gconf/gconf-3.2.6-r4.ebuild| 2 +-
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild   | 2 +-
 gnome-base/libglade/libglade-2.6.4-r2.ebuild  | 2 +-
 gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild | 2 +-
 gnome-base/librsvg/librsvg-2.40.21.ebuild | 2 +-
 media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild| 2 +-

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-11-12 Thread Sergei Trofimovich

commit: cb53ef585b367a03f3fcbcf39f99fe24316af147
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Nov 12 19:18:35 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 12 20:26:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb53ef58

media-libs/fontconfig: stable 2.13.0-r4 for hppa, bug #664108

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 560514f741c..1f597094e17 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-10-17 Thread Mikle Kolyada

commit: 379076ddac13e5cff98c17021e0c12e621c3b038
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Oct 17 11:18:16 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Oct 17 11:18:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379076dd

media-libs/fontconfig: s390 stable wrt bug #664108

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 490263d1f59..560514f741c 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig-ultimate/

2018-09-30 Thread Jeroen Roovers

commit: 0c820df590dd2e17bd1fd9bff6dcf40d654cbe45
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Sep 30 14:21:54 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Sep 30 14:22:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c820df5

media-libs/fontconfig-ultimate: Fix HOMEPAGE

Original homepage showed "explicit" content, so reset it to Gentoo's
default. Thanks to grknight for bringing up the problem on IRC.

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild| 4 ++--
 media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild 
b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
index 1ae06828462..fb67d6643e1 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_all_version_separators "-")
 DESCRIPTION="A set of font rendering and replacement rules for 
fontconfig-infinality"
-HOMEPAGE="http://bohoomil.com/;
+HOMEPAGE="https://www.gentoo.org/;
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"

diff --git 
a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild 
b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
index 1ae06828462..fb67d6643e1 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_all_version_separators "-")
 DESCRIPTION="A set of font rendering and replacement rules for 
fontconfig-infinality"
-HOMEPAGE="http://bohoomil.com/;
+HOMEPAGE="https://www.gentoo.org/;
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-19 Thread Markus Meier

commit: 80031651b5fe22d075e13fd6dc61a12592b00b7a
Author: Markus Meier  gentoo  org>
AuthorDate: Wed Sep 19 16:59:09 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed Sep 19 17:40:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80031651

media-libs/fontconfig: arm stable, bug #664108

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="arm"

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 2dcfa1802c3..490263d1f59 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2018-09-19 Thread Lars Wendler

commit: 2e23da62f35f8c716af5e6342ac9cdbb96898c14
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Sep 18 23:41:07 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Sep 19 08:06:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e23da62

media-libs/fontconfig: Revert part of upstream commit which causes sandbox 
violations for fonts cache.

Closes: https://bugs.gentoo.org/666418

 ...1-revert_delete_.uuid_for_empty_directory.patch | 43 ++
 13.1-r1.ebuild => fontconfig-2.13.1-r2.ebuild} |  1 +
 2 files changed, 44 insertions(+)

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
 
b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
new file mode 100644
index 000..cd66082eedd
--- /dev/null
+++ 
b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch
@@ -0,0 +1,43 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
+
+Reversion of part of:
+https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf
+
+--- /src/fcdir.c
 /src/fcdir.c
+@@ -421,13 +421,6 @@
+ /* Not using existing cache file, construct new cache */
+ if (!cache)
+   cache = FcDirCacheScan (dir, config);
+-if (cache)
+-{
+-  FcFontSet *fs = FcCacheSet (cache);
+-
+-  if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
+-  FcDirCacheDeleteUUID (dir, config);
+-}
+ 
+ return cache;
+ }
+--- /test/run-test.sh
 /test/run-test.sh
+@@ -239,19 +239,4 @@
+ 
+ rm -rf $MyPWD/sysroot
+ 
+-dotest "deleting .uuid file on empty dir"
+-prep
+-cp $FONT1 $FONT2 $FONTDIR
+-$FCCACHE $FONTDIR
+-sleep 1
+-rm -f $FONTDIR/*pcf
+-$FCCACHE $FONTDIR
+-rmdir $FONTDIR > /dev/null 2>&1
+-if [ $? != 0 ]; then
+-  echo "*** Test failed: $TEST"
+-  echo "$FONTDIR isn't empty"
+-  ls -al $FONTDIR
+-  exit 1
+-fi
+-
+ rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
similarity index 98%
rename from media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
rename to media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index fdc25117f94..0ba7f651fab 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -36,6 +36,7 @@ PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
 PATCHES=(
"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make 
liberation default
+   "${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 
666418
 
# Patches from upstream (can usually be removed with next version bump)
"${FILESDIR}"/${P}-static_build.patch

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-18 Thread Lars Wendler

commit: c99288edb7c658dafa1cd8056ab44f4569ad5075
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Sep 18 04:13:11 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 18 07:15:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99288ed

media-libs/fontconfig: Various fixes mostly related to EAPI="7".

Move CBUILD-side tools from DEPEND to BDEPEND.
Add [${MULTILIB_USEDEP}] to dependency on virtual/pkgconfig.
Fix usage of ${ED}, ${ROOT}, ${EROOT}.

Closes: https://bugs.gentoo.org/666418

 media-libs/fontconfig/fontconfig-2.13.1.ebuild | 36 ++
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1.ebuild
index 3b995391a94..6d02affef22 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1.ebuild
@@ -15,6 +15,13 @@ SLOT="1.0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="doc static-libs"
 
+BDEPEND="dev-util/gperf
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
+   doc? (
+   =app-text/docbook-sgml-dtd-3.1*
+   app-text/docbook-sgml-utils[jadetex]
+   )"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
@@ -22,12 +29,7 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
elibc_Darwin? ( sys-libs/native-uuid )
virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   dev-util/gperf
-   >=sys-devel/gettext-0.19.8
-   doc? ( =app-text/docbook-sgml-dtd-3.1*
-   app-text/docbook-sgml-utils[jadetex] )"
+DEPEND="${RDEPEND}"
 PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
virtual/ttf-fonts"
 
@@ -46,7 +48,7 @@ pkg_setup() {
DOC_CONTENTS="Please make fontconfig configuration changes using
\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will 
be
overwritten. If you need to reset your configuration to upstream 
defaults,
-   delete the directory ${EROOT%/}/etc/fonts/conf.d/ and re-emerge 
fontconfig."
+   delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge 
fontconfig."
 }
 
 src_prepare() {
@@ -116,9 +118,9 @@ multilib_src_install_all() {
 
dodoc doc/fontconfig-user.{txt,pdf}
 
-   if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-   mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} 
|| die
-   rm -rf "${ED}"usr/share/doc/fontconfig
+   if [[ -e ${ED}/usr/share/doc/fontconfig/ ]];  then
+   mv "${ED}"/usr/share/doc/fontconfig/* 
"${ED}"/usr/share/doc/${P} || die
+   rm -rf "${ED}"/usr/share/doc/fontconfig
fi
 
# Changes should be made to /etc/fonts/local.conf, and as we had
@@ -144,11 +146,11 @@ pkg_preinst() {
for file in "${EROOT}"/etc/fonts/conf.avail/*; do
f=${file##*/}
if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-   [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-   && ln -sf ../conf.avail/"${f}" 
"${ED}"etc/fonts/conf.d/ &>/dev/null
+   [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+   && ln -sf ../conf.avail/"${f}" 
"${ED}"/etc/fonts/conf.d/ &>/dev/null
else
-   [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-   && rm "${ED}"etc/fonts/conf.d/"${f}" 
&>/dev/null
+   [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+   && rm "${ED}"/etc/fonts/conf.d/"${f}" 
&>/dev/null
fi
done
fi
@@ -156,12 +158,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   einfo "Cleaning broken symlinks in ${EROOT%/}/etc/fonts/conf.d/"
-   find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+   einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+   find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
 
readme.gentoo_print_elog
 
-   if [[ ${ROOT} = / ]]; then
+   if [[ ${ROOT} == "" ]]; then
multilib_pkg_postinst() {
ebegin "Creating global font cache for ${ABI}"
"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-18 Thread Lars Wendler

commit: 0f6af56d379b0dc89143e255c2e9ec7dab4d5480
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 18 07:12:42 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 18 07:15:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f6af56d

media-libs/fontconfig: Revbump to push fixes to everyone.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../{fontconfig-2.13.1.ebuild => fontconfig-2.13.1-r1.ebuild}  | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.1.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
similarity index 96%
rename from media-libs/fontconfig/fontconfig-2.13.1.ebuild
rename to media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
index 6d02affef22..fdc25117f94 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make 
liberation default
 
# Patches from upstream (can usually be removed with next version bump)
-   #"${FILESDIR}"/${P}-static_build.patch
+   "${FILESDIR}"/${P}-static_build.patch
"${FILESDIR}"/${P}-proper_homedir.patch
 )
 
@@ -87,11 +87,6 @@ multilib_src_configure() {
)
 
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-   # Ugly hackaround to prevent build failure
-   find "${BUILD_DIR}" -name "Makefile" -print0 \
-   | xargs --null sed 's@ FcStrBuildFilename\.3@@' -i \
-   || die
 }
 
 multilib_src_install() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-17 Thread Matt Turner

commit: 8a770d14927a1cd425da60c0e2daec529815a199
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Sep 17 21:28:43 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Sep 17 21:34:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a770d14

media-libs/fontconfig-2.13.0-r4: ppc64 stable, bug 664108

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index cde6f8b6601..2dcfa1802c3 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-17 Thread Matt Turner

commit: edfb5190a26f2c8adef5c6c77f301c75e837213a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Sep 17 21:28:41 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Sep 17 21:34:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfb5190

media-libs/fontconfig-2.13.0-r4: ppc stable, bug 664108

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index b0fe597f6e5..cde6f8b6601 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/files/, media-libs/fontconfig/

2018-09-17 Thread Lars Wendler

commit: 35cf888ba9bb8529bb6624327e1edcaca6487d34
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Sep 17 12:18:55 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Sep 17 12:29:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cf888b

media-libs/fontconfig: Bump to version 2.13.1

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/fontconfig/Manifest |   1 +
 .../files/fontconfig-2.13.1-proper_homedir.patch   | 323 +
 .../files/fontconfig-2.13.1-static_build.patch | 101 +++
 media-libs/fontconfig/fontconfig-2.13.1.ebuild | 173 +++
 4 files changed, 598 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index de6fde79604..684dfc449fd 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,2 +1,3 @@
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 
48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f
 SHA512 
2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B 
bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a
 SHA512 
f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
+DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 
08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1
 SHA512 
f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
new file mode 100644
index 000..19aee94ba98
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch
@@ -0,0 +1,323 @@
+From 806fd4c2c5164d66d978b0a4c579c157e5cbe766 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Tue, 4 Sep 2018 09:08:37 +
+Subject: [PATCH] Fix the issue that '~' wasn't extracted to the proper homedir
+
+'~' in the filename was extracted to the home directory name in 
FcConfigFilename() though,
+this behavior was broken by d1f48f11. this change fixes it back to the correct 
behavior.
+
+https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110
+diff --git a/src/fccfg.c b/src/fccfg.c
+index d7c48e8..4a53581 100644
+--- a/src/fccfg.c
 b/src/fccfg.c
+@@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url)
+   else
+   file = 0;
+ }
+-
+-path = FcConfigGetPath ();
+-if (!path)
+-  return NULL;
+-for (p = path; *p; p++)
++else
+ {
+-  file = FcConfigFileExists (*p, url);
+-  if (file)
+-  break;
++  path = FcConfigGetPath ();
++  if (!path)
++  return NULL;
++  for (p = path; *p; p++)
++  {
++  file = FcConfigFileExists (*p, url);
++  if (file)
++  break;
++  }
++  FcConfigFreePath (path);
+ }
+-FcConfigFreePath (path);
+ return file;
+ }
+ 
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 79bcede..9f4d48a 100644
+--- a/test/Makefile.am
 b/test/Makefile.am
+@@ -91,6 +91,22 @@ test_bz106632_CFLAGS =  
\
+ test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la
+ TESTS += test-bz106632
+ 
++if !ENABLE_SHARED
++check_PROGRAMS += test-issue110
++test_issue110_CFLAGS =\
++  -I$(top_builddir)   \
++  -I$(top_builddir)/src   \
++  -I$(top_srcdir) \
++  -I$(top_srcdir)/src \
++  -DHAVE_CONFIG_H \
++  -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'  \
++  $(NULL)
++test_issue110_LDADD = \
++  $(top_builddir)/src/libfontconfig.la\
++  $(NULL)
++TESTS += test-issue110
++endif
++
+ EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) 
out.expected-long-family-names out.expected-no-long-family-names
+ 
+ CLEANFILES=out out1 out2 fonts.conf out.expected
+diff --git a/test/test-issue110.c b/test/test-issue110.c
+new file mode 100644
+index 000..28a3bd2
+--- /dev/null
 b/test/test-issue110.c
+@@ -0,0 +1,245 @@
++/*
++ * fontconfig/test/test-issue110.c
++ *
++ * Copyright © 2000 Keith Packard
++ * Copyright © 2018 Akira TAGOH
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-14 Thread Tobias Klausmann

commit: ddb0e2b4e9ab6e263aabff5e958fb2b80a2921f9
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Sep 14 08:04:31 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Sep 14 08:28:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb0e2b4

media-libs/fontconfig-2.13.0-r4: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/664108

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 8b205d41f80..b0fe597f6e5 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-09-01 Thread Sergei Trofimovich

commit: 19db970b44362f000ac8f823b58960e8ac41d312
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  1 23:15:36 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  1 23:15:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19db970b

media-libs/fontconfig: stable 2.13.0-r4 for ia64, bug #664108

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ia64"

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 742cabb04cd..8b205d41f80 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-08-22 Thread Thomas Deutschmann

commit: 67f7c4c15f01440e4177441200d50edb026e5e0c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Aug 23 01:30:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 23 01:30:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f7c4c1

media-libs/fontconfig: x86 stable (bug #664108)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index f2be934bb66..2127a830b0f 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-08-21 Thread Mikle Kolyada

commit: acbd1dcf8bcd298df4da49ff6e6bfbe176be525d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Aug 22 00:14:39 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Aug 22 00:14:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbd1dcf

media-libs/fontconfig: amd64 stable wrt bug #664108

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 132911e9e7f..f2be934bb66 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-08-21 Thread Sergei Trofimovich

commit: 3d858c4765b75f45f2f03a061906491d67912f27
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Aug 21 15:20:34 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Aug 21 18:42:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d858c47

media-libs/fontconfig: stable 2.13.0-r4 for sparc, bug #664108

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 18a7309b4fa..132911e9e7f 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-08-21 Thread Mart Raudsepp

commit: 6543940fe4de97a3d76bfbd618af8160b0a58ad2
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Aug 21 07:44:45 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Aug 21 08:24:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6543940f

media-libs/fontconfig-2.13.0-r4: arm64 stable bug (#664108)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index c4600c4623c..18a7309b4fa 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-08-20 Thread Mart Raudsepp

commit: faeee54322a2a86343ac95e204a60eac65559810
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Aug 20 17:31:04 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Aug 20 17:31:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faeee543

media-libs/fontconfig: add missing gettext depend

This is especially useful for old system upgrades, as the minimum
required version of gettext is newish. But it's more correct to
have it anyways.

Closes: https://bugs.gentoo.org/663710
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index e8703c5c52e..c4600c4623c 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
virtual/pkgconfig
+   >=sys-devel/gettext-0.19.8
doc? ( =app-text/docbook-sgml-dtd-3.1*
app-text/docbook-sgml-utils[jadetex] )"
 PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-07-25 Thread Lars Wendler

commit: 68898ab56aabf1574804f4dc8e88715f2d4fff21
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul 25 08:54:22 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul 25 08:54:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68898ab5

media-libs/fontconfig: Fixed test suite.

Closes: https://bugs.gentoo.org/662048
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 6cce3f4bef0..e8703c5c52e 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
configure.ac || die # rest of gperf dependency fix, #631920
eautoreconf
+   rm test/out.expected || die #662048
 }
 
 multilib_src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-06-07 Thread Mikle Kolyada

commit: a89e5b59618aaea094d8f0d2dba1e5e50f0d5966
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jun  7 21:16:14 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jun  7 21:16:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a89e5b59

media-libs/fontconfig: mark s390 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/fontconfig/fontconfig-2.12.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild 
b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index f912eab6823..c65b40a2d38 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-06-02 Thread Fabian Groffen

commit: 9a4c066a24f03816b974347b2cce31a753b4ead5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jun  2 17:25:15 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jun  2 17:25:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4c066a

media-libs/fontconfig: swap libuuid for native-uuid for darwin targets

Third time's the charm, I hope.  using libuuid breaks macOS system
headers, so to satisfy packages which insist on pkg-config, use
native-uuid which provides a mere .pc file, so the host uuid can be used
again.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 2e0e7986dda..6cce3f4bef0 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -20,7 +20,7 @@ IUSE="doc static-libs"
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-   elibc_Darwin? ( sys-libs/libuuid )
+   elibc_Darwin? ( sys-libs/native-uuid )
virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-06-02 Thread Fabian Groffen

commit: 4d0eb7f8edbc1433b9e2b73ecd31bbd200a55c85
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jun  2 14:36:57 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jun  2 14:57:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0eb7f8

media-libs/fontconfig: depend on libuuid (with .pc file) for Darwin

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index c80ddcea1c0..2e0e7986dda 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -20,6 +20,7 @@ IUSE="doc static-libs"
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+   elibc_Darwin? ( sys-libs/libuuid )
virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -73,13 +74,6 @@ multilib_src_configure() {
;;
esac
 
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # Darwin provides uuid in libSystem, avoid pkg-config check for
-   # it with some dummy values
-   export UUID_CFLAGS="-I/usr/include/uuid-dummy"
-   export UUID_LIBS="-lc"
-   fi
-
local myeconfargs=(
$(use_enable doc docbook)
$(use_enable static-libs static)

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-06-02 Thread Fabian Groffen

commit: 32504cdd07879f891dbec667fa143abeed821871
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jun  2 14:14:02 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jun  2 14:14:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32504cdd

media-libs/fontconfig: use host uuid on Darwin

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index fb9e57feeeb..c80ddcea1c0 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,14 +12,14 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-   sys-apps/util-linux[${MULTILIB_USEDEP}]
+   !elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -73,6 +73,13 @@ multilib_src_configure() {
;;
esac
 
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   # Darwin provides uuid in libSystem, avoid pkg-config check for
+   # it with some dummy values
+   export UUID_CFLAGS="-I/usr/include/uuid-dummy"
+   export UUID_LIBS="-lc"
+   fi
+
local myeconfargs=(
$(use_enable doc docbook)
$(use_enable static-libs static)

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-05-20 Thread Robin H. Johnson

commit: 761a814c31fee72f741870663baad1f2c8a0ce7d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 20 21:37:11 2018 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun May 20 21:38:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761a814c

media-libs/fontconfig: need newer freetype

freetype-2.8 contains libfreetype2 v20.0.14, which is too old for
fontconfig-2.13 series (freetype2 >= 21.0.15).

Signed-off-by: Robin H. Johnson  gentoo.org>
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index c281f610ac2..fb9e57feeeb 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -18,7 +18,7 @@ IUSE="doc static-libs"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-   >=media-libs/freetype-2.8.1[${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
sys-apps/util-linux[${MULTILIB_USEDEP}]
virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig-infinality/

2018-05-20 Thread Johannes Huber

commit: e601c88a4e94916d9e43199ab8c565ae5b3d5a48
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 20 15:07:56 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 20 15:11:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e601c88a

media-libs/fontconfig-infinality: Remove 20120619

Uses deprecated EAPI 4 and overshadowed by 20130404.

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-libs/fontconfig-infinality/Manifest  |  2 -
 .../fontconfig-infinality-20120619.ebuild  | 55 --
 2 files changed, 57 deletions(-)

diff --git a/media-libs/fontconfig-infinality/Manifest 
b/media-libs/fontconfig-infinality/Manifest
index 8428f1becac..cd42f5813cb 100644
--- a/media-libs/fontconfig-infinality/Manifest
+++ b/media-libs/fontconfig-infinality/Manifest
@@ -1,4 +1,2 @@
-DIST fontconfig-infinality-20120619.tar.xz 18956 BLAKE2B 
ca1f698ccade1ed7744864d3561fcdfaac4852eb0fc1f4557765463c9c7a0b1f5dbd874d73b98c0fcbcafb84fe591b0095562fda328c6162b8c93b55a99a1e43
 SHA512 
2b20dd6c459572d8864459c32b9a50cfa3757df9fbdab75528772be81dbe7de31d2e997c4047083270769ee80d5e110ca43a9bddaf8c771f70e4181cab7cfb56
 DIST fontconfig-infinality-20130404.tar.xz 23344 BLAKE2B 
8531a8cab3ab37c7d8c23c992ad9ecb3473e92918569c1f77b0345be61d9f0bec968447bdd63898ca6197f210a5c79117433a1aa9e7eb4ff4f7b479a4817476a
 SHA512 
742206795523509a7d195f194394ef3f67a9022b46f194ea369f7388c0c59842d29573fd2719f616dcc2378a4b527b93cdd3cf787b7a1728c875c7e1aa5a5417
-DIST fontconfig-nyx-1.tar.xz 1344 BLAKE2B 
5ac550757c1ba96a6fc8830bc64c09da60e06fd9dadd4bb4f11354c9b2335df89e0a003ecc20a87e865934ea413b9267cd367294c2cf66442121aeee70732253
 SHA512 
d4959b0e81f9dc3529f5ee043dd5e0c45dc66848f4685daa1ef02aa8a40ed8e229f1da3f20a1ff9e315b15daddf9fb37c6ec1396eb9965fdbe3faf22c1cc70c8
 DIST fontconfig-nyx-2.tar.xz 1376 BLAKE2B 
35853d469bc1e38d7ccbc0346e26e8c1d885db86d4b81f7c341b64a2914fc0b8fdc5f7e449800e8b305163e7dca1bc60f7ed912674f5a4acd2e6e79cdb0c939b
 SHA512 
7863c41f67b02a37d9d3b438bcd1d6ece2bf42310ea61090f4d6384e22893a4ffbb2f7bc349511f40ba4570784f14e5656506de6b7e60f6da9c9eaba252beb1d

diff --git 
a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild 
b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
deleted file mode 100644
index abd7c399e57..000
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
-HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/;
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
-   nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-1.tar.xz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+nyx"
-
-DEPEND=""
-RDEPEND="app-eselect/eselect-fontconfig
-   app-eselect/eselect-infinality
-   app-eselect/eselect-lcdfilter
-   >=x11-libs/libXft-2.3.0
-   nyx? ( media-fonts/croscorefonts )"
-PDEPEND="media-libs/freetype:2[infinality]"
-
-src_configure() {
-   :
-}
-
-src_compile() {
-   :
-}
-
-src_install() {
-   dodoc infinality/{CHANGELOG,CHANGELOG.pre_git,README}
-
-   insinto /etc/fonts/conf.avail
-   doins conf.avail/52-infinality.conf
-
-   insinto /etc/fonts/infinality
-   doins -r infinality/{conf.src,styles.conf.avail,infinality.conf}
-
-   insinto /etc/X11/
-   doins "${FILESDIR}"/Xresources
-
-   if use nyx ; then
-   insinto /etc/fonts/infinality/styles.conf.avail
-   doins -r "${WORKDIR}"/nyx
-   fi
-}
-
-pkg_postinst() {
-   elog "Use eselect fontconfig enable 52-infinality.conf"
-   elog "to enable the configuration"
-   elog "Then use eselect infinality to set your fontconfig style"
-   elog "and eselect lcdfilter to set freetype variables"
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/, media-libs/fontconfig/files/

2018-04-20 Thread Lars Wendler

commit: 4631d0e111044db76bac330da6206e84bf17e8e3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Apr 20 11:11:49 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Apr 20 11:11:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4631d0e1

media-libs/fontconfig: Removed old.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-libs/fontconfig/Manifest |   1 -
 .../files/fontconfig-2.12.2-gperf31.patch  |  61 
 media-libs/fontconfig/fontconfig-2.12.4.ebuild | 162 -
 media-libs/fontconfig/fontconfig-2.13.0.ebuild | 162 -
 4 files changed, 386 deletions(-)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 0ab2d6c2885..de6fde79604 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,3 +1,2 @@
-DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 
9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c
 SHA512 
f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 
48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f
 SHA512 
2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B 
bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a
 SHA512 
f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc

diff --git a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch 
b/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
deleted file mode 100644
index ce90c450b36..000
--- a/media-libs/fontconfig/files/fontconfig-2.12.2-gperf31.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9878b306f6c673d3d6cd9db487f67eb426cc03df Mon Sep 17 00:00:00 2001
-From: Akira TAGOH 
-Date: Thu, 23 Feb 2017 21:39:10 +0900
-Subject: Fix the build issue with gperf 3.1
-
-To support the one of changes in gperf 3.1:
-* The 'len' parameter of the hash function and of the lookup function is now
-  of type 'size_t' instead of 'unsigned int'. This makes it safe to call these
-  functions with strings of length > 4 GB, on 64-bit machines.
-
-diff --git a/configure.ac b/configure.ac
-index 4948816..8fbf3d3 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -193,6 +193,26 @@ fi
- AC_CHECK_MEMBERS([struct dirent.d_type],,,
-   [#include ])
- 
-+# Check the argument type of the gperf hash/lookup function
-+AC_MSG_CHECKING([The type of len parameter of gperf hash/lookup function])
-+fc_gperf_test="$(echo 'foo' | gperf -L ANSI-C)"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+  #include 
-+
-+  const char *in_word_set(register const char *, register size_t);
-+  $fc_gperf_test
-+  ]])], [FC_GPERF_SIZE_T=size_t],
-+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+  #include 
-+
-+  const char *in_word_set(register const char *, register 
unsigned int);
-+  $fc_gperf_test
-+  ]])], [FC_GPERF_SIZE_T="unsigned int"],
-+  [AC_MSG_ERROR([Unable to determine the type of the len parameter of the 
gperf hash/lookup function])]
-+)])
-+AC_DEFINE_UNQUOTED(FC_GPERF_SIZE_T, $FC_GPERF_SIZE_T, [The type of len 
parameter of the gperf hash/lookup function])
-+AC_MSG_RESULT($FC_GPERF_SIZE_T)
-+
- #
- # Checks for iconv
- #
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 16ff31c..33bba8d 100644
 a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -25,10 +25,10 @@
- #include "fcint.h"
- 
- static unsigned int
--FcObjectTypeHash (register const char *str, register unsigned int len);
-+FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
- 
- static const struct FcObjectTypeInfo *
--FcObjectTypeLookup (register const char *str, register unsigned int len);
-+FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
- 
- #include "fcobjshash.h"
- 
--- 
-cgit v0.10.2
-

diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild 
b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
deleted file mode 100644
index 154f2350796..000
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/;
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-04-17 Thread Michał Górny

commit: 22a8e36a2ef4705709791bf956cb04f343b8d91b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Apr 17 19:20:35 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 17 19:22:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a8e36a

media-libs/fontconfig: Tested on ~amd64-fbsd (bug #652190)

 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 241eeb44400..c281f610ac2 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-04-17 Thread Thomas Deutschmann

commit: b7704d52e8b2dc962a93d3aa8fa5d898b2d93f83
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Apr 17 18:19:55 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Apr 17 18:19:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7704d52

media-libs/fontconfig: Rev bump to add DEPEND on virtual/libintl

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../{fontconfig-2.13.0-r3.ebuild => fontconfig-2.13.0-r4.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
similarity index 97%
rename from media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
rename to media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 1e73daa1929..241eeb44400 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -7,7 +7,7 @@ inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="https://fontconfig.org/;
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
+SRC_URI="https://fontconfig.org/release/${P}.tar.bz2;
 
 LICENSE="MIT"
 SLOT="1.0"
@@ -19,7 +19,8 @@ IUSE="doc static-libs"
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.8.1[${MULTILIB_USEDEP}]
-   sys-apps/util-linux[${MULTILIB_USEDEP}]"
+   sys-apps/util-linux[${MULTILIB_USEDEP}]
+   virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( =app-text/docbook-sgml-dtd-3.1*

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/files/, media-libs/fontconfig/

2018-04-10 Thread Thomas Deutschmann

commit: ba605ebba49476c6147af7abe8cbd5c9668ed20c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Apr 10 23:33:05 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Apr 10 23:33:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba605ebb

media-libs/fontconfig: Rev bump to add missing -lintl

Closes: https://bugs.gentoo.org/652674
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../fontconfig-2.13.0-add-missing-lintl.patch  | 34 ++
 13.0-r2.ebuild => fontconfig-2.13.0-r3.ebuild} |  3 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git 
a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch 
b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
new file mode 100644
index 000..6bea02b1fca
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
@@ -0,0 +1,34 @@
+From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Fri, 9 Mar 2018 11:55:43 +0900
+Subject: Fix the build issue again on MinGW with enabling nls
+
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1ff065b..2111ce0 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -82,7 +82,7 @@ AM_CPPFLAGS =
\
+   -DFC_CACHEDIR='"$(FC_CACHEDIR)"'\
+   -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'  \
+   -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
+-LDADD  = $(INTLLIBS)
++LDADD  = $(LIBINTL)
+ 
+ EXTRA_DIST += makealias
+ 
+@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
+ libfontconfig_la_LDFLAGS =\
+   -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
+ 
+-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) 
$(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
++libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) 
$(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
+ 
+ libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
+ 
+-- 
+cgit v1.1
+

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild 
b/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
similarity index 98%
rename from media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild
rename to media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
index 12d1cab673b..1e73daa1929 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver
 
 DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/;
+HOMEPAGE="https://fontconfig.org/;
 SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
 
 LICENSE="MIT"
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make 
liberation default
"${FILESDIR}"/${P}-locale.patch #650332
"${FILESDIR}"/${P}-names.patch #650370
+   "${FILESDIR}"/${P}-add-missing-lintl.patch #652674
 )
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )

[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

2018-04-06 Thread Matt Turner

commit: 0191bd527703446e0e3a806ed64b9f6dff801643
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Apr  7 05:05:58 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Apr  7 05:06:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0191bd52

media-libs/fontconfig-2.12.6: ppc stable, bug 647702

 media-libs/fontconfig/fontconfig-2.12.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild 
b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 2b836b5e1ae..2ead8d98ff7 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2;
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

1 2 >

1 - 100 of 155 matches

Mail list logo