commit: 427e056412e26e040b713d83bd581b760244f555 Author: Wade Cline <wadecline <AT> hotmail <DOT> com> AuthorDate: Fri Sep 15 22:25:58 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Fri Sep 22 09:48:29 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427e0564
dev-libs/libmowgli: version bump to 2.1.3. This commit: * Adds back libressl support. * Properly honours the 'ssl' USE flag during configuration. * Removes deprecated 2.0.0 ebuild. Closes: https://github.com/gentoo/gentoo/pull/5761 dev-libs/libmowgli/Manifest | 2 +- dev-libs/libmowgli/libmowgli-2.0.0.ebuild | 22 ---------------------- ...bmowgli-2.1.1.ebuild => libmowgli-2.1.3.ebuild} | 14 +++++++++++--- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest index 7962384462e..aa71f6942fa 100644 --- a/dev-libs/libmowgli/Manifest +++ b/dev-libs/libmowgli/Manifest @@ -1,3 +1,3 @@ DIST libmowgli-1.0.0.tar.bz2 105929 SHA256 8ea0dfd606b0ac280747c9a5f93ca940c23c7367dee0776715c87623ae6624fb SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313 WHIRLPOOL 209cb5a81003eac9952a771a0afc08073f242566e28d378432a0f172b8b195ccfc03b1a8f85949f1d22063c1519afd48b6263de7e4403a14c365de94d5f8f83e DIST libmowgli-2.0.0.tar.gz 200771 SHA256 7c5a94082899d055fc9a02b94e2658b42616fdb98e58e9a71165c07b6f5cceba SHA512 efccd93824c116fa8440f1d327382997f7d752d007dc9fad650ef1935fe0cee1a3fa1c645442a3f3f0f6d9f2916f66882e537a1692c494303fc0bf062df51e3a WHIRLPOOL 75c5698e1ccc5e1895d8d5f35d00347ceaf5424a621ecae399ebfe6537bf591edc21d0e42f7923704e3c857cc7349447d514605bb1d3e0e78f136e530933e8ed -DIST libmowgli-2.1.1.tar.gz 227731 SHA256 98d6cf3faba0a6f3e919598cbb21e069f4ba77af09ec968f377ac1b5d3f507d2 SHA512 9880d4fcfba28cf0fb19033b48f95cd3555efd6f3e6a7a2c9f39be2a07df0217eb9ce83fa18ecc6707a04252dbaf6be4efce8258100e3da0a64690a6801b8882 WHIRLPOOL 1279b09a464535d225924de5092b199d0d0c56530a55a765db3113dd6e696ec2501567e354109cd925050099805728251e8d293f76ec0779d15bed5da314d1a5 +DIST libmowgli-2.1.3.tar.gz 227742 SHA256 b7faab2fb9f46366a52b51443054a2ed4ecdd04774c65754bf807c5e9bdda477 SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533 WHIRLPOOL d22e33fa4741282779f2ae341e5cdd3ecf18a5d9812e708a5ddd0df51f7a30fdc5b4c8f611187f894d2975f9a013d8f841268be75369abba56407a9d66c50d7f diff --git a/dev-libs/libmowgli/libmowgli-2.0.0.ebuild b/dev-libs/libmowgli/libmowgli-2.0.0.ebuild deleted file mode 100644 index 1017a87a9e3..00000000000 --- a/dev-libs/libmowgli/libmowgli-2.0.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Useful set of performance and usability-oriented extensions to C" -HOMEPAGE="http://atheme.org/projects/libmowgli.html"; -SRC_URI="http://atheme.org/downloads/${P}.tar.gz"; -IUSE="ssl" - -LICENSE="BSD-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -RDEPEND="ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND}" -DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt" - -src_configure() { - # disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1 - use !ssl && myconf="--with-openssl=/dev/null" - econf ${myconf} -} diff --git a/dev-libs/libmowgli/libmowgli-2.1.1.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild similarity index 71% rename from dev-libs/libmowgli/libmowgli-2.1.1.ebuild rename to dev-libs/libmowgli/libmowgli-2.1.3.ebuild index 56ce51b46f3..bf373213c27 100644 --- a/dev-libs/libmowgli/libmowgli-2.1.1.ebuild +++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild @@ -10,11 +10,19 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="ssl" +IUSE="libressl ssl" -RDEPEND="ssl? ( dev-libs/openssl:0= ) +RDEPEND="ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) !=dev-libs/libmowgli-2.1.0" # Bug 629644 DEPEND="${RDEPEND}" -DOCS=(AUTHORS README doc/BOOST doc/design-concepts.txt) +DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt ) S="${WORKDIR}/${PN}-2-${PV}" + +src_configure() { + econf \ + $(use_with ssl openssl) +}
