gentoo auto-resync : 30:08:2022 - 16:48:50

4 files changed, 34 insertions, 2 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f0cbc03a9bce..e3e7949f7982 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest
index 524099a12067..3475d9e4c25e 100644
--- a/dev-php/jpgraph/Manifest
+++ b/dev-php/jpgraph/Manifest
@@ -1,8 +1,9 @@
+AUX gentoo_ttf_dir-4.3.5.patch 1199 BLAKE2B 6c2f6c7e8928ea75bd578976ae3d574810f3b02ef15edf4a22c5ec8390ea4fb089ddb914d3490d7d863c08e9474319ee8c11a38155875c0e86d014b2b74706ae SHA512 79732a89b8dd4a356d66a3527097c2895c185afff990cd020f05ec271418209c2efb1f86e2002657d37f838cf66105d9593d4fefacf997217394b1b20d11a9a1
 AUX gentoo_ttf_dir.patch 1187 BLAKE2B 470de819fb2b81a6a3898963eab8a0af09d27384c4cbc3572862104a55563485fdc983bbe7275cb6a7cbe537107d56fa3bfdbbd2cd965cf7646f49d534d2edb9 SHA512 76cd126b80849b915d48d88af292c75b66c3212870e2b1daafe7cee9ab248719d7517a0bc8a3fed076a4aec960badeedde0d7874053b8ab448f6b9e839cb34e3
 DIST jpgraph-4.0.2.tar.gz 13298314 BLAKE2B 46506f5a3f331157329c92f61f4843faa7d0774fbdb0cafe58a5609d1c9e9c2f73d4634ffd09cad3c874a45b2ac8658271a343b5e0dfb673f810bf7af6083189 SHA512 db1877c09c13a26d24ef7df4aae50799f55c6d72ca0cdb0b8d8c05928c1bc860f8a86eb52a5fb05bdc1c07574931825baa2989f006e9a4cc57e60913e8b67a3e
 DIST jpgraph-4.2.0.tar.gz 13298982 BLAKE2B b5fab9754239f78fbdfebd84872b824400d27fce89a80d82028d2521f7d64ada79efe4eb9c5460f56d882e827f5930eb10a57c3b41a81865dd618b9baf628cf9 SHA512 f0f164663f2e0fca5b827d89c57aaa144765a987ca4ebb82f18102f8cb80057c7f7639b8faae5d6d6ce459257bdfa609d2df6ffe648a7334c58c87ddfe86c334
 DIST jpgraph-4.3.5.tar.gz 13293351 BLAKE2B 246d2446b02b0f01fd8e3960d645897c21604c726541177aa5573620b63ab9a1f5d5318309e1c3ffd159257f02c0d1c7a7b8b563758abeea18161327a4939668 SHA512 7e826147f8f551171463d15add17f65587e879d6e666fcec9872367b7bdea77b2b1fd6b0af03984680d23dfe7c1e21b4f5d2cfd9a45a60c52b62812a5c1ab7ac
 EBUILD jpgraph-4.0.2.ebuild 2388 BLAKE2B bfc0c600ece77b593a88097af631baa97b5d6ff5be418f2befd2e3f4e94ac1a410ac3c6887fd54c0b47cae0caa336cb9c7eed4bc83cd1e2f220b05e8120b16c9 SHA512 499cbb5803b3a3e7e3156ea67ff3009ba09a1aaf04c3e778f2a310bd2ef77ea991e023a80c365fa29e5d0e9c7f54c1c0c2e970af18c473a68fbc723391d66761
 EBUILD jpgraph-4.2.0.ebuild 2397 BLAKE2B c47cca9d0b7579e4394dc75b51a5af79bc97590d95eb88358194f12c5e67bcb4b097dcf5805237b2d81254192cfa8c8caa38357facac8105ca78ccc810bad3c2 SHA512 6ad3880710d68fcce72026c9c1fdf33e72a3740f5d9f19713f3efc6bb2285fe2a9c1810ab475d0710c1613617c230f831ecb71c8adb8f7cb7ee234d598fd0b39
-EBUILD jpgraph-4.3.5.ebuild 2315 BLAKE2B 4917f431ef9db0bb698cfdb49f6036695e8e76315d648445be73e19b097e32aba9aed1c4a8324c1140a6d7e5561785719cb023e966a1b8c9f0885b3c56991de6 SHA512 8cb5f37822013748e65db6044b233b5302c421da1b501518553d247a08f21d2d8f2309c3684c3a057d5c39792619e3f850b87aaa6c73b85bbabe612e26172a53
+EBUILD jpgraph-4.3.5.ebuild 2321 BLAKE2B 6cae6b38d9d6b4eeaad623c475c9c8479441a2ff8fbf4d3d620fe50d45900639e5f2c5fbaf453e92ce76d3b40a792e3d9e7761b0ce77d5a220279cb3b9c60043 SHA512 c9f2996dab87efd10d597cb8784e9a49f6cf46615766156eae5dd0e9cd1e2df2b0894eb3e13f30b378a024cedef8255de926d7af6f968cecc3dfeaa0fc8ccfc8
 MISC metadata.xml 265 BLAKE2B 585cbeb6bace22ee97869bdcf0adfba824629fa069ffb758815ea835b87a10e6dc38298b737f04dfc9bf79f71827f031544190c1f423f9eb92d3440e3df73f49 SHA512 3208e8a0036eda43d0b037c0c277a56e5d943b15fb55d5904a0de6a978895890ca11325612f277b59495fefb69cdafa3ce485d4d06fd8e68b5d720cc9cec12fd
diff --git a/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch
new file mode 100644
index 000000000000..ba4e37c98fba
--- /dev/null
+++ b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch
@@ -0,0 +1,31 @@
+From fd1fc5e3c72ac4511f86852b1704821c440bdb3d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 3 Jan 2017 12:56:18 -0500
+Subject: [PATCH 1/1] Set TTF_DIR to the Gentoo corefonts location.
+
+The default value of TTF_DIR in jpg-config.inc.php points to
+/usr/share/fonts/truetype, a location that does not exist on
+Gentoo. Since JpGraph largely only supports the Microsoft
+corefonts, we point it to /usr/share/fonts/corefonts instead.
+If the user does not have the corefonts installed, this is no
+great loss: neither location exists.
+---
+ src/jpg-config.inc.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jpg-config.inc.php b/src/jpg-config.inc.php
+index ea16c1e..98cbdc7 100755
+--- a/src/jpg-config.inc.php
++++ b/src/jpg-config.inc.php
+@@ -36,7 +36,7 @@
+ //
+ //------------------------------------------------------------------------
+ // define('CACHE_DIR','/tmp/jpgraph_cache/');
+- define('TTF_DIR','/usr/share/fonts/truetype/msttcorefonts/');
++define('TTF_DIR','/usr/share/fonts/corefonts/');
+ // define('MBTTF_DIR','/usr/share/fonts/TrueType/');
+ 
+ //-------------------------------------------------------------------------
+-- 
+2.10.2
+
diff --git a/dev-php/jpgraph/jpgraph-4.3.5.ebuild b/dev-php/jpgraph/jpgraph-4.3.5.ebuild
index 534e39c0355d..2143d3e2edb4 100644
--- a/dev-php/jpgraph/jpgraph-4.3.5.ebuild
+++ b/dev-php/jpgraph/jpgraph-4.3.5.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
 	# break without warning when the user e.g. removes corefonts. By
 	# applying the patch conditionally, we ensure a dependency on
 	# media-fonts/corefonts before anything will work.
-	use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch"
+	use truetype && eapply "${FILESDIR}/gentoo_ttf_dir-4.3.5.patch"
 
 	# Some of the documentation and examples are shipped in the "src"
 	# directory. We want them outside of that tree so that we can simply