| 1 |
vapier 11/12/01 16:53:04 |
| 2 |
|
| 3 |
Modified: ChangeLog wget-1.13.4-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix the static-libs logic the right way #392713 by Piotr Karbowski. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.150 net-misc/wget/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.150&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.150&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?r1=1.149&r2=1.150 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v |
| 19 |
retrieving revision 1.149 |
| 20 |
retrieving revision 1.150 |
| 21 |
diff -u -r1.149 -r1.150 |
| 22 |
--- ChangeLog 1 Dec 2011 12:53:09 -0000 1.149 |
| 23 |
+++ ChangeLog 1 Dec 2011 16:53:04 -0000 1.150 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-misc/wget |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.149 2011/12/01 12:53:09 flameeyes Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.150 2011/12/01 16:53:04 vapier Exp $ |
| 29 |
+ |
| 30 |
+ 01 Dec 2011; Mike Frysinger <vapier@g.o> wget-1.13.4-r1.ebuild: |
| 31 |
+ Fix the static-libs logic the right way #392713 by Piotr Karbowski. |
| 32 |
|
| 33 |
01 Dec 2011; Diego E. Pettenò <flameeyes@g.o> wget-1.13.4-r1.ebuild: |
| 34 |
QA: do not try to be smart about setting dependencies, when the tricks don't |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 net-misc/wget/wget-1.13.4-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: wget-1.13.4-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- wget-1.13.4-r1.ebuild 1 Dec 2011 12:53:09 -0000 1.2 |
| 51 |
+++ wget-1.13.4-r1.ebuild 1 Dec 2011 16:53:04 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.2 2011/12/01 12:53:09 flameeyes Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.3 2011/12/01 16:53:04 vapier Exp $ |
| 57 |
|
| 58 |
EAPI="4" |
| 59 |
|
| 60 |
@@ -15,20 +15,15 @@ |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 62 |
IUSE="debug gnutls idn ipv6 nls ntlm +ssl static" |
| 63 |
|
| 64 |
-STATIC_LIB_DEPEND="idn? ( net-dns/libidn[static-libs] ) |
| 65 |
+LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] ) |
| 66 |
ssl? ( |
| 67 |
gnutls? ( net-libs/gnutls[static-libs(+)] ) |
| 68 |
!gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) |
| 69 |
)" |
| 70 |
-LIB_DEPEND="idn? ( net-dns/libidn ) |
| 71 |
- ssl? ( |
| 72 |
- gnutls? ( net-libs/gnutls ) |
| 73 |
- !gnutls? ( >=dev-libs/openssl-0.9.6b ) |
| 74 |
- )" |
| 75 |
-RDEPEND="!static? ( ${LIB_DEPEND} )" |
| 76 |
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
| 77 |
DEPEND="${RDEPEND} |
| 78 |
app-arch/xz-utils |
| 79 |
- static? ( ${STATIC_LIB_DEPEND} ) |
| 80 |
+ static? ( ${LIB_DEPEND} ) |
| 81 |
nls? ( sys-devel/gettext )" |
| 82 |
|
| 83 |
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |
Archives