summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-12-01 15:49:25 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-12-01 15:49:25 +0000
commit090cf63019183f9e511458b28192f2357761e602 (patch)
tree5a71dad74bf20ec2da9d4e71a5cd54fc43ae04c9 /net-libs/libmicrohttpd
parentRemove the id's that should work. (diff)
downloadhistorical-090cf63019183f9e511458b28192f2357761e602.tar.gz
historical-090cf63019183f9e511458b28192f2357761e602.tar.bz2
historical-090cf63019183f9e511458b28192f2357761e602.zip
New upstream release. Address some test failures, bug #334067
Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64
Diffstat (limited to 'net-libs/libmicrohttpd')
-rw-r--r--net-libs/libmicrohttpd/ChangeLog8
-rw-r--r--net-libs/libmicrohttpd/Manifest6
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.3.ebuild (renamed from net-libs/libmicrohttpd/libmicrohttpd-0.9.0.ebuild)25
3 files changed, 27 insertions, 12 deletions
diff --git a/net-libs/libmicrohttpd/ChangeLog b/net-libs/libmicrohttpd/ChangeLog
index ea200c72a33e..0b08e6c805d2 100644
--- a/net-libs/libmicrohttpd/ChangeLog
+++ b/net-libs/libmicrohttpd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/libmicrohttpd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/ChangeLog,v 1.2 2010/09/18 22:13:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/ChangeLog,v 1.3 2010/12/01 15:49:25 chithanh Exp $
+
+*libmicrohttpd-0.9.3 (01 Dec 2010)
+
+ 01 Dec 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ -libmicrohttpd-0.9.0.ebuild, +libmicrohttpd-0.9.3.ebuild:
+ New upstream release. Address some test failures, bug #334067
18 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
libmicrohttpd-0.9.0.ebuild, metadata.xml:
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index c9eeb0cb89be..3d2e209ba3a1 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,4 +1,4 @@
-DIST libmicrohttpd-0.9.0.tar.gz 686311 RMD160 b43e28eb7b892ad1ae4a4c16a377416aec85d569 SHA1 f2e0e02e9f4cdf0e35fffeadb719a318a40ed33a SHA256 106f0599d60c9caaee36334d96cc4198ed6d392b1a45523e46f226bd24a680d5
-EBUILD libmicrohttpd-0.9.0.ebuild 952 RMD160 4cced31f3382c750eae03bbfc0348c55d6ae77ed SHA1 ad0ce88e1c22943991752addaabe7b634fc3454c SHA256 7bc41bea4b022fb11d5eb3182be1ec77c2ffcb6f2c72e064f58346713f154fae
-MISC ChangeLog 609 RMD160 bdb798dd08d1d9e5e3cf7de208cb00c9df1d0579 SHA1 896962bacec96381555318390c0eb3e8e65448bb SHA256 c16efb71f50eb47c66864497a5917e137da15a299a9db0e0ace7004289d157dc
+DIST libmicrohttpd-0.9.3.tar.gz 744269 RMD160 49f20fe1a945f7de235fb6b7ec7f30a9f95a0a3c SHA1 d4c359ebdabca81c2ebe25a3b1bf154430c5bb7b SHA256 8913711b705bb951379a7652a4c19f861e088eb82007ae1860aba076520cb357
+EBUILD libmicrohttpd-0.9.3.ebuild 1235 RMD160 e5990491c070271e93ef3fd7fdee423ae040ebdd SHA1 724508d1312904e838e83793e3ee6226341f146a SHA256 8831c7740a57bb5057b99fe4876df2c2ffe013a36c3470e7408d73341c7d7b57
+MISC ChangeLog 839 RMD160 9c3698bb3ecc0a4d3d54f5f50e2e29fe234aa234 SHA1 11b022e7070589f9588a9008a5b1b7d3ef640dfb SHA256 8ae4d5fd2d3cfcb52033d60e574410e54502114d7fa7a8503c5b6b150d028cc8
MISC metadata.xml 343 RMD160 35dc7b79165fec98f6eee1f0d62eb97da8ad18b6 SHA1 785a8c4d96d077de2ae65ee13230a3ffc8a46a0b SHA256 682684490dab5eed11cb171e14be9d5dea03d8695aea8f12775247e3a514e7e2
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.0.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.3.ebuild
index 7d0824a2dbd1..94aefb49a386 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.0.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.0.ebuild,v 1.2 2010/09/18 22:13:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.3.ebuild,v 1.1 2010/12/01 15:49:25 chithanh Exp $
EAPI=2
@@ -10,27 +10,36 @@ DESCRIPTION="A small C library that makes it easy to run an HTTP server as part
HOMEPAGE="http://gnunet.org/libmicrohttpd/"
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-IUSE="messages ssl"
+IUSE="messages ssl test"
KEYWORDS="~amd64 ~x86"
LICENSE="LGPL-2.1"
SLOT="0"
-DEPEND="ssl? (
- >=dev-libs/libgcrypt-1.2.2
+RDEPEND="ssl? (
+ dev-libs/libgcrypt
net-libs/gnutls
)
- >=net-misc/curl-7.16.4"
-RDEPEND="${DEPEND}"
+ net-misc/curl"
+# Some tests fail if curl is built against nss, bug #334067
+DEPEND="${RDEPEND}
+ test? (
+ ssl? ( || (
+ >=net-misc/curl-7.21[ssl,-nss]
+ >=net-misc/curl-7.21[ssl,gnutls]
+ ) )
+ )"
S=${WORKDIR}/${MY_P}
src_configure() {
econf \
--enable-curl \
- $(use_enable messages) \
- $(use_enable ssl https) \
+ $(use messages || use_enable messages) \
+ $(use ssl || use_enable ssl https) \
$(use_with ssl gnutls)
}
+# SSL is disabled when --enable-https is passed
+# messages are disabled when --enable-messages is passed
src_compile() {
emake || die "emake failed"