| 1 |
vapier 12/02/26 17:39:16 |
| 2 |
|
| 3 |
Modified: ChangeLog dropbear-2012.55.ebuild |
| 4 |
Log: |
| 5 |
Rewrite deps to not require newer zlib #405607#3. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.86 net-misc/dropbear/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/ChangeLog?rev=1.86&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/ChangeLog?rev=1.86&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/ChangeLog?r1=1.85&r2=1.86 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v |
| 19 |
retrieving revision 1.85 |
| 20 |
retrieving revision 1.86 |
| 21 |
diff -u -r1.85 -r1.86 |
| 22 |
--- ChangeLog 24 Feb 2012 18:24:24 -0000 1.85 |
| 23 |
+++ ChangeLog 26 Feb 2012 17:39:16 -0000 1.86 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-misc/dropbear |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.85 2012/02/24 18:24:24 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.86 2012/02/26 17:39:16 vapier Exp $ |
| 29 |
+ |
| 30 |
+ 26 Feb 2012; Mike Frysinger <vapier@g.o> dropbear-2012.55.ebuild: |
| 31 |
+ Rewrite deps to not require newer zlib #405607#3. |
| 32 |
|
| 33 |
*dropbear-2012.55 (24 Feb 2012) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-misc/dropbear/dropbear-2012.55.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: dropbear-2012.55.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- dropbear-2012.55.ebuild 24 Feb 2012 18:24:24 -0000 1.1 |
| 51 |
+++ dropbear-2012.55.ebuild 26 Feb 2012 17:39:16 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild,v 1.1 2012/02/24 18:24:24 vapier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild,v 1.2 2012/02/26 17:39:16 vapier Exp $ |
| 57 |
|
| 58 |
EAPI="4" |
| 59 |
|
| 60 |
@@ -16,19 +16,24 @@ |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 62 |
IUSE="bsdpty minimal multicall pam static syslog zlib" |
| 63 |
|
| 64 |
-DEPEND="static? ( zlib? ( sys-libs/zlib[static-libs] ) ) |
| 65 |
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )" |
| 66 |
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
| 67 |
pam? ( virtual/pam )" |
| 68 |
-RDEPEND="${DEPEND} |
| 69 |
- !static? ( zlib? ( sys-libs/zlib ) ) |
| 70 |
- pam? ( >=sys-auth/pambase-20080219.1 )" |
| 71 |
+DEPEND="${RDEPEND} |
| 72 |
+ static? ( ${LIB_DEPEND} )" |
| 73 |
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" |
| 74 |
|
| 75 |
REQUIRED_USE="pam? ( !static )" |
| 76 |
|
| 77 |
set_options() { |
| 78 |
- progs="dropbear dbclient dropbearkey" |
| 79 |
- progs+=" $(usex minimal "" "dropbearconvert scp")" |
| 80 |
- use multicall && makeopts+=" MULTI=1" |
| 81 |
- use static && makeopts+=" STATIC=1" |
| 82 |
+ progs=( |
| 83 |
+ dropbear dbclient dropbearkey |
| 84 |
+ $(usex minimal "" "dropbearconvert scp") |
| 85 |
+ ) |
| 86 |
+ makeopts=( |
| 87 |
+ MULTI=$(usex multicall 1 0) |
| 88 |
+ STATIC=$(usex static 1 0) |
| 89 |
+ ) |
| 90 |
} |
| 91 |
|
| 92 |
src_prepare() { |
| 93 |
@@ -53,12 +58,12 @@ |
| 94 |
|
| 95 |
src_compile() { |
| 96 |
set_options |
| 97 |
- emake ${makeopts} PROGRAMS="${progs}" |
| 98 |
+ emake ${makeopts[@]} PROGRAMS="${progs[*]}" |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
| 102 |
set_options |
| 103 |
- emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" |
| 104 |
+ emake install DESTDIR="${D}" ${makeopts[@]} PROGRAMS="${progs[*]}" |
| 105 |
doman *.8 |
| 106 |
newinitd "${FILESDIR}"/dropbear.init.d dropbear |
| 107 |
newconfd "${FILESDIR}"/dropbear.conf.d dropbear |
| 108 |
@@ -68,7 +73,7 @@ |
| 109 |
if use multicall ; then |
| 110 |
cd "${D}"/usr/bin |
| 111 |
local x |
| 112 |
- for x in ${progs} ; do |
| 113 |
+ for x in ${progs[@]} ; do |
| 114 |
ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" |
| 115 |
done |
| 116 |
rm -f dropbear |
Archives