gentoo resync : 08.05.2018

3 files changed, 43 insertions, 21 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 9c45bd56e44b..123b4a1007fc 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -4,9 +4,10 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c
 AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab
 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
+AUX inkscape-0.92.3-freetype_pkgconfig.patch 489 BLAKE2B 4f0e9dda521f21dc888267193ddba63ec89011cf8dbd32c0901991e58397f0c22134c1a7647239cb6bc26c4d45d5583bbaac83fb4a26681122cc8cf488a93a58 SHA512 da286f5eea8bdc443d0b4b3c2ffb6a403b4ea85f7f355545ea5dde05bb75e59e0a0bb42d28d5cbc77115acd2e0ebecf48536664a508ffb788c7f3e09a59557b4
 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
-EBUILD inkscape-0.92.3.ebuild 3838 BLAKE2B 73b22aecff0f4859f0e304da287000b146e4d0aa8aac3ca37d42ae623cd29ec969bee9245ceafe014c7dab7051bfcbdf3465c6b7ff6924040ce457e797fcf66c SHA512 9f3dbb7c4d173d310feff9b74927cacc4b8ad3f7b21e57666adebb70928a7fd17854a83610eabe728a1727f55383a41a67fc168584a854ec5b36e022f3a5470a
+EBUILD inkscape-0.92.3.ebuild 3930 BLAKE2B fe7b6e7abe4806624c35692799ffc5a93ce9dc5e52eeb37cc2eaec94ee00f3e1a3e3b71f5fba29a94107ea5174eae0cfdbaaa7e5751155fcae4ce01056fef5b2 SHA512 22355189fa8220e08d1120c830a58093bfe985a58bf739491e6ec23a9f421e3342fb5d2c9c6f6416b39926989167adfda32ea802b43803f7896b7d07f8eb596c
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..0f577bd0e9ab
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
@@ -0,0 +1,18 @@
+--- inkscape-0.92.3/configure.ac
++++ inkscape-0.92.3/configure.ac
+@@ -252,12 +252,9 @@
+ 			 [#include <malloc.h>])
+ ])
+ 
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "x$FREETYPE_CONFIG" = "xno"; then
+-	AC_MSG_ERROR([Cannot find freetype-config])
+-fi
+-FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
++PKG_CHECK_MODULES(FREETYPE, freetype2,,
++	AC_MSG_ERROR([Cannot find freetype])
++)
+ AC_SUBST(FREETYPE_CFLAGS)
+ AC_SUBST(FREETYPE_LIBS)
+ 
diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
index 69b0c27405f4..cc1ee8f61d9e 100644
--- a/media-gfx/inkscape/inkscape-0.92.3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_REQ_USE="xml"
 
 inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
 
-MY_P=${P/_/}
+MY_P="${P/_/}"
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
@@ -100,9 +100,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
 	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
 )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 RESTRICT="test"
 
@@ -128,23 +129,25 @@ src_configure() {
 	# aliasing unsafe wrt #310393
 	append-flags -fno-strict-aliasing
 
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable openmp)
+		$(use_enable exif)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		--enable-poppler-cairo
+		$(use_enable wpg)
+		$(use_enable visio)
+		$(use_enable cdr)
+		$(use_enable dbus dbusapi)
+		$(use_enable imagemagick magick)
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_with spell gtkspell)
 		$(use_with spell aspell)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -154,8 +157,8 @@ src_compile() {
 src_install() {
 	default
 
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
+	find "${ED}" -name "*.la" -delete || die
+	python_optimize "${ED%/}"/usr/share/${PN}/extensions
 }
 
 pkg_preinst() {