gentoo resync : 08.05.2018

4 files changed, 172 insertions, 5 deletions

diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index ac22a347f4ae..4d4740b2aa6e 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -6,7 +6,9 @@ AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 BLAKE2B 5dfb05fd737d18cd3a355c2b8ba19c7
 AUX libwmf-0.2.8.4-intoverflow.patch 971 BLAKE2B f10b1b268144d790e8be24c94ece3a1d02961ed8436be22e26d742812ac3d1b4ff207bc978e2b6aba72e92aea8191f65b91dc8cfae5c5ca405b78f5b41c8b43e SHA512 939b729d2ca9c1204e623d50151d2a736904455e716ce917da83e454dc99165b77c2039413174bd9e219dc7453ef3c92348cc7bf1e3a1ade1d5040a81eb7cdee
 AUX libwmf-0.2.8.4-libpng-1.5.patch 478 BLAKE2B 355d3cd673a6ce5c09a13aac3b0badb7f1dfff112c4526b6be9b8a76cb1db4a0702bdcccbb5df20aa04976a4c54bfeba0fe11f66f2154c64f3ff2c3409491672 SHA512 acfa95c22d3d352b270d41cd814c1c876536da9a08a19eb40acb9770913fbd824654c90223413507d714248321cd6be9190187d3b00a75ed4a0a001a0800617c
 AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae2e4bd96eccb7bf12f8ba138a00cb5fb36725dad2a00ba4be71c8a61649f1e723204f59741e86da4517f802ce2743 SHA512 02170d7ec2cd0e987567becd995416c52b85d3f55d6e0e236ea8eeacdb3218edc1a1647d96f24b3dbe904ea3bcc6cacef1a6d82a0fbfa9d808dc061e11a154f7
+AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
 EBUILD libwmf-0.2.8.4-r6.ebuild 2758 BLAKE2B 3f2da42e0f8619f587962fc64bcfef793e243c478907cf3d5e3a0843a70e7a68e4a17c77ac959220ea340e83c84e4849650ffe0ff7ba66d65ee1e54118ddb2ca SHA512 0ed88a4ac51bf4c8ebca0bba2d43f936b8232b5f367012fb20e8423b2bd729a23c79931906bdc042db1789e4454d241fdca8bf49f99835bddfbeacf6a43da7b4
-MISC metadata.xml 248 BLAKE2B 1e0706f2cc3c67acf21c7d3abbdb65d08bb0e74bd9d63dbe280b98d0b58fa8f3b51030b2633654f4f345e659a030155c85a25faa7a491d03ad12468caad2a4bc SHA512 027605de999e5f246cbf861899aeea5ec9efeb1de5dcd5ff8f0b2f883135e208db85ac8d0e37a7caf300d293de3b6b6b9ed91d5fafc1c1b0d66bd65d79579cb5
+EBUILD libwmf-0.2.8.4-r7.ebuild 2496 BLAKE2B c38f5ca9d24dda46febb618e9e398001d2244a7692f77410b8db9c1982d74d1fc9ca70da7f00875e51a942e650e385e41189ea9daf30233d03481f6d1ae36b69 SHA512 fdc94e1ffe59453171bb06c62ad2af0bf1767085251e689d0c8a3944d35ef84f37b3a7075a80e1f6c752d10b58ce94158300c0425c894c45d2985ccb45b6cc73
+MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch
new file mode 100644
index 000000000000..0f133e2e75e2
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch
@@ -0,0 +1,67 @@
+From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Wed, 6 Aug 2014 14:53:03 +0200
+Subject: [PATCH] configure: use pkg-config for freetype
+
+Upstream-status: Pending
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.ac | 37 ++++++++-----------------------------
+ 1 file changed, 8 insertions(+), 29 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3cfe974..0055a8c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=DIR     use freetype2 in DIR],[
+ 	fi
+ ])
+ 
+-if [ test -n "$FREETYPE_DIR" ]; then
+-	AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH])
+-else
+-	AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
+-fi
+-
+-if [ test -n "$FREETYPE_CONFIG" ]; then
+-	if [ test -n "$FREETYPE_DIR" ]; then
+-		freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
+-		freetype_libs=`$FREETYPE_CONFIG --libs`
+-	else
+-		freetype_cflags=`$FREETYPE_CONFIG --cflags`
+-		freetype_libs=`$FREETYPE_CONFIG --libs`
+-	fi
+-else
+-	if [ test -n "$FREETYPE_DIR" ]; then
+-		freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
+-		freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
+-	else
+-		freetype_cflags=""
+-		freetype_libs="-lfreetype"
+-	fi
+-fi
+-
+-CPPFLAGS="$freetype_cflags $CPPFLAGS"
+-LDFLAGS="$LDFLAGS $freetype_libs"
++PKG_CHECK_MODULES(FREETYPE2, freetype2, 
++    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++    LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
++    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
++)
+ 
+ AC_CHECK_LIB(freetype,FT_Init_FreeType,[
+-	WMF_FT_LDFLAGS="$freetype_libs"
++	WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
+ ],[	AC_MSG_ERROR([* * * freetype(2) is required * * *])
+ ])
+ AC_CHECK_HEADER(ft2build.h,[
+-	WMF_FT_CFLAGS="$freetype_cflags"
+-	WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
++	WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
++	WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
+ ],[	AC_MSG_ERROR([* * * freetype(2) is required * * *])
+ ])
+ 
+-- 
+1.9.0
+
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
new file mode 100644
index 000000000000..48585c307475
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)"
+HOMEPAGE="https://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc expat X"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-fonts/urw-fonts
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2[X?]
+	virtual/jpeg:0=
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2= )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
+	"${FILESDIR}"/${P}-CVE-2015-4695.patch
+	"${FILESDIR}"/${P}-CVE-2015-4696.patch
+	"${FILESDIR}"/${P}-gdk-pixbuf.patch
+	"${FILESDIR}"/${P}-intoverflow.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-pngfix.patch
+	"${FILESDIR}"/${P}-use-freetype2-pkg-config.patch
+	"${FILESDIR}"/${P}-use-system-fonts.patch
+	)
+
+src_prepare() {
+	default
+
+	# Fixes QA warning "This package has a configure.in file which has long been deprecated"
+	# Since there is already a configure.ac, we don't need the deprecated configure.in
+	rm configure.in || die
+
+	if ! use doc ; then
+		sed -i -e 's:doc::' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# Support for GD is disabled, since it's never linked, even, when enabled
+	# See https://bugs.gentoo.org/268161
+	local myeconfargs=(
+		--disable-gd
+		--disable-static
+		$(use_enable debug)
+		$(use_with expat)
+		$(use_with !expat libxml2)
+		$(use_with X x)
+		--with-docdir="${EPREFIX%/}"/usr/share/doc/${PF}
+		--with-fontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
+		--with-freetype
+		--with-gsfontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
+		--with-gsfontmap="${EPREFIX%/}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
+		--with-jpeg
+		--with-layers
+		--with-png
+		--with-sys-gd
+		--with-zlib
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libwmf/metadata.xml b/media-libs/libwmf/metadata.xml
index 12310dcd7d27..e40036b891d5 100644
--- a/media-libs/libwmf/metadata.xml
+++ b/media-libs/libwmf/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">wvware</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/wvware/bugs/</bugs-to>
+		<remote-id type="sourceforge">wvware</remote-id>
+	</upstream>
 </pkgmetadata>