7 files changed, 29 insertions, 187 deletions
diff --git a/sys-fs/xfsdump/ChangeLog b/sys-fs/xfsdump/ChangeLog
index 4d7c1b087353..345294cbdd42 100644
--- a/sys-fs/xfsdump/ChangeLog
+++ b/sys-fs/xfsdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/xfsdump
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.85 2012/03/02 20:14:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.86 2012/04/26 11:10:25 scarabeus Exp $
+
+*xfsdump-3.1.0 (26 Apr 2012)
+
+  26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +xfsdump-3.1.0.ebuild,
+  -files/xfsdump-2.2.42-Makefile-deps.patch, -files/xfsdump-3.0.4-headers.patch,
+  -xfsdump-2.2.48.ebuild, -xfsdump-3.0.4-r1.ebuild, -xfsdump-3.0.5.ebuild:
+  Version bump to latest xfsdump, update to eapi4. Cleanup older versions.
 
   02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xfsdump-3.0.6.ebuild:
   ppc64 stable wrt #404865
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index ade0266c7c3b..b6f5e8d03fb4 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xfsdump-2.2.42-Makefile-deps.patch 589 RMD160 2856cb63955c1c4feba33601b8916e99f92a6a08 SHA1 20a0b53d4ea028d66565dfdbed562a544c19bf3f SHA256 723814d48474f1c536e3e56ed06a7532a500f690dd5419124635a6519ba77aa4
-AUX xfsdump-3.0.4-headers.patch 700 RMD160 23301aeff38e1ba073f83f3ac105f8a91efd6e7f SHA1 3142abf51d7facbd1bcee235944f70a3df53bf74 SHA256 6ccd1e059ad17502a97c46f6565eac76bc08d9f723e1cd061faaca47a958f3d8
 AUX xfsdump-3.0.4-no-symlink.patch 721 RMD160 ccc23d20a0289caa1b2972aee963e94082eb84ca SHA1 bd4347ebaec61c5cd81ee9e072150be2c516f1d8 SHA256 b3ccccfce2b7f36263a8b3611724560ae768a3371dcc6e19045abae8df8052a3
 AUX xfsdump-3.0.5-prompt-overflow.patch 333 RMD160 1082d60b364a49338f750fe0d9e27c619800b4a9 SHA1 55d6e9fbd96a0879d18ed8fbd6e567cb9f5acfe4 SHA256 80684664bae903256dd1b6355da9e88b727b8b42a559a6131aa2d24a6ce08428
 AUX xfsdump-3.0.6-path-overflow.patch 818 RMD160 3e94777ad8ba273f9f61e4f8ac3d017dd5c443dd SHA1 a9b522cfea26c3f7d6935b5079318668ba99acb2 SHA256 9afa75c84ca814a0186323a0194c4cca8e21ce39c52576d4775becdc4be7c4f2
 DIST xfsdump-3.0.1.tar.gz 867488 RMD160 9cd52f873d3d6108a1b6f5f468db4d6a27079a52 SHA1 7f7e168e13d8ec2bce7ae19cf3123618b654975a SHA256 ca5dd38a5710c99cb5d84c2ad41d6c6eff57fa5abf4ed271680e2bf63ae6dc7d
-DIST xfsdump-3.0.4.tar.gz 790095 RMD160 cbebdbd3ff46153da46e7f99cf0c585a68c6de40 SHA1 7b127ad608986d4330587b38e666669f914db585 SHA256 d3932f0d482f6f77ec8519ce24c00edbe006262751bfb4ad4b4bc3e219d807d1
-DIST xfsdump-3.0.5.tar.gz 797719 RMD160 ebe3a732ba80f843af4b5262af86cdb3762c8df3 SHA1 c846ae756f947ef68d9d1df38403d9de839ad9d3 SHA256 f3a86b37e268779c940996a7aba93ed1f04ad942cbc1b8d75aae1e447aa762ad
 DIST xfsdump-3.0.6.tar.gz 789635 RMD160 110392eb0f5355a48571f35698625e639ffd4273 SHA1 f86472c87480cc996b26fb46cd7b55f658fec0ca SHA256 d6aa8040f7fe7c4dcb41190b7530c36177b084134e92a2c01e309ff4c18a1829
-DIST xfsdump_2.2.48-1.tar.gz 581376 RMD160 ff877c38ecb75061a2bf6f7d3bbc135ffb346cfb SHA1 bdfffa637efa23329899fd38d6b77119d51ea039 SHA256 381a1015766fccd5f6fc1955a5dd692077c83a75d554f4765e84a001186f7c8f
-EBUILD xfsdump-2.2.48.ebuild 1146 RMD160 1535ed00bf4b16e52069e67c3a3d3c5ecdf12acb SHA1 3dd7dfcd18063596e3495ad6c0c7970d8a87d651 SHA256 7a568f76c76dc69effbd34b5a49371a0f2e9a7c3b6e24a1d4e23d8da074c4596
+DIST xfsdump-3.1.0.tar.gz 791569 RMD160 ecafb2fb125bfd6507c3301a9c07f2f749735777 SHA1 07fada4e0266c1ea12256613e5f00f74370a382e SHA256 5554a400c53c73155fc8254c80ac7cb810fa5dd02d3363d0c03dc4973ca19f6d
 EBUILD xfsdump-3.0.1.ebuild 1080 RMD160 4f8e95ce70da0a5181e7c8536fb841d128c06718 SHA1 4ebfb01684a1ecb577fd8396741d154e206e827c SHA256 53334e5a82d428a90bf84ab4df471920e3eadc02e35bf7f2d4335f77167b68ca
-EBUILD xfsdump-3.0.4-r1.ebuild 1189 RMD160 9c3224a6e8ef5b9bc55ee8c9d3527c81361f87c3 SHA1 4611fe2a6b2ee478f40f57767408ac88baa66903 SHA256 d679deb8e380714ed372e3fa5aa9ab68639877e74396e6ff025dd449649cc350
-EBUILD xfsdump-3.0.5.ebuild 1181 RMD160 f5efdf146cb6692a9a75414148c615179e68cbab SHA1 33f92302b9dfbd08b6f2c2627fd9db556a5d8b12 SHA256 c7ec4685fe8919d5cbfd42ac8569c58df103c75b24e7920430f3993d8e55154b
 EBUILD xfsdump-3.0.6.ebuild 1241 RMD160 0e5dd4869eb59f38f4c63ae081e8691e58d524f2 SHA1 4e23fdf0ab477cf62e2384506e979a336b7a08ce SHA256 0d355447d21d948e7802a5142a744eb7204a3659416388944eab859a5faf4e2e
-MISC ChangeLog 12430 RMD160 1299ae52b066762b5b146df444addcb9a522ff4d SHA1 c3ccd20bec0b9da8533f52ae28c4a8a7b8fbd2f0 SHA256 fee7810f60af10c7de8e242d68de868ac130f7969e950cbd12fe442b58827be6
+EBUILD xfsdump-3.1.0.ebuild 1164 RMD160 bbe8071e0fda64779e8506957284ca58d710cc1b SHA1 c26c9820560ef15ca16674bd2f30e0706620e071 SHA256 57202b5910630ff1d209d1b44722c47f3136e0b950cd2ed56d8452372f7351ec
+MISC ChangeLog 12770 RMD160 9961cbda5e14c9e1b80d3f068d0f26a8904b5c7c SHA1 faebd1d6faf6104eea2343701893cad77cb46d25 SHA256 548ab9044245e174b2ecdb4f58c62052c4bf3ea5f6822b29c474bb8ced347091
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPUSnnAAoJEEdUh39IaPFNc68IAJfj7ogW8UWTktGv5Wp0xspn
-bPf0DkLgpWlT4BQzeRQ3vJNWXJsVukh+i24y/50KYRFc4Ep/7XXkNiyAFjQpfkzB
-utcqDzBDrKSVMaXxAVYGy86iV8ri7RHeLGF03jntEhq9NMKVfJv/LScC8SObgDln
-C42brq5hfeYJweUrBedyxkxrBEi754Ja4NflI7isr9PHeCuC48ReH0buRkbl6EC3
-htFBu4CBkk+qsqL4iOu/X4G+PYJw73Z5DSfNCOlnRsHcKFkbvYSJnxVATbGlBhpK
-hkOslGdV2L9X4IJGiyAy/u0twTMJLzW2bbym5ZUyBGlzJ+bz03oxbW9/upUgTvg=
-=pFVE
+iQIcBAEBAgAGBQJPmS1YAAoJEOSiRoyO7jvoz6QP/iZV71CSZsTSOCLWAwX+Rfgt
+v5NGrnrAiDdS7MyQJDdlgKtHUsnab2cW2V4SrvxepcKkjDejAb+yvB+iXYEQ8vvB
+V6JeX3Lx9x0/lXQcWqU/nUopcDr3/OPziqylZ3ljWX17uC3/YCQpxAErtSC4KR5d
+nq4Bz1XjU4/sAwsh4yojSCMBaY0giFjz8+vWd3UTHYMwbheMrhQ6vZhhfUmusFts
+O+01FGYCdpsUKwoNh2GaLmyXPp53r0YWXFNmatQqcugzqKhZTrEnydFy2KzyeZVa
+5nX0dJxSlqYPrVy7bYHE0JDriJxnSLfNeADmSLUyJWHEM4lBj9A6xMCBHXDj3Kpr
+2cN5+mYHf5gEs41NOLoTdyix5bb5ZCgVp2CiHUgd2n9/1LxIvOB1bTPwDx5pbrCx
+K3xiO0jx3vIEe4GSuvWsf2PHkA2Euz3tf62uM86y1cLKFpymRkv+5pyV5ENCXvfU
+2KO15UAdJqBB19o6O0jHZj/VtjgMVs1Zh71tyHXjhqI8ag2nOhObnvW1TF7xu3ag
+oDtbVSjdmC29GuM03+57uIKEf4XlqaGUz8Mr0FKsTRJ4nPRXlUv1wW7PXoKr5/bN
+i59E5fOIf0UAeqaYhhY//iRpSu6o8J+sY40tm0nr65MOjaeGr7RRM/XvA6k4NDe4
+vU3B2RzkfuM7vdXWYCSf
+=dVBL
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsdump/files/xfsdump-2.2.42-Makefile-deps.patch b/sys-fs/xfsdump/files/xfsdump-2.2.42-Makefile-deps.patch
deleted file mode 100644
index 6ab15d7490ca..000000000000
--- a/sys-fs/xfsdump/files/xfsdump-2.2.42-Makefile-deps.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix parallel build
-
-http://bugs.gentoo.org/136373
-
---- xfsdump-2.2.33/dump/Makefile
-+++ xfsdump-2.2.33/dump/Makefile
-@@ -106,3 +106,5 @@
- 
- $(INVINCL) $(INVCOMMON):
- 	$(RM) $@; $(LN_S) ../inventory/$@ $@
-+
-+$(LOCALS): $(LINKS)
---- xfsdump-2.2.33/invutil/Makefile
-+++ xfsdump-2.2.33/invutil/Makefile
-@@ -70,3 +70,5 @@
- 
- $(INVINCL) $(INVCOMMON):
- 	$(RM) $@; $(LN_S) ../inventory/$@ $@
-+
-+$(LOCALS): $(LINKS)
---- xfsdump-2.2.33/restore/Makefile
-+++ xfsdump-2.2.33/restore/Makefile
-@@ -116,3 +116,5 @@
- 
- $(INVINCL) $(INVCOMMON):
- 	$(RM) $@; $(LN_S) ../inventory/$@ $@
-+
-+$(LOCALS): $(LINKS)
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.4-headers.patch b/sys-fs/xfsdump/files/xfsdump-3.0.4-headers.patch
deleted file mode 100644
index b451ac41ea9d..000000000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.4-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-newer glibc requires explicit sys/stat.h inclusion when you use things
-from that header
-
---- xfsdump-3.0.4/invutil/cmenu.c
-+++ xfsdump-3.0.4/invutil/cmenu.c
-@@ -21,6 +21,7 @@
- 
- #include <ncurses.h>
- #include <signal.h>
-+#include <sys/stat.h>
- 
- #include "types.h"
- #include "mlog.h"
---- xfsdump-3.0.4/invutil/invidx.c
-+++ xfsdump-3.0.4/invutil/invidx.c
-@@ -21,6 +21,7 @@
- 
- #include <ncurses.h>
- #include <sys/mman.h>
-+#include <sys/stat.h>
- 
- #include "types.h"
- #include "mlog.h"
---- xfsdump-3.0.4/invutil/stobj.c
-+++ xfsdump-3.0.4/invutil/stobj.c
-@@ -20,6 +20,7 @@
- #include <xfs/jdm.h>
- #include <ncurses.h>
- #include <sys/mman.h>
-+#include <sys/stat.h>
- 
- #include "types.h"
- #include "mlog.h"
diff --git a/sys-fs/xfsdump/xfsdump-2.2.48.ebuild b/sys-fs/xfsdump/xfsdump-2.2.48.ebuild
deleted file mode 100644
index e4a2c1eceef2..000000000000
--- a/sys-fs/xfsdump/xfsdump-2.2.48.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-2.2.48.ebuild,v 1.7 2009/01/31 01:28:24 jer Exp $
-
-inherit eutils autotools
-
-MY_P="${PN}_${PV}-1"
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
-IUSE=""
-
-RDEPEND="sys-fs/e2fsprogs
-	sys-fs/xfsprogs
-	sys-apps/dmapi
-	>=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/^GCFLAGS/s:-O1::' \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${PN}-2.2.42-Makefile-deps.patch
-	eautoconf
-}
-
-src_compile() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install || die
-	prepalldocs
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild
deleted file mode 100644
index 5ba25654b070..000000000000
--- a/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild,v 1.2 2010/08/29 22:21:49 vapier Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/e2fsprogs
-	!<sys-fs/xfsprogs-3
-	sys-apps/dmapi
-	>=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${PN}-3.0.4-headers.patch
-	epatch "${FILESDIR}"/${P}-no-symlink.patch
-}
-
-src_compile() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--libexecdir=/usr/$(get_libdir) \
-		--sbindir=/sbin \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install || die
-	prepalldocs
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.0.5.ebuild b/sys-fs/xfsdump/xfsdump-3.1.0.ebuild
index d50658c21b16..dee065af38ad 100644
--- a/sys-fs/xfsdump/xfsdump-3.0.5.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.0.5.ebuild,v 1.1 2011/04/12 17:56:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.1.0.ebuild,v 1.1 2012/04/26 11:10:25 scarabeus Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit multilib eutils
 
@@ -44,6 +44,5 @@ src_configure() {
 }
 
 src_install() {
-	emake DIST_ROOT="${D}" install || die
-	prepalldocs
+	emake DIST_ROOT="${D}" install
 }