gentoo resync : 21.12.2017

3 files changed, 20 insertions, 3 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index fae0e8992cb1..5a802d53deb6 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,5 @@
 AUX scribus-1.4.0-minizip.patch 1891 BLAKE2B 407d5a46210573f511572ef3dd3e25f7b23a7a83b86e48878df9b71c4669a53a6bb8df80de51e42049dc363a14e4246d11c67c046bcebb85748db78300be14cb SHA512 99feefb8e4ba9ae903e6a7a68b4cd497572ef254b550c864135e20392902e3595ea4414916474d5e80ceabc66e6cc5fac09af41955cbb2ba8e8d41480009bd86
+AUX scribus-1.5.3-cmake-openssl.patch 737 BLAKE2B 276d3ad6804506ef4d4c041ce1e0bbf943fe4325e933c9d56401690d1bbd38317898dd5ab00311ee3dd92a873255f615a6b8c415d3c7a6878ce0469ac2a24853 SHA512 63ef4eaa68aad8811150e4208842e602640a7e2e034d2923b79318ca1bcb433829daf7fb6b33fcd22d3e2e9f4103c5f7c6d76883970307ea280c0bfd6df80d61
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
 AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
@@ -6,6 +7,6 @@ AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c272
 DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 EBUILD scribus-1.4.6.ebuild 4201 BLAKE2B f0a9f6c762ac9284f310ba312c380812d1d31c80525afeb86e9dce9f8ac7c015510243360f9c2df9c86e055d6425703ba1015b20d8f32e4131b1243db027280e SHA512 cc1b338a59557e15c17eee40b1d5f77153264705287a5ed36dcf5c503f1909268d63ba1b759f669a7a9a79226e9058457f2aa412ae85b0facf7250939f5a6239
-EBUILD scribus-1.5.3.ebuild 6695 BLAKE2B 2dd4a067750124f800343eb8b5652a6099d34a5b83947d9aa79902b726b718d15b511aca907dab28cdad697861bb6565074f30bf026f3a9f1a0a82e1758b7acb SHA512 1325a44ef7090dc87d9a39658d85f1a0328c7443dd3e8e74cd5e2b7daa98bee6abe02672220085db8d9aec9ce928a01dff68262903e22c02c8de4f76f7173979
+EBUILD scribus-1.5.3.ebuild 6727 BLAKE2B 0cadfb4da5ace2ed80f1457a73d301a787cd621246fe734d235b3bafc0d8f015f339182914f128cd1222c1d1d6bb3cdbf670cd586882b6a036bd88603c830f40 SHA512 ea6719f3765bde734bd95e6ebf8f07ce0b2915451315a76ca6626b693da7b1b8bdee38489cf76211ffd6c060249bd3f11f58966a2a9a0d64052a8f5bbf255880
 EBUILD scribus-9999.ebuild 6686 BLAKE2B 8796d4078c26fbb64b897fe2e346988231f21f4fdbdc797adfa2002c4c5f7d94c024757f825c149ec55c2822e92167d06de4a1b4abf04c2a9988f6bd8fc1ef30 SHA512 e1d92175029bd07824ab1e92875fcdbaff3c830e274e9002189fc7edb76bb1e39102bdd7d0b4473363dc727a3abceb5ff63cacf4ae2593d9d272768f1e4d4523
 MISC metadata.xml 895 BLAKE2B 9f470d1d5f1eec9f76aca47dce40a3b276f3c7646f0a89ecc69f09f2644af7622655eadbe76486e3f1312fc282400592d7bfcddf3fe4c12b865c7642f61174b6 SHA512 a4b3ba4d363b674e781faa22cab86ef0455b235d9aa1bc4da12b4cc1ae4f23b954f81fdd4ca2348057d2c5108b141a4d6f3307eaf8ff79f76a2754538b80faa1
diff --git a/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
new file mode 100644
index 000000000000..c2cb5e9dd58e
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
@@ -0,0 +1,15 @@
+Description: Fix case of "OpenSSL" to match the case of the file shipped by cmake
+Author: Mattia Rizzolo <mattia@debian.org>
+Last-Update: 2017-06-05
+
+--- a/cmake/modules/FindLIBPODOFO.cmake
++++ b/cmake/modules/FindLIBPODOFO.cmake
+@@ -45,7 +45,7 @@
+ 	#message(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}")
+ 	set(LIBPODOFO_VERSION "${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING "PoDoFo version string")
+ 	if(LIBPODOFO_VERSION VERSION_GREATER "0.9.4")
+-		find_package(OPENSSL)
++		find_package(OpenSSL)
+ 		if (OPENSSL_FOUND)
+ 			message("OpenSSL found OK for installed version of PoDoFo (>= 0.9.5) - Enabling support for PDF embedded in AI")
+ 			set(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo found")
diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index a6585de00ff1..d28665aead77 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-cmake-openssl.patch
 )
 
 src_prepare() {
@@ -199,13 +200,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }