gentoo resync : 23.03.2018

3 files changed, 68 insertions, 3 deletions

diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest
index d5184a443ff4..59dee4c6a27e 100644
--- a/dev-php/jpgraph/Manifest
+++ b/dev-php/jpgraph/Manifest
@@ -1,4 +1,6 @@
 AUX gentoo_ttf_dir.patch 1187 BLAKE2B 470de819fb2b81a6a3898963eab8a0af09d27384c4cbc3572862104a55563485fdc983bbe7275cb6a7cbe537107d56fa3bfdbbd2cd965cf7646f49d534d2edb9 SHA512 76cd126b80849b915d48d88af292c75b66c3212870e2b1daafe7cee9ab248719d7517a0bc8a3fed076a4aec960badeedde0d7874053b8ab448f6b9e839cb34e3
 DIST jpgraph-4.0.2.tar.gz 13298314 BLAKE2B 46506f5a3f331157329c92f61f4843faa7d0774fbdb0cafe58a5609d1c9e9c2f73d4634ffd09cad3c874a45b2ac8658271a343b5e0dfb673f810bf7af6083189 SHA512 db1877c09c13a26d24ef7df4aae50799f55c6d72ca0cdb0b8d8c05928c1bc860f8a86eb52a5fb05bdc1c07574931825baa2989f006e9a4cc57e60913e8b67a3e
-EBUILD jpgraph-4.0.2.ebuild 2375 BLAKE2B ca994f0ae4ca3b137599847ce07f21e7975b220d215a4e795e29f535684f1757509fa9cbb54fa6f8dc0813678868a1f5467f41bea7bc04d13920ae2f10420412 SHA512 3e1538ea3822fa61b9a1b186790fef83fa5369afacca1368a7e4a836374453d081d7244d972c8876317d69a1edbd3c73af783d1a59a8d4096ccbbe1166831e9e
+DIST jpgraph-4.2.0.tar.gz 13298982 BLAKE2B b5fab9754239f78fbdfebd84872b824400d27fce89a80d82028d2521f7d64ada79efe4eb9c5460f56d882e827f5930eb10a57c3b41a81865dd618b9baf628cf9 SHA512 f0f164663f2e0fca5b827d89c57aaa144765a987ca4ebb82f18102f8cb80057c7f7639b8faae5d6d6ce459257bdfa609d2df6ffe648a7334c58c87ddfe86c334
+EBUILD jpgraph-4.0.2.ebuild 2386 BLAKE2B 607b225ea5b175cf7825490d3814807f4cb4e94c95f66b8fc9d087946d75d1a34e6e607515abfb3073e4345047e05a14ae47c725adf7aa18fef0411376f0e3db SHA512 8362967858dbbec02d9dc7ba6279ee2339baba2bd474ff5f8750a9a90f462d8bb513206dda03b0b7f8051e1a71f62942fb882f536f7a89e98b290c844e32838d
+EBUILD jpgraph-4.2.0.ebuild 2397 BLAKE2B c47cca9d0b7579e4394dc75b51a5af79bc97590d95eb88358194f12c5e67bcb4b097dcf5805237b2d81254192cfa8c8caa38357facac8105ca78ccc810bad3c2 SHA512 6ad3880710d68fcce72026c9c1fdf33e72a3740f5d9f19713f3efc6bb2285fe2a9c1810ab475d0710c1613617c230f831ecb71c8adb8f7cb7ee234d598fd0b39
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/jpgraph/jpgraph-4.0.2.ebuild b/dev-php/jpgraph/jpgraph-4.0.2.ebuild
index 3d0a12eeb095..c89e72cdc0ee 100644
--- a/dev-php/jpgraph/jpgraph-4.0.2.ebuild
+++ b/dev-php/jpgraph/jpgraph-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,5 +59,5 @@ src_install() {
 	doins jpg-config.inc.php
 	# Create a symlink for the config file, because the library will only
 	# look for it in its own source tree (not in /etc where we've put it).
-	dosym /etc/jpg-config.inc.php "/usr/share/php/${PN}/jpg-config.inc.php"
+	dosym ../../../../etc/jpg-config.inc.php "/usr/share/php/${PN}/jpg-config.inc.php"
 }
diff --git a/dev-php/jpgraph/jpgraph-4.2.0.ebuild b/dev-php/jpgraph/jpgraph-4.2.0.ebuild
new file mode 100644
index 000000000000..b7565d393188
--- /dev/null
+++ b/dev-php/jpgraph/jpgraph-4.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Object-oriented graphing library for PHP"
+HOMEPAGE="http://jpgraph.net/"
+# Upstream didn't have a stable download URL when this was packaged.
+SRC_URI="https://dev.gentoo.org/~grknight/distfiles/${P}.tar.gz"
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="truetype examples"
+
+DEPEND=""
+RDEPEND="truetype? ( media-fonts/corefonts )
+	dev-lang/php[gd,truetype?]"
+
+src_prepare() {
+	default
+
+	# The DejaVu fonts are now bundled with the library and don't need
+	# to be found in TTF_DIR. Since most of the fonts supported by
+	# JpGraph are corefonts, we point the sole TTF_DIR towards them for
+	# maximum impact. Why not apply the patch unconditionally? We want
+	# to avoid a situation where TTF fonts appear to work, but then
+	# 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"
+
+	# Some of the documentation and examples are shipped in the "src"
+	# directory. We want them outside of that tree so that we can simply
+	# call doins recursively on "src". First, rename the existing "docs"
+	# directory which contains the HTML manual and class reference.
+	mv docs html || die 'failed to rename "docs" directory'
+	mv src/README ./ || die 'failed to relocate the README'
+	mv src/Examples ./examples || die 'failed to relocate the examples'
+
+	# These are present (duplicated) in the other Examples directory,
+	# and don't work anyway.
+	rm -r src/barcode || die 'failed to remove some barcode examples'
+
+	# We'll also want to install the config file to /etc, since it may
+	# need to be edited by the user.
+	mv src/jpg-config.inc.php ./ || die 'failed to relocate the config file'
+	rm src/jpg-config.inc.php.orig || die 'failed to remove original config file'
+}
+
+src_install() {
+	dodoc README
+	dodoc -r html
+	use examples && dodoc -r examples
+
+	insinto "/usr/share/php/${PN}"
+	doins -r src/*
+
+	insinto /etc
+	doins jpg-config.inc.php
+	# Create a symlink for the config file, because the library will only
+	# look for it in its own source tree (not in /etc where we've put it).
+	dosym ../../../../etc/jpg-config.inc.php "/usr/share/php/${PN}/jpg-config.inc.php"
+}