[gentoo-commits] gentoo-x86 commit in net-misc/wget: ChangeLog wget-1.12-r1.ebuild

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      10/02/14 00:43:09

  Modified:             ChangeLog wget-1.12-r1.ebuild
  Log:
  Upgrade to EAPI=2 so we can set +ssl in IUSE #304887 by Kerin Millar.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.122                net-misc/wget/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/wget/ChangeLog?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/wget/ChangeLog?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/wget/ChangeLog?r1=1.121&r2=1.122

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog	17 Jan 2010 22:28:20 -0000	1.121
+++ ChangeLog	14 Feb 2010 00:43:08 -0000	1.122
@@ -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)
 



1.2                  net-misc/wget/wget-1.12-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/wget/wget-1.12-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/wget/wget-1.12-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/wget/wget-1.12-r1.ebuild?r1=1.1&r2=1.2

Index: wget-1.12-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wget-1.12-r1.ebuild	17 Jan 2010 22:28:20 -0000	1.1
+++ wget-1.12-r1.ebuild	14 Feb 2010 00:43:08 -0000	1.2
@@ -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 @@
 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 @@
 	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 @@
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use ssl && use_enable ntlm) \
-		$(use_enable debug) \
-		|| die
-	emake || die
+		$(use_enable debug)
 }
 
 src_install() {