From 62f82c107c3904ac6917ece47301d2999c7dd90e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:17:25 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/libetonyek/Manifest | 3 ++- app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch | 12 ++++++++++++ app-text/libetonyek/libetonyek-0.1.8.ebuild | 9 ++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch (limited to 'app-text/libetonyek') diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest index 01a514a334cf..b6ae26a14c21 100644 --- a/app-text/libetonyek/Manifest +++ b/app-text/libetonyek/Manifest @@ -1,6 +1,7 @@ +AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865 EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c -EBUILD libetonyek-0.1.8.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3 +EBUILD libetonyek-0.1.8.ebuild 1218 BLAKE2B 27d32c5df3acc0abbfbd33ed52dc5893ca124bfe77d2e8dfe8176aad2b0f78d0e8b2fb418006b5d8c3d4d62ef94faf19f34dba6b06d3e3d4a8dbc5e0433b6bf6 SHA512 95166c5ede3f644277b2b5efa36ce212a288916b8bd690bb24107b35008005dce89e92bec7d52419d9ede991301b4144f9603d7d75bd5270b86fb0e374575d50 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch new file mode 100644 index 000000000000..db78fa81d471 --- /dev/null +++ b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch @@ -0,0 +1,12 @@ +Gentoo-bug: https://bugs.gentoo.org/657820 + +--- a/configure.ac 2018-03-18 14:51:31.000000000 +0100 ++++ b/configure.ac 2018-07-11 23:13:14.901127036 +0200 +@@ -119,7 +119,6 @@ + saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${GLM_CFLAGS} ${CPPFLAGS}" + GLM_headers="glm/glm.hpp" +-AS_IF([test "x$enable_tests" == "xyes"], [GLM_headers="$GLM_headers glm/gtx/io.hpp"], []) + AC_CHECK_HEADERS( + [$GLM_headers], + [], diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild index 39b6f10a69f8..7e445ac2171a 100644 --- a/app-text/libetonyek/libetonyek-0.1.8.ebuild +++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild @@ -4,7 +4,8 @@ EAPI=6 EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" -[[ ${PV} == 9999 ]] && inherit autotools git-r3 +[[ ${PV} == 9999 ]] && inherit git-r3 +inherit autotools DESCRIPTION="Library parsing Apple Keynote presentations" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" @@ -20,7 +21,7 @@ RDEPEND=" app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 - sys-libs/zlib + sys-libs/zlib:= " DEPEND="${RDEPEND} dev-libs/boost @@ -32,10 +33,12 @@ DEPEND="${RDEPEND} test? ( dev-util/cppunit ) " +PATCHES=( "${FILESDIR}/${P}-glm-0.9.9.patch" ) + src_prepare() { default [[ -d m4 ]] || mkdir "m4" - [[ ${PV} == 9999 ]] && eautoreconf + eautoreconf } src_configure() { -- cgit v1.2.3