gentoo resync : 21.01.2018

3 files changed, 86 insertions, 76 deletions

diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 987db909bbb0..58fac479697f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,11 +1,11 @@
 AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 AUX graphicsmagick-1.3.27-version.sh-fix.patch 310 BLAKE2B 0a9a0c97c675af889207393a5123ef3d4c8367a4f0ab9f9c20a9056a5ad6ab021a010f1519b9ed25cc4e0473bd43ce353c1513d843d0ed33f1d1ac0a11246b01 SHA512 e7b497506aa480bbb301a9adfc5ee4332ca6520e62c5e3636aa960d2f4da32b08e887969e7c9477d021c953b74616c82c9c8168a7896f4c6c33ad25d7848d5a3
-DIST GraphicsMagick-1.3.25.tar.xz 5387880 BLAKE2B dbde32a869bde374cd453569fbc4b7b2bf54fdb8dc07fa40e83b92b788771797f7b4a529fc8b7ae439482e4e456ac9f947c8f47ac83000bdaf4d4079f4ea5e83 SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8
 DIST GraphicsMagick-1.3.26.tar.xz 5400564 BLAKE2B bd7c5286f4ff0abe8fafee680f9bea5e96c23d1787b5dc5b1a33580b5b8fd2dc8c5932606e0c8f2d783c377104232e8efb6be83ea10e0105c83e9d1925314e0b SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22
 DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
-EBUILD graphicsmagick-1.3.25.ebuild 3162 BLAKE2B 19d028a23bdd7cac5c21934e478b5f4b7bf6abec8e4fb81963719bdb9b2c891352d95cf727999ae08b12bd12b56bb1426c30ae4e1b10bbdcb46eeef015c016fd SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32
+DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24efa07249145b4dd3e1ff2802ec07ad7ea70e4484d0ffcc255454adf4b2be72d6e19f4352db65e22def6e12dfde4cf5987f8 SHA512 c372212e54e6403a44a973113764bf1fee6dde5df08a6ee015ae03c32823f96316018cafd34a355ff8a35ad3581aa7d455d30d664b9d68d3ea2ad277d7cf45e6
 EBUILD graphicsmagick-1.3.26.ebuild 3275 BLAKE2B 86e28c2249ac008c44142aa589e23e768a60d402853c5047daa09d761f4c541926a61b6b9b85fb62a56a6dd2dfddff30df09439b0bfd1c228e4aebec357158d5 SHA512 a28b4b47c1d4c7860be37b8480ecca5055008157969f208878c951068ab901cded604370663154c95f742c011a98554ac67e1f97a8e0b3a052cc01c8cb6a6696
 EBUILD graphicsmagick-1.3.27.ebuild 3326 BLAKE2B 3a22d493c77fc7bb8acb977900a37d4e930cf62445f8438dfc4a222fcaf9e48668f0e7896e8f4f46ab896ca0064cd6b81eaa2d947d20960260665657127128f6 SHA512 93aad4c05738834ccd15b928211d4636c185b062ab133c859960cf8e987f71542b7e799cc95dbe8bcb371fa60266c16cfd6514d97846cbdf08430cb7bca62399
-EBUILD graphicsmagick-9999.ebuild 3283 BLAKE2B 7601699987f34923ca2dfa74b7a91584bf62a4c68c07761d77229522a10726450ae8821c3b5fcacbf5e4c8cb62e525d41763ca55c7082f41c9894104a0024495 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480
+EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
+EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.25.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild
index 8d6ce9bfd2a2..c5f11fb693d3 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.25.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.28.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
@@ -8,11 +8,17 @@ MY_P=${P/graphicsm/GraphicsM}
 
 DESCRIPTION="Collection of tools and libraries for many image formats"
 HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
 LICENSE="MIT"
 SLOT="0/${PV%.*}"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
 	perl png postscript q16 q32 static-libs svg test threads tiff truetype
 	webp wmf X zlib"
@@ -68,41 +74,43 @@ src_configure() {
 		openmp=enable
 	fi
 
-	econf \
-		--${openmp}-openmp \
-		--enable-largefile \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_with threads) \
-		$(use_with modules) \
-		--with-quantum-depth=${depth} \
-		--without-frozenpaths \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with perl) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_with bzip2 bzlib) \
-		$(use_with postscript dps) \
-		$(use_with fpx) \
-		--without-gslib \
-		$(use_with jbig) \
-		$(use_with webp) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms lcms2) \
-		$(use_with lzma) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		--with-fontpath="${EPREFIX}"/usr/share/fonts \
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
-		$(use_with svg xml) \
-		$(use_with zlib) \
+	local myeconfargs=(
+		--${openmp}-openmp
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_with threads)
+		$(use_with modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with postscript dps)
+		$(use_with fpx)
+		--without-gslib
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		$(use_with jpeg2k jp2)
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with svg xml)
+		$(use_with zlib)
 		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index aecb472c7108..c5f11fb693d3 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.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
@@ -74,41 +74,43 @@ src_configure() {
 		openmp=enable
 	fi
 
-	econf \
-		--${openmp}-openmp \
-		--enable-largefile \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_with threads) \
-		$(use_with modules) \
-		--with-quantum-depth=${depth} \
-		--without-frozenpaths \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with perl) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		$(use_with bzip2 bzlib) \
-		$(use_with postscript dps) \
-		$(use_with fpx) \
-		--without-gslib \
-		$(use_with jbig) \
-		$(use_with webp) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms lcms2) \
-		$(use_with lzma) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		--with-fontpath="${EPREFIX}"/usr/share/fonts \
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
-		$(use_with svg xml) \
-		$(use_with zlib) \
+	local myeconfargs=(
+		--${openmp}-openmp
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_with threads)
+		$(use_with modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with postscript dps)
+		$(use_with fpx)
+		--without-gslib
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		$(use_with jpeg2k jp2)
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with svg xml)
+		$(use_with zlib)
 		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {