Bump to EAPI=4 so we can depend on zlib[static-libs] for USE=static #390959 by Sven E..

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

3 files changed, 37 insertions, 37 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index b954d0983f94..b238bda36cf5 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.83 2011/11/08 13:21:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.84 2011/11/19 08:02:21 vapier Exp $
+
+  19 Nov 2011; Mike Frysinger <vapier@gentoo.org> dropbear-2011.54.ebuild:
+  Bump to EAPI=4 so we can depend on zlib[static-libs] for USE=static #390959
+  by Sven E..
 
 *dropbear-2011.54 (08 Nov 2011)
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index a0b98ae483e9..308c02f4035f 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -11,13 +11,13 @@ DIST dropbear-2011.54.tar.bz2 1580502 RMD160 cb589af26260fd9d6a700b69f85c9f13aaa
 EBUILD dropbear-0.52-r1.ebuild 2662 RMD160 cb63b1040355844d04b28b26f08d1a86b1bc94c0 SHA1 43aea650d64b17854731992510d0583d0fec2bcd SHA256 a7348d330ffc5d81bc59d3596c25122ae77ec5cc0c5a5186fbc502518316b1b5
 EBUILD dropbear-0.52.ebuild 2648 RMD160 b77e2243b21848977c1d547cec897bbf7dd8554b SHA1 2603737d7f8fe8a0977bcbd51ad8c3e477a53de2 SHA256 aa7f91459c82c8b180eba8e740afad782083dbe291e23c4a253756f3a086792f
 EBUILD dropbear-0.53.1.ebuild 2710 RMD160 49f854c71cb288a926baeee25f4190dcef1cb926 SHA1 b3da8d875b8ad0b076266cff8ef54a6bdf4ae54c SHA256 7fc64502b71abca7fb0009f46fa2bb5cef141ab81a588b6f3d75b07b2b37341e
-EBUILD dropbear-2011.54.ebuild 2665 RMD160 f702567d41121860e8e15c283c964411e972782f SHA1 e143a70a1d94a5b04d5c96f9e09b571274b45c4a SHA256 fa5fffa7aedeb5796fa940b28a5935826e9f69d761ea3825c76d897738705504
-MISC ChangeLog 10642 RMD160 b85bd8a3cb27a62500dfefbaacdde5727a6a2094 SHA1 e9afaba93417c86a772507cb1cf9faf93352c99d SHA256 e32672e2f96d0204453ee51a727df7d751a42e08d8b6355aff4ee9b5928d2c6d
+EBUILD dropbear-2011.54.ebuild 2364 RMD160 4a8a6007330fd86af4c00af1404c0bacab10794b SHA1 ae95623ad550aff3129eabfe6ca4d3dcbe20a289 SHA256 fdf8956f9d7f1efedca7e4331726de87bd30870f6580c68eb367b34c94f40680
+MISC ChangeLog 10810 RMD160 3cbf10c9594d1c0078dd9089e17350ed4f497b79 SHA1 c962e5bbff47133829dd238f0b11e0f8bdfec09a SHA256 eb92f19f547d3924726fa5e596b63f0c06e0f51badd8fffa6879e80857a54a28
 MISC metadata.xml 1535 RMD160 b952e11afa75b9db8d37003b87fc34e98aa1c817 SHA1 3292a14d570d524cca3b4823b864b32fabae07a5 SHA256 5394fdf87301c239a38e2f616f03ba1eaf25cdb43cdfb4c0db28555c7284fcda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk65OtUACgkQaC/OocHi7JbWSQD8DY/7tf6m1UddqlEy0D1ECeFa
-II1XF8bN8M5R3jCnCmcA/2w2LDlyrfz4CMwz6enasHZ+Dol8zLt1hfKgD/eqONc8
-=L81X
+iF4EAREIAAYFAk7HYpgACgkQaC/OocHi7JYfNwD/fi86KiA/lVCMA6yRr4R3AMbB
+ddLfESqh+mJ7jvIGRYQA/jkbdsEADgKcdKfYdOVlsJGaCUkfWSapQhgP00fK5W8B
+=0wTa
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-2011.54.ebuild b/net-misc/dropbear/dropbear-2011.54.ebuild
index d2df2681f64b..18bb421f17f6 100644
--- a/net-misc/dropbear/dropbear-2011.54.ebuild
+++ b/net-misc/dropbear/dropbear-2011.54.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild,v 1.1 2011/11/08 13:21:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild,v 1.2 2011/11/19 08:02:21 vapier Exp $
+
+EAPI="4"
 
 inherit eutils savedconfig pam
 
@@ -14,31 +16,22 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="bsdpty minimal multicall pam static syslog zlib"
 
-DEPEND="zlib? ( sys-libs/zlib )
+DEPEND="static? ( zlib? ( sys-libs/zlib[static-libs] ) )
 	pam? ( virtual/pam )"
 RDEPEND="${DEPEND}
+	!static? ( zlib? ( sys-libs/zlib ) )
 	pam? ( >=sys-auth/pambase-20080219.1 )"
 
-set_options() {
-	use minimal \
-		&& progs="dropbear dbclient dropbearkey" \
-		|| progs="dropbear dbclient dropbearkey dropbearconvert scp"
-	use multicall && makeopts="${makeopts} MULTI=1"
-	use static && makeopts="${makeopts} STATIC=1"
-}
-
-pkg_setup() {
-	if use pam && use static ; then
-		die "USE='pam static' makes no sense ... pick one"
-	fi
+REQUIRED_USE="pam? ( !static )"
 
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
+set_options() {
+	progs="dropbear dbclient dropbearkey"
+	progs+=" $(usex minimal "" "dropbearconvert scp")"
+	use multicall && makeopts+=" MULTI=1"
+	use static && makeopts+=" STATIC=1"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
 	sed -i \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
@@ -50,26 +43,25 @@ src_unpack() {
 	restore_config options.h
 }
 
-src_compile() {
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
+src_configure() {
 	econf \
 		$(use_enable zlib) \
 		$(use_enable pam) \
 		$(use_enable !bsdpty openpty) \
-		$(use_enable syslog) \
-		|| die
+		$(use_enable syslog)
+}
+
+src_compile() {
 	set_options
-	emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
+	emake ${makeopts} PROGRAMS="${progs}"
 }
 
 src_install() {
 	set_options
-	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
+	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}"
 	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
 	dodoc CHANGES README TODO SMALL MULTI
 
 	# The multi install target does not install the links
@@ -90,6 +82,10 @@ src_install() {
 		mv "${D}"/usr/bin/{,db}scp || die
 	fi
 
-	pamd_mimic system-remote-login dropbear auth account password session \
-		|| die "unable to mimic system-remote-login pamd file."
+	pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
 }