2.6.3 stable on x86 and amd64, 2.6.13 added to the tree, bug 54108.

5 files changed, 85 insertions, 7 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 206a0928ca76..c2eb4c9fac0e 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.15 2004/07/01 21:52:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.16 2004/07/28 19:27:07 avenj Exp $
+
+*xfsprogs-2.6.13 (28 Jul 2004)
+
+  28 Jul 2004; Jon Portnoy <avenj@gentoo.org> xfsprogs-2.6.13.ebuild :
+  Version bump.
+
+  28 Jul 2004; Jon Portnoy <avenj@gentoo.org> xfsprogs-2.6.3.ebuild :
+  Bump to stable on x86 and AMD64, bug #54108.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xfsprogs-1.3.13.ebuild, xfsprogs-2.6.3.ebuild:
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 0514fc2433e2..8e3a09c9d663 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,10 +1,12 @@
-MD5 95c80d2f7920bbb27e6d3ab35c5cae70 xfsprogs-2.3.9.ebuild 1498
+MD5 4938cce7f60aa30defe8d0bc968aca50 ChangeLog 5694
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 9e42ad06e1b82266ed01a015574ef469 xfsprogs-1.3.13.ebuild 1390
-MD5 08683ccd9e25e2f8812a34308d92213e xfsprogs-2.6.3.ebuild 1558
+MD5 95c80d2f7920bbb27e6d3ab35c5cae70 xfsprogs-2.3.9.ebuild 1498
 MD5 b120762512e6b89ddd3bd48286423e02 xfsprogs-2.6.0.ebuild 1545
-MD5 c9876ca653e906e4caa67462e142e717 ChangeLog 5456
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c5a6d8b1c1665ced6922d00fc1c455af xfsprogs-2.6.3.ebuild 1556
+MD5 08683ccd9e25e2f8812a34308d92213e xfsprogs-2.6.13.ebuild 1558
 MD5 cef66d8125681fa3a3eccf0be0698b25 files/digest-xfsprogs-1.3.13 71
 MD5 0ad03e88abe9cb756d16c8b202804fbc files/digest-xfsprogs-2.3.9 70
 MD5 ed760013d5e82b9e87430f596ba7b76c files/digest-xfsprogs-2.6.0 70
 MD5 904d7858666a28afd34a5e0e4e5bc2ae files/digest-xfsprogs-2.6.3 70
+MD5 3d4e4aea1da9c2a07cc9581930aab671 files/digest-xfsprogs-2.6.13 71
diff --git a/sys-fs/xfsprogs/files/digest-xfsprogs-2.6.13 b/sys-fs/xfsprogs/files/digest-xfsprogs-2.6.13
new file mode 100644
index 000000000000..e0d10ef28967
--- /dev/null
+++ b/sys-fs/xfsprogs/files/digest-xfsprogs-2.6.13
@@ -0,0 +1 @@
+MD5 6c83524988838de0ab96a23db4b40412 xfsprogs-2.6.13.src.tar.gz 846585
diff --git a/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild b/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild
new file mode 100644
index 000000000000..575dc41858c2
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild,v 1.1 2004/07/28 19:27:07 avenj Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
+IUSE=""
+
+RDEPEND="virtual/libc
+	sys-fs/e2fsprogs"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \
+		-e '/^GCFLAGS/s:-O1::' \
+		-e '/^PKG_[[:upper:]]*_DIR/s:= := $(DESTDIR):' \
+		include/builddefs.in \
+		|| die "sed include/builddefs.in failed"
+}
+
+src_compile() {
+	replace-flags -O[2-9] -O1
+	export OPTIMIZER="${CFLAGS}"
+	export DEBUG=-DNDEBUG
+
+	# Some archs need the PLATFORM var unset
+	if hasq ${ARCH} mips ppc sparc; then
+		unset PLATFORM
+	fi
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--libdir=/lib \
+		--libexecdir=/lib \
+		|| die "config failed"
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		DK_INC_DIR=${D}/usr/include/disk \
+		install install-dev \
+		|| die "make install failed"
+	dosym /lib/libhandle.so.1 /lib/libhandle.so
+
+	dodir /usr/lib
+	sed \
+		-e 's:installed=no:installed=yes:g' \
+		${S}/libhandle/.libs/libhandle.la \
+		> ${D}/usr/lib/libhandle.la \
+		|| die "sed failed"
+	mv ${D}/lib/*.a ${D}/usr/lib/ || die "mv failed"
+	prepalldocs
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-2.6.3.ebuild b/sys-fs/xfsprogs/xfsprogs-2.6.3.ebuild
index ac70d4a45dda..aaefc284400d 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.6.3.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.3.ebuild,v 1.7 2004/07/01 21:52:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.3.ebuild,v 1.8 2004/07/28 19:27:07 avenj Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa amd64 ~ia64"
 IUSE=""
 
 RDEPEND="virtual/libc