Add support for USE=bsdpty to control openpty support #192220 by Max and general ebuild cleanup.

Package-Manager: portage-2.1.3.11

3 files changed, 29 insertions, 23 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 8e5a725d5715..43023068cb1d 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.54 2007/08/12 15:41:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.55 2007/10/06 12:28:22 vapier Exp $
+
+  06 Oct 2007; Mike Frysinger <vapier@gentoo.org> dropbear-0.50.ebuild:
+  Add support for USE=bsdpty to control openpty support #192220 by Max and
+  general ebuild cleanup.
 
 *dropbear-0.50 (12 Aug 2007)
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index e1a8993cd252..b5e5b4052815 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -23,14 +23,14 @@ EBUILD dropbear-0.49.ebuild 2171 RMD160 03f778f5f16b282952ee625d0a1603b3a110b79f
 MD5 a4b4f26ac3737451f45fbe7bf1911eb3 dropbear-0.49.ebuild 2171
 RMD160 03f778f5f16b282952ee625d0a1603b3a110b79f dropbear-0.49.ebuild 2171
 SHA256 f0ef37a51ed6431ce9680754fa55e693505b70f46d20aaa72110075940dab534 dropbear-0.49.ebuild 2171
-EBUILD dropbear-0.50.ebuild 2132 RMD160 20b641822ad870392bac5e70f094c99941b90156 SHA1 02932904184f4e22c8d504aca58e30d75fb741ee SHA256 637a28704cd60c0640c5cfa9d75167a5954e70ae365b58ade9b43fb476f3654c
-MD5 7da316b32d4e3718a62313a6d52b2403 dropbear-0.50.ebuild 2132
-RMD160 20b641822ad870392bac5e70f094c99941b90156 dropbear-0.50.ebuild 2132
-SHA256 637a28704cd60c0640c5cfa9d75167a5954e70ae365b58ade9b43fb476f3654c dropbear-0.50.ebuild 2132
-MISC ChangeLog 6928 RMD160 d177995df14d942589352bc61189928ddb0ab760 SHA1 f835b620e7d10f534d975269981c31d359fcfa3f SHA256 bc8e25f749e9473a3a3070b233b7c8ddf54b7c5eca16500939472fcaa324542b
-MD5 4013c9b5ae9edd51ee19c37e3bf61622 ChangeLog 6928
-RMD160 d177995df14d942589352bc61189928ddb0ab760 ChangeLog 6928
-SHA256 bc8e25f749e9473a3a3070b233b7c8ddf54b7c5eca16500939472fcaa324542b ChangeLog 6928
+EBUILD dropbear-0.50.ebuild 2163 RMD160 1bf75000efbd9143718f5f92f1bd2e9f650d5f9c SHA1 03d53694131599a1345726013f2986bd9dcf6b57 SHA256 500777645950f7b1fc05ead1d76a0c7c5c7b202f039cdf265db45f331116f8e7
+MD5 1a7f02ba3c460480094eb90596f77dc2 dropbear-0.50.ebuild 2163
+RMD160 1bf75000efbd9143718f5f92f1bd2e9f650d5f9c dropbear-0.50.ebuild 2163
+SHA256 500777645950f7b1fc05ead1d76a0c7c5c7b202f039cdf265db45f331116f8e7 dropbear-0.50.ebuild 2163
+MISC ChangeLog 7102 RMD160 162977c02e3132b94f6fb9b8969429f82e72ebf0 SHA1 03beb32d630b41b4a9942bef4c3e03a922558987 SHA256 bbc061313e0ba24c4c39d96d3579c0e6837b95d3cc4a2f56d8afe97b5e4b87f4
+MD5 8d94520c9757d843a8870e538f2b74d0 ChangeLog 7102
+RMD160 162977c02e3132b94f6fb9b8969429f82e72ebf0 ChangeLog 7102
+SHA256 bbc061313e0ba24c4c39d96d3579c0e6837b95d3cc4a2f56d8afe97b5e4b87f4 ChangeLog 7102
 MISC metadata.xml 1308 RMD160 3d63dd1fc0665e92bd4b0c52cc51973db3804adc SHA1 1dbbfd8727a6d8cd473be149284814aa65d65f9f SHA256 6f654db31c4e6b1d326b9d5384cd9f5bb170bdb742d54ab15a0229238c8a3aa1
 MD5 a3d6e6bdd4ebf16f2f36f4f487a37518 metadata.xml 1308
 RMD160 3d63dd1fc0665e92bd4b0c52cc51973db3804adc metadata.xml 1308
@@ -42,9 +42,9 @@ MD5 74d35bbe42702936a6cff65748a0793d files/digest-dropbear-0.50 244
 RMD160 aca424f2b4468fafc13cca00c6a2454f54b12c3a files/digest-dropbear-0.50 244
 SHA256 19f96e3ed8dfaf2fd013d429a29697a11ab3f452cbf3a7ae81b179ac335f8d73 files/digest-dropbear-0.50 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGvyoyp/wUKkr7RBoRAk5FAJ4ljdTSXybPCHr/5ZpAuo96TjDobgCgp/Xm
-+E8Muvn4Qbx3+y7gAd4CAoM=
-=LOxm
+iD8DBQFHB39sp/wUKkr7RBoRAuCmAKDhWLwIlHLWY0/3uDmGmjKsd2CDPACfXwVc
+nMNWAyDrSR5DLXFI6ptPqKQ=
+=BSQ1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-0.50.ebuild b/net-misc/dropbear/dropbear-0.50.ebuild
index be412298a280..847f3be0bd10 100644
--- a/net-misc/dropbear/dropbear-0.50.ebuild
+++ b/net-misc/dropbear/dropbear-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.50.ebuild,v 1.1 2007/08/12 15:41:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.50.ebuild,v 1.2 2007/10/06 12:28:22 vapier Exp $
 
 inherit eutils savedconfig
 
@@ -12,7 +12,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="minimal multicall pam static zlib"
+IUSE="bsdpty minimal multicall pam static syslog zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	pam? ( sys-libs/pam )"
@@ -43,10 +43,12 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	# --disable-syslog? wouldn't need logger in init.d
-	use minimal && myconf="--disable-lastlog"
-	econf ${myconf} $(use_enable zlib) $(use_enable pam) || die
+	econf \
+		$(use_enable zlib) \
+		$(use_enable pam) \
+		$(use_enable !bsdpty openpty) \
+		$(use_enable syslog) \
+		|| die
 	set_options
 	emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
 }
@@ -55,8 +57,8 @@ src_install() {
 	set_options
 	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
 	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
 	dodoc CHANGES README TODO SMALL MULTI
 
 	# The multi install target does not install the links
@@ -64,7 +66,7 @@ src_install() {
 		cd "${D}"/usr/bin
 		local x
 		for x in ${progs} ; do
-			ln -s dropbearmulti ${x}
+			ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
 		done
 		rm -f dropbear
 		dodir /usr/sbin
@@ -73,5 +75,5 @@ src_install() {
 	fi
 	save_config options.h
 
-	mv "${D}"/usr/bin/{,db}scp
+	mv "${D}"/usr/bin/{,db}scp || die
 }