From: Thilo Bangert Date: Thu, 1 Mar 2007 07:38:09 +0000 (+0000) Subject: fix build USE=-ssl (bug #136169) - thanks toto X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57ed7c5b1cdbc2ef942c896e4190b0bc25e8b6a5;p=gentoo.git fix build USE=-ssl (bug #136169) - thanks toto Package-Manager: portage-2.1.2-r9 --- diff --git a/www-servers/webfs/ChangeLog b/www-servers/webfs/ChangeLog index 8e9ea0fef929..324a1a2b6e24 100644 --- a/www-servers/webfs/ChangeLog +++ b/www-servers/webfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/webfs # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.10 2007/02/28 22:57:00 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.11 2007/03/01 07:38:09 bangert Exp $ + + 01 Mar 2007; Thilo Bangert webfs-1.20.ebuild, + webfs-1.21.ebuild: + fix build USE=-ssl (bug #136169) 28 Feb 2007; Thilo Bangert files/webfs.initd: fix typo (bug #165294) diff --git a/www-servers/webfs/Manifest b/www-servers/webfs/Manifest index cbc52c472b0e..3430b4926843 100644 --- a/www-servers/webfs/Manifest +++ b/www-servers/webfs/Manifest @@ -8,18 +8,18 @@ RMD160 6159ce0c4df31b1822fe9af7f82eb243f77b30e5 files/webfs.initd 1199 SHA256 d25ce35d0098ba898768770b8cc053290be0ea2a794007fbaea28724b0041383 files/webfs.initd 1199 DIST webfs-1.21.tar.gz 44249 RMD160 acce4a01e7741e2fc6f6db22e38c1161af780dbc SHA1 a38880d8cb21e415244d220115ede7b573ac890c SHA256 98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a DIST webfs_1.20.tar.gz 50998 RMD160 2d4ff8e2a6d11d9d4638f678f8f7f99d04fe0c0e SHA1 2cd3c36c02aecc30eb308244256a5aa4ce07831a SHA256 864a33608a9d73ea36271bf07f424d00108247db51bd10efe3304aa7c79cc6bd -EBUILD webfs-1.20.ebuild 764 RMD160 ca9728150cad1d2f92b6f96848d73cd120101fb5 SHA1 40269ed08d34655ced98b10c1d93b84d2e61a462 SHA256 81f0e4728cbeedc8af32c982f3461d9ccbd2fc0da7a96eb6a7700eb5fc97aff4 -MD5 49f32341b337530ae121eadb9a57c71b webfs-1.20.ebuild 764 -RMD160 ca9728150cad1d2f92b6f96848d73cd120101fb5 webfs-1.20.ebuild 764 -SHA256 81f0e4728cbeedc8af32c982f3461d9ccbd2fc0da7a96eb6a7700eb5fc97aff4 webfs-1.20.ebuild 764 -EBUILD webfs-1.21.ebuild 962 RMD160 4ae220eb34c2d3a989af8ebf3d0ac7ce0465e599 SHA1 ae073f58e45b193a98a0d6d126a43ffd8fb1f2a1 SHA256 b5fc7036453506f22d2f09d830d4b5bfdda60941f3eb65f97612074d76ca2222 -MD5 358780866219cf948dd81c3dc9f9a9bd webfs-1.21.ebuild 962 -RMD160 4ae220eb34c2d3a989af8ebf3d0ac7ce0465e599 webfs-1.21.ebuild 962 -SHA256 b5fc7036453506f22d2f09d830d4b5bfdda60941f3eb65f97612074d76ca2222 webfs-1.21.ebuild 962 -MISC ChangeLog 2124 RMD160 f899ea2970bc9bb2ce4e0684c545869d71403113 SHA1 9d4c15c8c3a398344b5d3a82da7851d172c29d3d SHA256 c394e77cc0a2e26e46fa3a24510526d9851eecb13fe087b6841570176c47fb9b -MD5 890ffe64ad20c5405e766a4844bc6631 ChangeLog 2124 -RMD160 f899ea2970bc9bb2ce4e0684c545869d71403113 ChangeLog 2124 -SHA256 c394e77cc0a2e26e46fa3a24510526d9851eecb13fe087b6841570176c47fb9b ChangeLog 2124 +EBUILD webfs-1.20.ebuild 832 RMD160 6397a5379262b4648c0babc9cf5a607b7d552d84 SHA1 352645a678f0da96288602aeeb1fa28fc3b8601f SHA256 61e3ba52ab69d3bb76e5e95b04737af4687327e5fa953565671082e1d551bebe +MD5 2059c78b9b5bcbc0f115fe6f257f86b8 webfs-1.20.ebuild 832 +RMD160 6397a5379262b4648c0babc9cf5a607b7d552d84 webfs-1.20.ebuild 832 +SHA256 61e3ba52ab69d3bb76e5e95b04737af4687327e5fa953565671082e1d551bebe webfs-1.20.ebuild 832 +EBUILD webfs-1.21.ebuild 1083 RMD160 d83f20592fd22a9f595a5c9cd010e4fc946366fb SHA1 69f2a4325880faccd4375fcc08133b07ac0fc8e7 SHA256 1bb269c0783bf18acfa293fba72624723bb823f10f602f08a49135cdfd0ac640 +MD5 0c11f3c90d13331a415f45999e9a164e webfs-1.21.ebuild 1083 +RMD160 d83f20592fd22a9f595a5c9cd010e4fc946366fb webfs-1.21.ebuild 1083 +SHA256 1bb269c0783bf18acfa293fba72624723bb823f10f602f08a49135cdfd0ac640 webfs-1.21.ebuild 1083 +MISC ChangeLog 2250 RMD160 10942a41bd2eb3b9cd9452adbfa9fae3fc65cdfc SHA1 935a128b8308110396df0f3d7da2dc951657ec6d SHA256 3dfee0d09a0e13c6f60ca76b366c10790546bb4cf0cfd0d167f4d6139d397456 +MD5 c84ca14409452034fc35a23f7d09dfb3 ChangeLog 2250 +RMD160 10942a41bd2eb3b9cd9452adbfa9fae3fc65cdfc ChangeLog 2250 +SHA256 3dfee0d09a0e13c6f60ca76b366c10790546bb4cf0cfd0d167f4d6139d397456 ChangeLog 2250 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 metadata.xml 165 diff --git a/www-servers/webfs/webfs-1.20.ebuild b/www-servers/webfs/webfs-1.20.ebuild index cb8690fbe3e8..af17a5d05dfe 100644 --- a/www-servers/webfs/webfs-1.20.ebuild +++ b/www-servers/webfs/webfs-1.20.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.20.ebuild,v 1.6 2006/12/10 09:55:56 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.20.ebuild,v 1.7 2007/03/01 07:38:09 bangert Exp $ DESCRIPTION="Lightweight HTTP server for static content" SRC_URI="http://dl.bytesex.org/releases/${PN}/${PN}_${PV}.tar.gz" @@ -18,11 +18,13 @@ RDEPEND="${DEPEND} src_compile() { local myconf - use ssl || myconf="${myconf} USE_SSL=no" + use ssl || myconf="${myconf} USE_SSL=0" emake prefix=/usr ${myconf} || die "emake failed" } src_install() { - einstall mandir=${D}/usr/share/man || die "make install failed" + local myconf + use ssl || myconf="${myconf} USE_SSL=0" + einstall ${myconf} mandir=${D}/usr/share/man || die "make install failed" dodoc README COPYING } diff --git a/www-servers/webfs/webfs-1.21.ebuild b/www-servers/webfs/webfs-1.21.ebuild index bbe50cacd006..434015667e01 100644 --- a/www-servers/webfs/webfs-1.21.ebuild +++ b/www-servers/webfs/webfs-1.21.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21.ebuild,v 1.2 2006/12/10 09:55:56 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21.ebuild,v 1.3 2007/03/01 07:38:09 bangert Exp $ DESCRIPTION="Lightweight HTTP server for static content" SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz" @@ -25,7 +25,10 @@ src_compile() { } src_install() { - einstall mandir=${D}/usr/share/man || die "make install failed" + local myconf + use ssl || myconf="${myconf} USE_SSL=no" + use threads && myconf="${myconf} USE_THREADS=yes" + einstall ${myconf} mandir=${D}/usr/share/man || die "make install failed" newinitd ${FILESDIR}/${PN}.initd ${PN} || die "newinitd failed" newconfd ${FILESDIR}/${PN}.confd ${PN} || die "newconfd failed" dodoc README COPYING