4 files changed, 11 insertions, 59 deletions
diff --git a/app-arch/rzip/ChangeLog b/app-arch/rzip/ChangeLog
index 54708e527600..6f8aa4850a2c 100644
--- a/app-arch/rzip/ChangeLog
+++ b/app-arch/rzip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rzip
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/ChangeLog,v 1.24 2008/04/21 16:27:15 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/ChangeLog,v 1.25 2008/04/21 16:36:13 drac Exp $
+
+  21 Apr 2008; Samuli Suominen <drac@gentoo.org> -rzip-2.0-r1.ebuild,
+  -rzip-2.0-r2.ebuild, rzip-2.1.ebuild:
+  Instead of placing WANT_AUTOCONF in front of eautoreconf, leave it unset
+  so it defaults on latest. Use emake.
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/app-arch/rzip/rzip-2.0-r1.ebuild b/app-arch/rzip/rzip-2.0-r1.ebuild
deleted file mode 100644
index 85140f99bb1a..000000000000
--- a/app-arch/rzip/rzip-2.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.0-r1.ebuild,v 1.7 2005/06/17 01:05:34 vapier Exp $
-
-DESCRIPTION="compression program for large files"
-HOMEPAGE="http://rzip.samba.org/"
-SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/bzip2"
-
-src_install() {
-	make \
-		INSTALL_BIN="${D}"/usr/bin \
-		INSTALL_MAN="${D}"/usr/share/man \
-		install || die
-	dosym rzip /usr/bin/runzip
-}
diff --git a/app-arch/rzip/rzip-2.0-r2.ebuild b/app-arch/rzip/rzip-2.0-r2.ebuild
deleted file mode 100644
index c5fcedee2fd2..000000000000
--- a/app-arch/rzip/rzip-2.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.0-r2.ebuild,v 1.5 2008/01/26 18:48:08 grobian Exp $
-
-inherit autotools
-
-DESCRIPTION="compression program for large files"
-HOMEPAGE="http://rzip.samba.org/"
-SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-arch/bzip2
-	>=sys-devel/autoconf-2.59"
-RDEPEND="app-arch/bzip2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-darwin.patch
-	WANT_AUTOCONF="2.5" eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "failed installing"
-}
diff --git a/app-arch/rzip/rzip-2.1.ebuild b/app-arch/rzip/rzip-2.1.ebuild
index e5d8e9953f84..a1499e971d1a 100644
--- a/app-arch/rzip/rzip-2.1.ebuild
+++ b/app-arch/rzip/rzip-2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1.ebuild,v 1.7 2008/01/26 18:48:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.1.ebuild,v 1.8 2008/04/21 16:36:13 drac Exp $
 
 inherit autotools
 
 DESCRIPTION="compression program for large files"
-HOMEPAGE="http://rzip.samba.org/"
+HOMEPAGE="http://rzip.samba.org"
 SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,17 +13,15 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="app-arch/bzip2
-	>=sys-devel/autoconf-2.59"
-RDEPEND="app-arch/bzip2"
+DEPEND="app-arch/bzip2"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.0-darwin.patch
-	WANT_AUTOCONF="2.5" eautoreconf
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "failed installing"
+	emake DESTDIR="${D}" install || die "emake install failed."
 }