e2fsprogs updated :)

8 files changed, 59 insertions, 194 deletions

diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.22-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.22-r1.ebuild
deleted file mode 100644
index 1104772ff8f3..000000000000
--- a/sys-apps/e2fsprogs/e2fsprogs-1.22-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.22-r1.ebuild,v 1.2 2001/09/05 19:27:03 darks Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard ext2 filesystem utilities"
-SRC_URI="ftp://download.sourceforge.net/pub/sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )
-	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/e2fsprogs-1.19-po-Makefile.in.in-gentoo.diff
-	cd ${S}/po
-	cp POTFILES.in POTFILES.in.orig
-	sed -e 's/recover\.c/recovery.c/g' POTFILES.in.orig > POTFILES.in
-}
-
-src_compile() {
-
-    local myconf
-    if [ "`use nls`" ]
-    then
-      myconf="--enable-nls"
-    else
-      myconf="--disable-nls"
-    fi
-	try ./configure --host=${CHOST} --prefix=/usr \
-                --mandir=/usr/share/man --infodir=/usr/share/info \
-                --enable-elf-shlibs ${myconf}
-
-	# Parallel make sometimes fails
-	try make
-
-}
-
-src_install() {
-
-	local myopts
-	if [ "$DEBUG" ]
-	then
-	  myopts="STRIP=\"echo\""
-	fi
-
-    myopts="${myopts} root_libdir=/lib mandir=/usr/share/man infodir=/usr/share/info"
-
-	try make DESTDIR=${D} ${myopts} install
-	try make DESTDIR=${D} ${myopts} install-libs
-
-    if [ "`use nls`" ]
-    then
-      cd po
-      try make DESTDIR=${D} install
-    fi
-        dodir /sbin
-        mv ${D}/usr/sbin/fsck* ${D}/sbin
-	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
-	docinto e2fsck
-	dodoc e2fsck/ChangeLog e2fsck/CHANGES
-	for i in e2p et ext2fs ss uuid
-	do
-	  docinto lib/${i}
-	  dodoc lib/${i}/ChangeLog
-	done
-	docinto misc
-	dodoc misc/ChangeLog
-	docinto resize
-	dodoc resize/ChangeLog
-	docinto util
-	dodoc util/ChangeLog
-	if [ "`use bootcd`" ]
-	then
-		rm -rf ${D}/usr/lib/lib*.a
-		rm -rf ${D}/usr/share ${D}/usr/include
-	fi
-}
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.22.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.22.ebuild
deleted file mode 100644
index bc4e80de72b2..000000000000
--- a/sys-apps/e2fsprogs/e2fsprogs-1.22.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.22.ebuild,v 1.2 2001/08/04 18:22:45 pete Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard ext2 filesystem utilities"
-SRC_URI="ftp://download.sourceforge.net/pub/sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )
-	sys-apps/texinfo"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/e2fsprogs-1.19-po-Makefile.in.in-gentoo.diff
-	cd ${S}/po
-	cp POTFILES.in POTFILES.in.orig
-	sed -e 's/recover\.c/recovery.c/g' POTFILES.in.orig > POTFILES.in
-}
-
-src_compile() {
-
-    local myconf
-    if [ "`use nls`" ]
-    then
-      myconf="--enable-nls"
-    else
-      myconf="--disable-nls"
-    fi
-	try ./configure --host=${CHOST} --prefix=/usr \
-                --mandir=/usr/share/man --infodir=/usr/share/info \
-                --enable-elf-shlibs ${myconf}
-
-	# Parallel make sometimes fails
-	try make
-
-}
-
-src_install() {
-
-	local myopts
-	if [ "$DEBUG" ]
-	then
-	  myopts="STRIP=\"echo\""
-	fi
-
-    myopts="${myopts} mandir=/usr/share/man infodir=/usr/share/info"
-
-	try make DESTDIR=${D} ${myopts} install
-	try make DESTDIR=${D} ${myopts} install-libs
-
-    if [ "`use nls`" ]
-    then
-      cd po
-      try make DESTDIR=${D} install
-    fi
-	dodir /sbin
-	mv ${D}/usr/sbin/fsck* ${D}/sbin
-	
-	if [ -z "`use bootcd`" ]
-	then
-		dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
-		docinto e2fsck
-		dodoc e2fsck/ChangeLog e2fsck/CHANGES
-		for i in e2p et ext2fs ss uuid
-		  do
-		  docinto lib/${i}
-		  dodoc lib/${i}/ChangeLog
-		done
-		docinto misc
-		dodoc misc/ChangeLog
-		docinto resize
-		dodoc resize/ChangeLog
-		docinto util
-		dodoc util/ChangeLog
-	else
-		rm -rf ${D}/usr/lib/lib*.a ${D}/usr/share ${D}/usr/include
-	fi	
-}
-
-
-
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.25.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.25.ebuild
new file mode 100644
index 000000000000..aac8ae05e406
--- /dev/null
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.25.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: System Team <system@gentoo.org>
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.25.ebuild,v 1.1 2001/10/12 00:05:08 drobbins Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Standard ext2 and ext3 filesystem utilities"
+SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+
+DEPEND="virtual/glibc nls? ( sys-devel/gettext ) sys-apps/texinfo"
+RDEPEND="virtual/glibc"
+
+src_compile() {
+	local myconf
+	if [ "`use nls`" ]
+	then
+		myconf="--enable-nls"
+	else
+		myconf="--disable-nls"
+	fi
+	./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-elf-shlibs ${myconf} || die
+	# Parallel make sometimes fails
+	make || die
+}
+
+src_install() {
+	local myopts
+	myopts="${myopts} mandir=/usr/share/man infodir=/usr/share/info"
+
+	make DESTDIR=${D} ${myopts} install || die
+	make DESTDIR=${D} ${myopts} install-libs || die
+
+	if [ "`use nls`" ]
+	then
+		( cd po; make DESTDIR=${D} install || die )
+	fi
+	dodir /sbin
+	mv ${D}/usr/sbin/fsck* ${D}/sbin
+	
+	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
+	docinto e2fsck
+	dodoc e2fsck/ChangeLog e2fsck/CHANGES
+
+	local i
+	for i in e2p et ext2fs ss uuid
+	do
+		docinto lib/${i}
+		dodoc lib/${i}/ChangeLog
+	done
+	docinto misc
+	dodoc misc/ChangeLog
+	docinto resize
+	dodoc resize/ChangeLog
+	docinto util
+	dodoc util/ChangeLog
+}
diff --git a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.19-r2 b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.19-r2
deleted file mode 100644
index 74b5ba0f7cba..000000000000
--- a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.19-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 670dafc419fca17bfb92c9c467904b19 e2fsprogs-1.19.tar.gz
diff --git a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.22 b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.22
deleted file mode 100644
index 8f6883ba0290..000000000000
--- a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2b689fda4e954df0258c2605bc65d9b e2fsprogs-1.22.tar.gz
diff --git a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.22-r1 b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.22-r1
deleted file mode 100644
index 8f6883ba0290..000000000000
--- a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2b689fda4e954df0258c2605bc65d9b e2fsprogs-1.22.tar.gz
diff --git a/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.25 b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.25
new file mode 100644
index 000000000000..b5f40801175e
--- /dev/null
+++ b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.25
@@ -0,0 +1 @@
+MD5 4bf7a3bce3a6e444a76184395c63a7f0 e2fsprogs-1.25.tar.gz 1205760
diff --git a/sys-apps/e2fsprogs/files/e2fsprogs-1.19-po-Makefile.in.in-gentoo.diff b/sys-apps/e2fsprogs/files/e2fsprogs-1.19-po-Makefile.in.in-gentoo.diff
deleted file mode 100644
index 049687e72005..000000000000
--- a/sys-apps/e2fsprogs/files/e2fsprogs-1.19-po-Makefile.in.in-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- po/Makefile.in.in.orig	Tue Feb 27 17:18:32 2001
-+++ po/Makefile.in.in	Tue Feb 27 17:19:42 2001
-@@ -111,9 +111,9 @@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -123,7 +123,7 @@
- 	    *)     destdir=$(localedir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--	  dir=$$destdir/$$lang/LC_MESSAGES; \
-+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
- 	    $(MKINSTALLDIRS) $$dir; \
- 	  else \