gentoo resync : 22.01.2019

4 files changed, 61 insertions, 10 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index a11e7f19a6d4..8c1455d8c01a 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,8 +1,10 @@
 AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3d0d687928d86487380e0b12b3b7f6458b827285806afa73034497265cae169998ab281f4687d736cc5e3e6df1b5 SHA512 de245f08860fd6fccbd4e617cb9dfe105d1a64ecb16fc37376c257f7547c91e5dffaa46531d21201497473d6708817e7015fe6c061379834b892de08bcc05ee4
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
+AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b2688e7b2fc575e6bc2cc18f79c23f5492f3486146cab639c90afd0ebedd53f9807d6db0ebfc77330df28425b SHA512 4e0ad52ecfc7c23ff59b97f165ec35d721a4395357983eaa7e7913387594cf6bae354e48e9b95652fb192b2d6044ecc931228cb2e6d225605adce5165fd81687
+AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
 EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627
-EBUILD exiv2-0.27.0-r1.ebuild 2478 BLAKE2B 222de85c2aed562cacd97bb736ac36a32d94f4124d0a84480be759c536cf44f25be479fab56a6a3cc364d67d2a12285add8f0efc4a7363bb523c85d3521dbedb SHA512 f0eaf5875cf114d6dec924f0cf28abec0a086b3312ab4edf618d9d54e23639a423f37a281737b263f88b356059d92bb4d69f6f874e7b3ae033ff8ae9d2ce090d
+EBUILD exiv2-0.27.0-r2.ebuild 2548 BLAKE2B 47101f43464f15bebc06c7fd3ac244f1ea7ecc4715741ea0c806573735edc71408f0222eed67cc62ffe6079858129e7a3bbe7d8e8f18ec235afbc09ef839967b SHA512 df5bac7f9ff377ea7a98dc02b18ae43bebd3ba240cb7173bae3dcb042c552178b243e93bf5722bd25967be653c2ec0015b2daa4d83900bbe4e184bf151ddf46c
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
index 4582b1acd6f2..80de16822e2c 100644
--- a/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
@@ -47,8 +47,9 @@ DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 S="${S}-Source"
 
 PATCHES=(
-	# pending upstream
-	"${FILESDIR}"/${P}-png-broken-icc-profile.patch
+	"${FILESDIR}"/${P}-png-broken-icc-profile.patch # pending upstream
+	"${FILESDIR}"/${P}-fix-pkgconfig.patch # bug 675240
+	"${FILESDIR}"/${P}-doc.patch # bug 675740
 )
 
 pkg_setup() {
@@ -61,11 +62,6 @@ src_prepare() {
 	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
 	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
 
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen &>/dev/null -u config/Doxyfile || die
-	fi
-
 	cmake-utils_src_prepare
 }
 
@@ -80,6 +76,8 @@ multilib_src_configure() {
 		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
 		-DEXIV2_ENABLE_XMP=$(usex xmp)
 		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
+		-DCMAKE_INSTALL_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html
 	)
 
 	cmake-utils_src_configure
@@ -89,13 +87,12 @@ multilib_src_compile() {
 	cmake-utils_src_compile
 
 	if multilib_is_native_abi; then
-		use doc && emake -j1 doc
+		use doc && eninja doc
 	fi
 }
 
 multilib_src_install_all() {
 	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
 
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch b/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch
new file mode 100644
index 000000000000..a57da03199c4
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch
@@ -0,0 +1,28 @@
+From f8f63a8b4033549d47384c6e2b1972ae1a2775fc Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Wed, 2 Jan 2019 10:28:57 +0100
+Subject: [PATCH] cmake: Use correct installation dir for generated docs
+
+Fixes #623
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ cmake/generateDoc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/generateDoc.cmake b/cmake/generateDoc.cmake
+index a3aea727..16823946 100644
+--- a/cmake/generateDoc.cmake
++++ b/cmake/generateDoc.cmake
+@@ -21,7 +21,7 @@ macro(generate_documentation DOX_CONFIG_FILE)
+     set(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config")
+     add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG})
+ 
+-    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION "share/doc/lib${PROJECT_NAME}")
++    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 
+     set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+ endmacro()
+-- 
+2.20.1
+
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch b/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
new file mode 100644
index 000000000000..5fc430e915d2
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
@@ -0,0 +1,24 @@
+From e706cca19027dbdf53aeac2041ecce9ccb313c17 Mon Sep 17 00:00:00 2001
+From: Luis Diaz Mas <piponazo@gmail.com>
+Date: Sat, 12 Jan 2019 13:39:12 +0100
+Subject: [PATCH] Fixes in .pc file for being compatible with more
+ distributions
+
+---
+ cmake/exiv2.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/exiv2.pc.in b/cmake/exiv2.pc.in
+index e477696d5..9018472be 100644
+--- a/cmake/exiv2.pc.in
++++ b/cmake/exiv2.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
+-includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: exiv2
+ Description: @PROJECT_DESCRIPTION@