Version bump.

6 files changed, 55 insertions, 77 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 113fbeeb50df..dc4f0b81a516 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.14 2005/01/11 18:05:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.15 2005/01/11 20:04:35 vapier Exp $
+
+*dropbear-0.44 (11 Jan 2005)
+
+  11 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +dropbear-0.44.ebuild:
+  Version bump.
 
   11 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> dropbear-0.43.ebuild:
   Keyworded sparc directly, it'll be required soon
diff --git a/net-misc/dropbear/dropbear-0.44.ebuild b/net-misc/dropbear/dropbear-0.44.ebuild
new file mode 100644
index 000000000000..32c216770bc2
--- /dev/null
+++ b/net-misc/dropbear/dropbear-0.44.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.44.ebuild,v 1.1 2005/01/11 20:04:35 vapier Exp $
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sh ~x86"
+IUSE="zlib multicall static"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_compile() {
+	econf $(use_enable zlib) || die
+
+	local makeopts=""
+	use multicall && makeopts="${makeopts} MULTI=1"
+	use static && makeopts="${makeopts} STATIC=1"
+	emake ${makeopts} || die "make failed"
+}
+
+src_install() {
+	local makeopts=""
+	use multicall && makeopts="${makeopts} MULTI=1"
+	use static && makeopts="${makeopts} STATIC=1"
+	make install DESTDIR="${D}" || die "make install failed"
+	newinitd ${FILESDIR}/dropbear.init.d dropbear
+	newconfd ${FILESDIR}/dropbear.conf.d dropbear
+	dodoc CHANGES README TODO SMALL MULTI
+
+	# The multi install target installs same binary
+	# multiple times ... lets clean that up
+	if use multicall ; then
+		cd "${D}"/usr/bin
+		local x
+		for x in * ; do
+			dosym ../sbin/dropbear /usr/bin/${x}
+		done
+		cd "${S}"
+	fi
+}
diff --git a/net-misc/dropbear/dropbear-0.44_alpha4.ebuild b/net-misc/dropbear/dropbear-0.44_alpha4.ebuild
deleted file mode 100644
index e86043c5006c..000000000000
--- a/net-misc/dropbear/dropbear-0.44_alpha4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.44_alpha4.ebuild,v 1.3 2005/01/11 18:05:40 gustavoz Exp $
-
-inherit gnuconfig eutils
-
-MY_P="${P/_alpha/test}"
-DESCRIPTION="small SSH 2 server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${MY_P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-*"
-IUSE="zlib multicall static"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-	epatch ${FILESDIR}/${PV}-install.patch
-}
-
-src_compile() {
-	econf `use_enable zlib` || die
-
-	local maketarget=""
-	if use multicall ; then
-		sed -i \
-			-e '/define DROPBEAR_MULTI/s:/\* *::' \
-			-e '/define DROPBEAR_MULTI/s:\*/::' \
-			options.h
-		use static \
-			&& maketarget="dropbearmultistatic" \
-			|| maketarget="dropbearmulti"
-	else
-		use static && maketarget="static"
-	fi
-	emake ${maketarget} || die "make ${maketarget} failed"
-}
-
-src_install() {
-	if use multicall ; then
-		local multibin="dropbearmulti"
-		use static && multibin="static${multibin}"
-		dodir /usr/bin /usr/sbin
-		dobin ${multibin} || die "dropbearmulti"
-		dosym ${multibin} /usr/bin/dropbearkey || die
-		dosym ${multibin} /usr/bin/dropbearconvert || die
-		dosym ${multibin} /usr/bin/dbclient || die
-		dosym ../bin/${multibin} /usr/sbin/dropbear || die
-	else
-		local maketarget="install"
-		use static && maketarget="install-static"
-		make ${maketarget} DESTDIR=${D} || die "make ${maketarget} failed"
-	fi
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dropbear.init.d dropbear
-	insinto /etc/conf.d ; newins ${FILESDIR}/dropbear.conf.d dropbear
-	dodoc CHANGES README TODO SMALL
-}
diff --git a/net-misc/dropbear/files/0.44_alpha4-install.patch b/net-misc/dropbear/files/0.44_alpha4-install.patch
deleted file mode 100644
index 25651ff4e599..000000000000
--- a/net-misc/dropbear/files/0.44_alpha4-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2004-09-22 14:55:18.711812104 -0400
-+++ Makefile.in	2004-09-22 14:55:30.320047384 -0400
-@@ -115,6 +115,7 @@
- 	$(STRIP) $(addsuffix $(EXEEXT), $(addprefix $(SPREFIX), $(TARGETS)))
- 
- install: $(addprefix inst, $(TARGETS))
-+	@echo "Installed $(TARGETS)"
- 
- installdropbearmulti: insdbmulti $(addprefix insmulti, $(PROGRAMS)) 
- 
diff --git a/net-misc/dropbear/files/digest-dropbear-0.44 b/net-misc/dropbear/files/digest-dropbear-0.44
new file mode 100644
index 000000000000..51d46f9c4ca5
--- /dev/null
+++ b/net-misc/dropbear/files/digest-dropbear-0.44
@@ -0,0 +1 @@
+MD5 50caa74ae47e4bf5eca5ea8c231983cf dropbear-0.44.tar.bz2 1263785
diff --git a/net-misc/dropbear/files/digest-dropbear-0.44_alpha4 b/net-misc/dropbear/files/digest-dropbear-0.44_alpha4
deleted file mode 100644
index 5652aee2094c..000000000000
--- a/net-misc/dropbear/files/digest-dropbear-0.44_alpha4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a8588c965b14bbeed48599eb73a3372 dropbear-0.44test4.tar.bz2 1189015