[gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/, x11-libs/pango/files/

2023-04-01 Thread Matt Turner 
commit: c07f6107e8f80a3d9cc0b99ef6daeae7ec5f87c7
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr  2 00:34:05 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr  2 00:56:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c07f6107

x11-libs/pango: Drop old versions

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

 x11-libs/pango/Manifest  |  1 -
 x11-libs/pango/files/1.50.8-harfbuzz-4.patch | 47 --
 x11-libs/pango/pango-1.50.12.ebuild  | 91 
 3 files changed, 139 deletions(-)

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2354f47add75..194e19c245b2 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,5 +1,4 @@
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B 
ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1
 SHA512 
b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 
7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26
 SHA512 
993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-DIST pango-1.50.12.tar.xz 4272856 BLAKE2B 
60a06416f82e8e5419bca7c89cae17bcd60605b944f483bc7a4ce4405710f00dd40c78abfbe9fdbf8d4786780540f92adfde45e615be4175450e608ba618df08
 SHA512 
488a55e875487ded8c298151d67a3a7ec4653f2c311145fe83b1297417b1154d5e86b199013ee986c7d2575c889fafcb2f148ee4e5ff9ca143f9fb716a71512d
 DIST pango-1.50.13.tar.xz 4273188 BLAKE2B 
8524d5ff478137e6f3795aff8428a8bc864d72338d93c579c039c94eba368526d38f999b7a9b1964e3649d748393dbe2fffaa29a11732df5bd0adff010d79e05
 SHA512 
1a8ccf645b4340d3ad450c7edc8f236279d1577234b06587ca74dd94fbcfb9ee625c3a27616771a91d6dc1db24900a9557fb0a1b861ad0c004422a36678e41de
 DIST pango-1.50.14.tar.xz 4273776 BLAKE2B 
24f70c56aee117e09d53c0ccf7cb3605bf8fec847816a163d9d39ce970c11339ca2eb4463c40e2d53a68c32e45d8ae40be81250caea8591ae340004936f3c2a7
 SHA512 
2c9330b65920fdd0ab6d645aed785a364158d78068bdcd7ba15b6a7368835677f06f2f8fd158cd23b05f98a37fb903e29526ade8f4d62913dbc5809f737d5166

diff --git a/x11-libs/pango/files/1.50.8-harfbuzz-4.patch 
b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch
deleted file mode 100644
index 0fa9c1fb7302..
--- a/x11-libs/pango/files/1.50.8-harfbuzz-4.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-This is a revert of upstream commit 0a576fc822a3 ("Try again to fix ci").
-
-Without the patch, the tests fail on my amd64 system with harfbuzz-4.3.0.
-
-diff --git b/tests/layouts/valid-20.layout a/tests/layouts/valid-20.layout
-index db692b73..5b2bcf15 100644
 b/tests/layouts/valid-20.layout
-+++ a/tests/layouts/valid-20.layout
-@@ -40,7 +40,7 @@
- "is-wrapped" : false,
- "is-ellipsized" : false,
- "unknown-glyphs" : 0,
--"width" : 67584,
-+"width" : 76800,
- "height" : 25600,
- "log-attrs" : [
-   {
-@@ -138,7 +138,7 @@
- "glyphs" : [
-   {
- "glyph" : 244,
--"width" : 15360,
-+"width" : 18432,
- "x-offset" : 14764,
- "y-offset" : 3845,
- "is-cluster-start" : true,
-@@ -146,7 +146,7 @@
-   },
-   {
- "glyph" : 272,
--"width" : 15360,
-+"width" : 18432,
- "x-offset" : 14764,
- "y-offset" : 4280,
- "is-cluster-start" : true,
-@@ -154,7 +154,7 @@
-   },
-   {
- "glyph" : 273,
--"width" : 15360,
-+"width" : 18432,
- "x-offset" : 14764,
- "y-offset" : 3507,
- "is-cluster-start" : true,
--- 
-2.35.1
-

diff --git a/x11-libs/pango/pango-1.50.12.ebuild 
b/x11-libs/pango/pango-1.50.12.ebuild
deleted file mode 100644
index 262982813a4f..
--- a/x11-libs/pango/pango-1.50.12.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango;
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 
1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv 
~s390 sparc x86"
-
-IUSE="debug +introspection sysprof test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-   >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-

[gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/, x11-libs/pango/files/

2022-06-16 Thread Sam James 
commit: f738d92e64131be574522fb862077ea595f9eda4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 16 23:19:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 16 23:19:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f738d92e

x11-libs/pango: fix tests w/ Harfbuzz 4.0.0

Bug: https://bugs.gentoo.org/836317
Signed-off-by: Sam James  gentoo.org>

 x11-libs/pango/files/1.50.7-harfbuzz-4.patch | 78 
 x11-libs/pango/pango-1.50.7.ebuild   |  4 ++
 2 files changed, 82 insertions(+)

diff --git a/x11-libs/pango/files/1.50.7-harfbuzz-4.patch 
b/x11-libs/pango/files/1.50.7-harfbuzz-4.patch
new file mode 100644
index ..91598f9969e5
--- /dev/null
+++ b/x11-libs/pango/files/1.50.7-harfbuzz-4.patch
@@ -0,0 +1,78 @@
+https://gitlab.gnome.org/GNOME/pango/-/commit/0226bdd9c223f5651b6657a14cebc900bbac4b19
+https://bugs.gentoo.org/836317
+
+Fixes tests with Harfbuzz 4.0.0 ish.
+
+From: Matthias Clasen 
+Date: Fri, 10 Jun 2022 08:00:22 -0400
+Subject: [PATCH] Update tests to pass on F36
+
+Rounding differences are our downfall :(
+--- a/tests/layouts/valid-14.layout
 b/tests/layouts/valid-14.layout
+@@ -25,7 +25,7 @@
+ "is-ellipsized" : true,
+ "unknown-glyphs" : 1,
+ "width" : 161792,
+-"height" : 20480,
++"height" : 21047,
+ "log-attrs" : [
+   {
+ "char-break" : true,
+@@ -261,7 +261,7 @@
+   ]
+ },
+ "flags" : 0,
+-"y-offset" : 0,
++"y-offset" : 567,
+ "start-x-offset" : 0,
+ "end-x-offset" : 0,
+ "glyphs" : [
+@@ -360,7 +360,7 @@
+   ]
+ },
+ "flags" : 0,
+-"y-offset" : 0,
++"y-offset" : 337,
+ "start-x-offset" : 0,
+ "end-x-offset" : 0,
+ "glyphs" : [
+--- a/tests/layouts/valid-20.layout
 b/tests/layouts/valid-20.layout
+@@ -40,7 +40,7 @@
+ "is-wrapped" : false,
+ "is-ellipsized" : false,
+ "unknown-glyphs" : 0,
+-"width" : 67584,
++"width" : 76800,
+ "height" : 25600,
+ "log-attrs" : [
+   {
+@@ -138,7 +138,7 @@
+ "glyphs" : [
+   {
+ "glyph" : 244,
+-"width" : 15360,
++"width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 3845,
+ "is-cluster-start" : true,
+@@ -146,7 +146,7 @@
+   },
+   {
+ "glyph" : 272,
+-"width" : 15360,
++"width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 4280,
+ "is-cluster-start" : true,
+@@ -154,7 +154,7 @@
+   },
+   {
+ "glyph" : 273,
+-"width" : 15360,
++"width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 3507,
+ "is-cluster-start" : true,
+GitLab

diff --git a/x11-libs/pango/pango-1.50.7.ebuild 
b/x11-libs/pango/pango-1.50.7.ebuild
index 01f3c6c62e73..366b60090874 100644
--- a/x11-libs/pango/pango-1.50.7.ebuild
+++ b/x11-libs/pango/pango-1.50.7.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
test? ( media-fonts/cantarell )
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PV}-harfbuzz-4.patch
+)
+
 src_prepare() {
xdg_src_prepare
gnome2_environment_reset

[gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/, x11-libs/pango/files/

2021-05-30 Thread Matt Turner 
commit: c5105b1d2b20a1bcc69bc202da0835a09099d168
Author: Matt Turner  gentoo  org>
AuthorDate: Mon May 31 00:04:57 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May 31 01:58:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5105b1d

x11-libs/pango: Drop old versions

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

 x11-libs/pango/Manifest|  3 -
 ...break.c-Only-test-Thai-breaks-with-libtha.patch | 35 
 x11-libs/pango/pango-1.44.7.ebuild | 81 --
 x11-libs/pango/pango-1.48.3.ebuild | 82 ---
 x11-libs/pango/pango-1.48.4-r1.ebuild  | 95 --
 5 files changed, 296 deletions(-)

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index ed0fc90657e..9208e99a373 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,3 @@
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B 
ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1
 SHA512 
b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 
7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26
 SHA512 
993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-DIST pango-1.44.7.tar.xz 521384 BLAKE2B 
9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97f480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb
 SHA512 
6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
-DIST pango-1.48.3.tar.xz 565956 BLAKE2B 
6860ae9df2b8629bdd1c5acf03453e1c6d62d8fd100752a6d5762ab1e0f2b3cbefb55e0f3476e53209d07541e7f8dffc680507378e94ab39b49601582a35e9a7
 SHA512 
769ceec71c5d64c08b91a0d78c5e39f6599fa199ae3f9d6dc4b94e5898a41e7f4b3d3f9c16a92f03d0e558778a4ef5bbe2967eefef17173211d53ffdb3d72041
-DIST pango-1.48.4.tar.xz 1791332 BLAKE2B 
281e1ba5b52b99c61bcd90dcefb3de64e45a6de0eec5a375e209cb4316562a03e81dea73e6fb8921a631ef854dca8b035e06b3cec7ff73bf8f0033151d2cd20b
 SHA512 
ce754c5e915ed18ba0f0ec89d74a1094e5b235821514b247d16afba7b74ecf1d850ad2b7b7d0a43da83da126c74be1b2e4c4400dbcd447e388e75e6b3c8b4dbe
 DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 
8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a
 SHA512 
2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab

diff --git 
a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
 
b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
deleted file mode 100644
index 181d84587e1..000
--- 
a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.gnome.org/GNOME/pango/merge_requests/161
-
-From b73284747ac937e31dc9191f84ed6e24284c88ee Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan 
-Date: Mon, 25 Nov 2019 14:58:32 +0800
-Subject: [PATCH] tests/test-break.c: Only test Thai breaks with libthai
- available
-
-The four.break test data file involves the Thai language, meaning that
-this test will fail unless we have libthai.  Skip this test unless
-libthai is found.

- tests/test-break.c | 6 ++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tests/test-break.c b/tests/test-break.c
-index 8549b678..47fa3009 100644
 a/tests/test-break.c
-+++ b/tests/test-break.c
-@@ -305,6 +305,12 @@ main (int argc, char *argv[])
-   if (!strstr (name, "break"))
- continue;
- 
-+#ifndef HAVE_LIBTHAI
-+  /* four.break involves Thai, so only test it when we have libthai */
-+  if (strstr (name, "four.break"))
-+continue;
-+#endif
-+
-   path = g_strdup_printf ("/break/%s", name);
-   g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, 
"breaks", name, NULL),
-  test_break, g_free);
--- 
-2.24.1
-

diff --git a/x11-libs/pango/pango-1.44.7.ebuild 
b/x11-libs/pango/pango-1.44.7.ebuild
deleted file mode 100644
index 98be14ec452..000
--- a/x11-libs/pango/pango-1.44.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/;
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 
1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64

[gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/, x11-libs/pango/files/

2020-02-02 Thread Matt Turner 
commit: 66d950c109ef07428aaf8a1d1d234ee7ba42df55
Author: David Heidelberg  ixit  cz>
AuthorDate: Wed Oct 30 13:03:19 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb  3 02:36:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d950c1

x11-libs/pango: Version bump to 1.44.7

>From Polynomial-C's overlay.

Closes: https://bugs.gentoo.org/698922
Closes: https://github.com/gentoo/gentoo/pull/13498
Signed-off-by: David Heidelberg  ixit.cz>
Signed-off-by: Matt Turner  gentoo.org>

 x11-libs/pango/Manifest|  1 +
 ...break.c-Only-test-Thai-breaks-with-libtha.patch | 35 ++
 x11-libs/pango/pango-1.44.7.ebuild | 81 ++
 3 files changed, 117 insertions(+)

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index b156ec8c167..43cbd6530e5 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,2 +1,3 @@
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B 
ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1
 SHA512 
b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 
7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26
 SHA512 
993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
+DIST pango-1.44.7.tar.xz 521384 BLAKE2B 
9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97f480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb
 SHA512 
6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350

diff --git 
a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
 
b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
new file mode 100644
index 000..181d84587e1
--- /dev/null
+++ 
b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/pango/merge_requests/161
+
+From b73284747ac937e31dc9191f84ed6e24284c88ee Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan 
+Date: Mon, 25 Nov 2019 14:58:32 +0800
+Subject: [PATCH] tests/test-break.c: Only test Thai breaks with libthai
+ available
+
+The four.break test data file involves the Thai language, meaning that
+this test will fail unless we have libthai.  Skip this test unless
+libthai is found.
+---
+ tests/test-break.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/test-break.c b/tests/test-break.c
+index 8549b678..47fa3009 100644
+--- a/tests/test-break.c
 b/tests/test-break.c
+@@ -305,6 +305,12 @@ main (int argc, char *argv[])
+   if (!strstr (name, "break"))
+ continue;
+ 
++#ifndef HAVE_LIBTHAI
++  /* four.break involves Thai, so only test it when we have libthai */
++  if (strstr (name, "four.break"))
++continue;
++#endif
++
+   path = g_strdup_printf ("/break/%s", name);
+   g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, 
"breaks", name, NULL),
+  test_break, g_free);
+-- 
+2.24.1
+

diff --git a/x11-libs/pango/pango-1.44.7.ebuild 
b/x11-libs/pango/pango-1.44.7.ebuild
new file mode 100644
index 000..cbaa8b80c48
--- /dev/null
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/;
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 
1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
+IUSE="gtk-doc +introspection test +X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+   >=dev-libs/glib-2.59.2:2[${MULTILIB_USEDEP}]
+   >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+   >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+   >=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+   >=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
+   >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+   >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+   >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/, x11-libs/pango/files/

2015-10-03 Thread Pacho Ramos 
commit: 2d3982ba406567ceb4c5a9438df99e8047932225
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct  3 11:27:20 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct  3 11:27:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3982ba

x11-libs/pango: Drop old

Package-Manager: portage-2.2.22

 x11-libs/pango/Manifest   |   3 -
 x11-libs/pango/files/pango-1.32.1-lib64.patch |  44 ---
 x11-libs/pango/metadata.xml   |   8 +-
 x11-libs/pango/pango-1.36.3.ebuild|  89 --
 x11-libs/pango/pango-1.36.5.ebuild| 102 --
 x11-libs/pango/pango-1.36.7.ebuild|  80 
 6 files changed, 4 insertions(+), 322 deletions(-)

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9a0c7c4..95de130 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,4 +1 @@
-DIST pango-1.36.3.tar.xz 1021656 SHA256 
ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 SHA512 
74f94c4e853f8d7538990589e5c9796e48cce32f935cf50d0155b57d00fbce155c9dd659b0803b861c568ddedffb14712fbcbefadfeefb43d2ed0fab949258a2
 WHIRLPOOL 
c63a1b5d27eb55530bfc86da77f25fe6c022346cf30f1beeaaa1ef3b90cee6afde44d0735ad77811e7cc487cd35bb18efc667aaa470725c0b2cc3fdb6e495560
-DIST pango-1.36.5.tar.xz 1023952 SHA256 
be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8 SHA512 
d2c2f5ffcc67ec9f4bf942905b09294be4896f11b1fd66b6e63e75c3f269c8b5c1f9e75127f7b550fa354e0fc66eb32de24d262caa784ee7ac66709da776386c
 WHIRLPOOL 
ac6ecb13dbba51527a629e1b216ed6affa9881d5ed90d3f1d96772a17c7815ae0a3c2340444c473092a1c2ec8966110bb1f2c6df2b0af7358a1c9e8255de
-DIST pango-1.36.7.tar.xz 1033896 SHA256 
1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a SHA512 
a04ffdcf7dd574da01598a86d936540d057d2226d122c73c024d401c281260fd93262e7a683d88b58b9a90e44e7e7597945a84a4d4f81094e1498a4247e3
 WHIRLPOOL 
d88a3fe0f9f6b9c403de1f6662db41c2e3f83e401d4413f9ab22a9e0525edd16eee7248c4bfc7c178dd167f06bbd66df5b3c1ee8a0b9febf244abf8256a8
 DIST pango-1.36.8.tar.xz 1033528 SHA256 
18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 SHA512 
799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215
 WHIRLPOOL 
cb352f115a85f02061c1d1d96ad99340372a013eb9249ff2ccf6531926c26dc17b9b88572bccd40e3dbcb6f8e7a673b01ff1821a8acaa5117d96d8d6ed71707e

diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch 
b/x11-libs/pango/files/pango-1.32.1-lib64.patch
deleted file mode 100644
index 0820c78..000
--- a/x11-libs/pango/files/pango-1.32.1-lib64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Sun, 28 Oct 2012 23:19:39 +0100
-Subject: [PATCH] Add multilib support
-
-pango.modules list modules specific to a host architecture.
-Add host triplet in path so that machine able to run multiple
-triplet have a proper file per pango library.

- pango/Makefile.am   | 1 +
- pango/pango-utils.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pango/Makefile.am b/pango/Makefile.am
-index ab092c9..558108b 100644
 a/pango/Makefile.am
-+++ b/pango/Makefile.am
-@@ -17,6 +17,7 @@ INCLUDES =   \
-   -DPANGO_ENABLE_BACKEND  \
-   -DPANGO_ENABLE_ENGINE   \
-   -DSYSCONFDIR=\"$(sysconfdir)\"  \
-+  -DHOST=\"$(host_triplet)\"  \
-   -DLIBDIR=\"$(libdir)\"  \
-   -I$(top_srcdir) \
-   -I$(top_builddir)   \
-diff --git a/pango/pango-utils.c b/pango/pango-utils.c
-index 18ffa26..3b88f15 100644
 a/pango/pango-utils.c
-+++ b/pango/pango-utils.c
-@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void)
- #else
-   const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR");
-   if (sysconfdir != NULL)
--  tmp_result = g_build_filename (sysconfdir, "pango", NULL);
-+  tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL);
-   else
--  tmp_result = SYSCONFDIR "/pango";
-+  tmp_result = SYSCONFDIR "/pango/" HOST;
- #endif
-   g_once_init_leave((gsize*), (gsize)tmp_result);
- }
--- 
-1.7.12.4
-

diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index e6cd553..1ebecbb 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,8 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  gnome
-  
-cpe:/a:pango:pango
-  
+gnome
+
+  cpe:/a:pango:pango
+
 

diff --git a/x11-libs/pango/pango-1.36.3.ebuild 
b/x11-libs/pango/pango-1.36.3.ebuild
deleted file mode 100644
index 87a9efa..000
--- a/x11-libs/pango/pango-1.36.3.ebuild
+++ /dev/null
@@ -1,89