diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-02-14 00:43:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-02-14 00:43:08 +0000 |
| commit | 33c9dc8c756e021cf155377f2ccc252f0261a0e9 (patch) | |
| tree | c6e3c22d8b44956fe10458824fd153621a75d60f /net-misc | |
| parent | Initial import of rye, needed for Rudy. (diff) | |
| download | historical-33c9dc8c756e021cf155377f2ccc252f0261a0e9.tar.gz historical-33c9dc8c756e021cf155377f2ccc252f0261a0e9.tar.bz2 historical-33c9dc8c756e021cf155377f2ccc252f0261a0e9.zip | |
Upgrade to EAPI=2 so we can set +ssl in IUSE #304887 by Kerin Millar.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/wget/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/wget/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/wget/wget-1.12-r1.ebuild | 16 |
3 files changed, 16 insertions, 15 deletions
diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog index 73cb2934ecc9..1f05e051b15d 100644 --- a/net-misc/wget/ChangeLog +++ b/net-misc/wget/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/wget # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.121 2010/01/17 22:28:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.122 2010/02/14 00:43:08 vapier Exp $ + + 14 Feb 2010; Mike Frysinger <vapier@gentoo.org> wget-1.12-r1.ebuild: + Upgrade to EAPI=2 so we can set +ssl in IUSE #304887 by Kerin Millar. *wget-1.12-r1 (17 Jan 2010) diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 35c548693fcf..e494b56529ff 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -6,14 +6,14 @@ AUX wget-1.12-linking.patch 9511 RMD160 8c7a27ec67d9c4ed9eb79c525bf1bff64bfaee95 AUX wget-1.12-sni.patch 3668 RMD160 5ed79357b713028e5acf446f38f6c0e0270a00bb SHA1 4ee45dd12e8f714298b7b8393980cf9d69caa10b SHA256 6f25eaeb5760a9344625a6cbd8bb8e15a510d4a8d1d37b15a64186d85604fe89 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a -EBUILD wget-1.12-r1.ebuild 2197 RMD160 8a93ff19e5919e2f3d420cfd11218ddc0124dbef SHA1 859ade5b0407fad232c2dae338662fe68eabb263 SHA256 dc6d7df31f6c7a0c8fac98fae9ee55f6e5e37b016202be92b474697b6c6ac6e4 +EBUILD wget-1.12-r1.ebuild 2162 RMD160 76d8487c29456bc54506b57490c074187e960b09 SHA1 a213041bda1aebe8467fddcbc0de7416ecf30446 SHA256 e828c09dd5473a63188f488d4d20141e4d571556c08f50f41783932d8276b933 EBUILD wget-1.12.ebuild 2131 RMD160 ddce9d06f2567b31c5f4c29901d0698f3ba0125a SHA1 ea8844b0d29d60e4f096be31e72b6f8377cc3b98 SHA256 79eca735009bdb4a866854d0c076274ec806135ec77f1eaf7409aa2b4afef211 -MISC ChangeLog 18467 RMD160 3a2bb5fb3ca8ff3eaea1357263ecc8e71d083f1c SHA1 3a1061647b3a8cb153a644ce2010539b29c58e4a SHA256 dc04789464ee1c30c110f101461647cda72f473166044c3439f5f9f1c7127f18 +MISC ChangeLog 18611 RMD160 8ee2b1dbd8b4bb81aa80904928d419413036ef62 SHA1 241584288f379b40c408924c156e976d267c84e1 SHA256 de8f1969ebaccd7e96e91e4d9056e969b5af3efa92ac04bca283d7928c427e65 MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iF4EAREIAAYFAktTjw0ACgkQTwhj9JtAlp5D/QEAtdBBqwzgyYMnPsFe1KFQf6OQ -qTDoEMuPqGmqmcYr9a4A/R0/y/fB1zxgIZLk4gdjZIxAcdKQeH/0V1FsESjJKcHo -=bhpM +iF4EAREIAAYFAkt3RyIACgkQTwhj9JtAlp7ARgEAtM9nxN1K/jqnAHPLb6BwDgMy +dpOsywS8M5P9HfPuSNsBAKBZmMhCSSMcgC0eFHHcaEqx4mVY7JqlaixotCs6mkjY +=ag0K -----END PGP SIGNATURE----- diff --git a/net-misc/wget/wget-1.12-r1.ebuild b/net-misc/wget/wget-1.12-r1.ebuild index 62240bc17f84..49583c165d2f 100644 --- a/net-misc/wget/wget-1.12-r1.ebuild +++ b/net-misc/wget/wget-1.12-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12-r1.ebuild,v 1.1 2010/01/17 22:28:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12-r1.ebuild,v 1.2 2010/02/14 00:43:08 vapier Exp $ + +EAPI="2" inherit eutils flag-o-matic @@ -11,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="debug idn ipv6 nls ntlm ssl static" +IUSE="debug idn ipv6 nls ntlm +ssl static" RDEPEND="idn? ( net-dns/libidn ) ssl? ( >=dev-libs/openssl-0.9.6b )" @@ -24,15 +26,13 @@ pkg_setup() { fi } -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${PN}-1.12-linking.patch epatch "${FILESDIR}"/${PN}-1.12-sni.patch #301312 epatch "${FILESDIR}"/${P}-debug-tests.patch #286173 } -src_compile() { +src_configure() { # openssl-0.9.8 now builds with -pthread on the BSD's use elibc_FreeBSD && use ssl && append-ldflags -pthread @@ -44,9 +44,7 @@ src_compile() { $(use_enable ipv6) \ $(use_enable nls) \ $(use ssl && use_enable ntlm) \ - $(use_enable debug) \ - || die - emake || die + $(use_enable debug) } src_install() { |