gentoo resync : 15.12.2017

3 files changed, 151 insertions, 2 deletions

diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 49209a2d89e6..1b1d8c048ce8 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,8 +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
-DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
-DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
+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
 EBUILD graphicsmagick-1.3.26.ebuild 3275 BLAKE2B 86e28c2249ac008c44142aa589e23e768a60d402853c5047daa09d761f4c541926a61b6b9b85fb62a56a6dd2dfddff30df09439b0bfd1c228e4aebec357158d5 SHA512 a28b4b47c1d4c7860be37b8480ecca5055008157969f208878c951068ab901cded604370663154c95f742c011a98554ac67e1f97a8e0b3a052cc01c8cb6a6696
+EBUILD graphicsmagick-1.3.27.ebuild 3328 BLAKE2B f5d875ab2453ac54f0b14167e0dfe3f50b4a0ff1ded2abe46f99e0af64bee2d4323f51cef2cc9c3f7446d2e9ed8d05c66a8e604ee946075786aae02e23e084d9 SHA512 f332bfdbc0d195f829911013de959a9990e53349ee223b695f624a286411ec0557c4132ceb1703dec79e634adda7bec9d3cb2ffb86ed238f39b8bde5e884ee5c
 EBUILD graphicsmagick-9999.ebuild 3283 BLAKE2B 7601699987f34923ca2dfa74b7a91584bf62a4c68c07761d77229522a10726450ae8821c3b5fcacbf5e4c8cb62e525d41763ca55c7082f41c9894104a0024495 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480
 MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
new file mode 100644
index 000000000000..e21b8e7de7e8
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
@@ -0,0 +1,11 @@
+--- a/version.sh
++++ b/version.sh
+@@ -27,7 +27,7 @@ PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
+ #
+ # Formal Package release date
+ # Set to string "unreleased" if package is not a formal release.
+-PACKAGE_RELEASE_DATE="2017-12-09
++PACKAGE_RELEASE_DATE="2017-12-09"
+ #PACKAGE_RELEASE_DATE="unreleased"
+ 
+ #
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
new file mode 100644
index 000000000000..8c694d25b729
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+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"
+
+RDEPEND="dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper:= )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0 )
+	postscript? ( app-text/ghostscript-gpl )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+# corefonts are required because needed arial font (bug #588398).
+DEPEND="${RDEPEND}
+	test? ( media-fonts/corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.19-flags.patch
+	"${FILESDIR}"/${PN}-1.3.19-perl.patch
+	"${FILESDIR}"/${PN}-1.3.27-version.sh-fix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		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) \
+		$(use_with X x)
+}
+
+src_compile() {
+	default
+	use perl && emake perl-build
+}
+
+src_test() {
+	unset DISPLAY # some perl tests fail when DISPLAY is set
+	default
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		emake -C PerlMagick DESTDIR="${D}" install
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}