From: Alexys Jacob Date: Mon, 23 Feb 2015 11:26:48 +0000 (+0000) Subject: fix #536778 by Thomas D. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e36d6cc83646fc4311857b5e794caecb17c9e87;p=gentoo.git fix #536778 by Thomas D. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB658FA13 --- diff --git a/dev-libs/liblognorm/ChangeLog b/dev-libs/liblognorm/ChangeLog index 6c1678a2cf06..1c90fe1bffdd 100644 --- a/dev-libs/liblognorm/ChangeLog +++ b/dev-libs/liblognorm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/liblognorm -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/ChangeLog,v 1.31 2014/10/05 07:25:00 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/ChangeLog,v 1.32 2015/02/23 11:26:41 ultrabug Exp $ + +*liblognorm-1.1.0 (23 Feb 2015) + + 23 Feb 2015; Ultrabug +liblognorm-1.1.0.ebuild, + +files/liblognorm-1.1.0-fix-enable-docs.patch: + version bump fix #536778 by Thomas D. 05 Oct 2014; Agostino Sarubbo liblognorm-1.0.1.ebuild: Stable for x86, wrt bug #524290 diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest index bc1e20b5e74d..45ab24a43d83 100644 --- a/dev-libs/liblognorm/Manifest +++ b/dev-libs/liblognorm/Manifest @@ -1,29 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX liblognorm-1.1.0-fix-enable-docs.patch 1556 SHA256 6dc2fe548f6ef1d134db4224bb62ba0f2f3d71902f734638cb27cbb483bcc9b1 SHA512 44cfc8201ed944888d1846a49faddd6a9056466338c368552bfbbf82f79e7cea8e220af9bc5715f1064cd27e9eae8f0ff5fe3eeb982e9443b3d0b88235aafb11 WHIRLPOOL e994834bbbbbef0b505056f09932291a36c210f94f269c9789a671ed8611b72d015278d9cb793ce68d458e2a0462fc32010a6a99fcd2603c16174f1fd782d31c AUX respect_CFLAGS.patch 436 SHA256 2b13a79bd560ec1a753a9bcbfe44b3233e0aae7f17bd52ee03f603f643ab8581 SHA512 fe284d7bcee9cc094e5a213f16815e07ad08615ebdd6ea00d652d9f0d23aa23664b857ecda2877679878bea5bfb91f05ea0aa775d66e06e8a407c26b5fc784eb WHIRLPOOL 4e9b3804716e7d3933f4e50f64b512d3b6ab96b9ad3d6773a77e47fb3de813d2016268b8a1cece2f8233c1dd09d32c30e8b3f9ffe9ae699a14856bc47992cc7d DIST liblognorm-0.3.6.tar.gz 345483 SHA256 e2cf27027905c7be91c891b5ac9304a88a5c1981cd36011c84b45de29336b111 SHA512 86138738c7945861cf012bb0148d747c1161956db9bc60589e5b91d6210aa7fcf9b28bc63ab3d865d8c20be26ed1654de4a942b5e9a4d32a967978ad6693a77c WHIRLPOOL dc6f95ae0f9f1f7f6251ec2826366660a54808f09dfc08ac70c112d1afccae24a93791c0fd34d5e07f2232a502d3880507f094ce30fd7c7098c5d24e8ce06e5c DIST liblognorm-0.3.7.tar.gz 346903 SHA256 b000ab7aab9ed3d7a2c23303463b5bcceb7bb6538714bd41248d02913a82e223 SHA512 f7dac7b913d61cc86bf55d0278ae96055e5336ba304fefb3abf4604976f1713ad5e6bba983a1d29b71cac987e9587e5310454e9ae9e07c3f332cd2ce329c9164 WHIRLPOOL 521ea13c8311fa9411bfc026b7a6118e8a34dafcdc298b9ff8115c555bf7614f7afb3f49f806b9bbbc377f97e9d95402261f515b7cd55dcd9f45c40c89d1ad38 DIST liblognorm-1.0.1.tar.gz 475226 SHA256 1f6cdfd901a8f6a97a3cb74bc6107c6746b3e9381f7889e4cd866a488e0c59a5 SHA512 89425d612d4b256f15b224d255c05550a0ac5eae19b886646bd618a49eedb17cf4d4ab641b238ccc9bbd8b6418c53cba04a42977b9cb2804d0380f539ad77782 WHIRLPOOL 72581b4b32bbacb476a0405ac68c44d6f5d364b866ddd3f32c620359dbde07ccf787bde2a86165308020bd820b6c4edfe9764a76c5fccbbee4c865be9cccab25 +DIST liblognorm-1.1.0.tar.gz 499355 SHA256 2ddff2ee893c9268e19868f19dc4d8037e3d266c0d001436c33c9429fcbb3030 SHA512 f694d47c8e60871f0f3ce1fe8092b2596850beea618760c289d9cec6068fb8e8e260f4abb3faf20b931864d91ed18f640c65235fd693f6c67ce232fa11006107 WHIRLPOOL b03347d89e86d858d98a2237b6319f1646c995b5a725b486a9288de9a1cfc243b826c822a22f9e5a2a6f3c13c68a2e408ee8d5a68f2c361aeb40bc1b7d8af644 EBUILD liblognorm-0.3.6.ebuild 691 SHA256 3aebfcfe454da371b47aea732dfef3d4984b592c4153c53e8d7f9598763c4b88 SHA512 2ca01a4986f405ebaf3794bbbb7cac221039e738d942f9edb588cb556f83e23eba3441884dbe3344dd15b86abc67bb46cf87546acfe362de1f824d9192b4b9ad WHIRLPOOL fceabdfc6422fdb80f468d007d8f89756e9a038e9fb5894f4f545d1452d66ab6f731dac6a9c1514b95eecc168b9fddbd08cf739b3aba8edc371c72aaa0360efe EBUILD liblognorm-0.3.7.ebuild 776 SHA256 f055251c1b6dd686dbfaa87d939f097f7aaa0f233066db92c2f38a49250f9ff1 SHA512 cd9f770ea1f2168ccb9d3b43a5dcf63c741c098ff7a87bb9223f061b337662e55be31b2a378c09ff39dee51599ca3457ef8d59a793644aeabed2e8afbf0abad4 WHIRLPOOL 2d582e4e20149ad392c7b812b41e8789dab87373dd703b1a4b8777aa69ffce9b60f3e22e8fd509f5b698aa6c7c9e82a883cf476e8fc8501a0062554daf1126a2 EBUILD liblognorm-1.0.1.ebuild 966 SHA256 db5fde1f68ec1539ffde5648fcb2dfcb67d9d836d77457575294480638cf9f13 SHA512 d3e70fdc418a39544b8ee2b68bb856e959cddf53a266546b4c5f1c1d26a3375b1b18d3aecbb412271ccb0bea2899fed5b3d11b6c528112a8ac9ec984fb853c54 WHIRLPOOL d1d18324906665fd211cf071e1c0614843d5ba0caff7d3a1b0c25b73df4fde557036db9e3663fca6754636c2151efa3541decf27b5c1f3b3769127b03c2b7695 -MISC ChangeLog 4727 SHA256 6a1856dd0f90ab91dc1b8122949b1a6a62a46506ab920e81975898e6149ae22c SHA512 b914f692c111e414142a0f64e76616c759acbb2d73f790deece7e6a71d2c29b5a9bb0938db832c53fa147b75b9070b11f3552ed0345239bdab6a5a3a4fd104ad WHIRLPOOL 1ebeb0e62ca3d14e99a56b6775e14b23148d2b7c3683c67c1fa225129298b28ee4dac9de2988070ac164801441a6b360b3b0721fb8d39cd6f21bbbf6653ce004 +EBUILD liblognorm-1.1.0.ebuild 1037 SHA256 6aec08fec954a25def154231e6fc1b864c319c2d2f89e12e98d51547c58f346a SHA512 2a343c2a52f4827a88758e0274649641f243d8f645433b1979bc4a9a87aa297f8bd572315d16cf3c8256f2fca1bafa0151f127cce28a6f3dc96329dc545a267c WHIRLPOOL 319b553c40ff03a62a8fd55549502a509e0acc2bc7b9d088a59039a87acbf07bdd9f2fcd8767fca95ce39fe532d9f4fd75ff76ab0e57d277dd4188576b1712c5 +MISC ChangeLog 4927 SHA256 a237e5feacc3f264e7d7c3a3c10650025c8d738f8425ded6881096102fc6b562 SHA512 96057c0750a8c505e035ae8b66914f61ba9055f54f0149484b19df99f24e9684a55d521ad49b5d99c1a7f651a54ec953d28c4c9455f7a9840ce898b3b42c8922 WHIRLPOOL 843678ed1b89e6b3c610fb84d7729fbf84bdb7b327353ce351c4fc49e84930abe6cffd3e4dac040ca3224ffccd71eaf84982004b284614358a2b3a48eeec6a1c MISC metadata.xml 307 SHA256 1c986d470983173b751b4e065b2b369aeab7952c31e9b419e9f8b0de307924ca SHA512 6305dad4a942c7f0f51bbe91d7f5b78ac6fa1b4b05a09998b2a37537bc3845174d64ee08475924aac0e764bd79b0e166894aafeb6cc34e4225ddbc7965a03b0e WHIRLPOOL 00ef3e80f9b4daf61e1393d8dac378ea83b33ea5283bf5d52af2d854b432c2041d8d5d0dbd8fe9e502299d3bb4852bb58c8c6c44b1e1eabfc8fb3d977da4e035 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUMPJNAAoJELp701BxlEWfhdUP/jRoEJf5aygAl7TGpF974NnC -M0TosejRtDWZHmXAJdT10uiwuhTBWB5a9WupKW49w3IL7gnWvvg2qVp3uWrghhGv -NFPJTf+na0Q5H7W7cyCvmEN+MwglugMfoe84i6OZ8j/TtO7kNNXUQ4dLuMNzLrTH -rK229If3bVXmjwMlbgATg+m6rrBp5m5pApzfcjF0ez5YhokRkcMk9L5/e5RP8ILo -y0FUmhh4WVcZ10ot9r+0WVvEbZteQc2+vOQ/P4q40RAivJD6SG2O4KHluq2xtb9t -IxSizh4fnVHRZyJd+XTEUwFwXYb9w7REYDF0yAaA/G1tZ+jCfCxWQjWmcIcOkShO -nh7INRfhdXBRxW+D6s1vOzm9Jc/no8NPluVRwLWtmMWiZGWo8T1Nl6sIGtodftYz -27YbtXG1AGpISEQs47sxEOjTThzaS7A4JBIS3sa2XmZLHTLJiISochv2T+VPcFD7 -Qshw4/D5gATG6vog1WCCs6DNG4SwiGqyb5eo0ItQ6agOVNHAG9aTtjvCl3Ssuxvy -lnyDbEKtQ8YRkP78rhgt0Og16iI8uAWMSpe2FwyM/S2BVFDTodH1AdkBuVESZj85 -0vZxYDK84Kz+Jxevt2yICPhYhgoe852kTkIWOWxlFhQM/Pv79qEZwyG5p3UOh9XH -o9e19uHxykAZtJoX6uZB -=81y0 +iF4EAREIAAYFAlTrDnYACgkQKiQSS7ZY+hMNaQEAiRs/SMmqt5olN7TwkUrQmm/O +iniYtjkKo4PDPEQsZW0BALK1fxVXn77s1tRwIF8zt9/se9aNaEKXaO0b3fJBz7zo +=+jEY -----END PGP SIGNATURE----- diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch b/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch new file mode 100644 index 000000000000..3bffe5ec74f0 --- /dev/null +++ b/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch @@ -0,0 +1,41 @@ +[PATCH] Turn --disable-docs into --enable-docs and make it work + +See upstream issue #16 for more details. +--- + configure.ac | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 547908c..26a2f96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,15 +96,21 @@ fi + + # docs (html) build settings + AC_ARG_ENABLE(docs, +- [AS_HELP_STRING([--disable-docs],[Disable building HTML docs (requires Sphinx)])], +- [enable_docs="no"], +- [enable_docs="yes"] ++ [AS_HELP_STRING([--enable-docs],[Enable building HTML docs (requires Sphinx) @<:@default=no@:>@])], ++ [case "${enableval}" in ++ yes) enable_docs="yes" ;; ++ no) enable_docs="no" ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;; ++ esac], ++ [enable_docs="no"] + ) +-AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no]) +-AS_IF([test "$enable_docs" = "yes" -a "x$SPHINXBUILD" = xno], +- [AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs])] +-) +-AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = yes]) ++if test "$enable_docs" = "yes"; then ++ AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no]) ++ if test "$SPHINXBUILD" = "no"; then ++ AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs]) ++ fi ++fi ++AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = "yes"]) + + AC_ARG_ENABLE(testbench, + [AS_HELP_STRING([--enable-testbench],[testbench enabled @<:@default=no@:>@])], diff --git a/dev-libs/liblognorm/liblognorm-1.1.0.ebuild b/dev-libs/liblognorm/liblognorm-1.1.0.ebuild new file mode 100644 index 000000000000..1629e97de877 --- /dev/null +++ b/dev-libs/liblognorm/liblognorm-1.1.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-1.1.0.ebuild,v 1.1 2015/02/23 11:26:41 ultrabug Exp $ + +EAPI=5 + +AUTOTOOLS_IN_SOURCE_BUILD=1 +AUTOTOOLS_AUTORECONF="yes" + +inherit autotools-utils + +DESCRIPTION="Fast samples-based log normalization library" +HOMEPAGE="http://www.liblognorm.com" +SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/1" +KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux" +IUSE="debug doc pcre static-libs test" + +RDEPEND=" + >=dev-libs/libestr-0.1.3 + >=dev-libs/json-c-0.11:= + pcre? ( >=dev-libs/libpcre-8.35 ) +" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +DOCS=( ChangeLog ) + +PATCHES=( + "${FILESDIR}"/respect_CFLAGS.patch + "${FILESDIR}"/${PN}-1.1.0-fix-enable-docs.patch +) + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable doc docs) + $(use_enable pcre regexp) + $(use_enable test testbench) + ) + + autotools-utils_src_configure +}