Fix for #311881, actually installs xfsdump/xfsrestore now. Thanks to Yuri Karaban

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 36 insertions, 15 deletions

diff --git a/sys-fs/xfsdump/ChangeLog b/sys-fs/xfsdump/ChangeLog
index b9302f610961..bb8c355265b9 100644
--- a/sys-fs/xfsdump/ChangeLog
+++ b/sys-fs/xfsdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/xfsdump
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.76 2010/05/11 20:51:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.77 2010/07/11 21:22:52 patrick Exp $
+
+*xfsdump-3.0.4-r1 (11 Jul 2010)
+
+  11 Jul 2010; Patrick Lauer <patrick@gentoo.org> -xfsdump-3.0.4.ebuild,
+  +xfsdump-3.0.4-r1.ebuild, +files/xfsdump-3.0.4-no-symlink.patch:
+  Fix for #311881, actually installs xfsdump/xfsrestore now. Thanks to Yuri
+  Karaban
 
   11 May 2010; Joseph Jezak <josejx@gentoo.org> xfsdump-3.0.1.ebuild:
   Marked ppc/ppc64 stable for bug #311383.
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 50e08a65417e..bdbcd69a2574 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,19 +1,10 @@
------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-no-symlink.patch 992 RMD160 5b3bc24a6dadca4867ff241073823ac1b3085f60 SHA1 f1f09ec0660e1d8e74a83308e44a1b93f34e2bcc SHA256 93e74aa2600d853db1b35d95b1735e6211b18f799e254a922ee6e58de8c70047
 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_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
 EBUILD xfsdump-3.0.1.ebuild 1080 RMD160 4f8e95ce70da0a5181e7c8536fb841d128c06718 SHA1 4ebfb01684a1ecb577fd8396741d154e206e827c SHA256 53334e5a82d428a90bf84ab4df471920e3eadc02e35bf7f2d4335f77167b68ca
-EBUILD xfsdump-3.0.4.ebuild 1087 RMD160 a56df796127bbe7a7b82eaa3960697c9599765ce SHA1 96544dbd67f93fb83b3b00f2ad72894a26ded080 SHA256 f4e697dc1688d78be63a1a6cea4c23be7d244c6b945127102d925d909c79857d
-MISC ChangeLog 11074 RMD160 62924b0be98f6b9988899adec761a898a5d42d19 SHA1 32e1be8def11c8016dcc6dfce51615e17545c4cd SHA256 2580bdb34f28e1f2e6211d42d81e276ce4f78e4164bd340045193c7df0af40f4
+EBUILD xfsdump-3.0.4-r1.ebuild 1142 RMD160 1d470bd1d8a515cc620286f1acd1e64b91dc1104 SHA1 868a6d35b712626de66a2e7508d6bcad29de5b8c SHA256 39c183c59cbcc21f6c3ae46f8110b1b813f40fac0dac5f906ec5f0b9b01460c0
+MISC ChangeLog 11335 RMD160 75416f2be5cb7cd3de93e63df5b3423a40a1f649 SHA1 1ee38fbe4323a682c074159c1cec162e988f6d15 SHA256 6e801d5c401c98fabf642dcf34bd8da0f81b57acf1a71ede4d3e2f17ec089ef9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvpw0UACgkQcsIHjyDViGQKNQCfY9zvsVDAZdcd1sLSxv+WPlvu
-aakAoNTEj9denUXcqTHqi4PAG72+dImd
-=R1zm
------END PGP SIGNATURE-----
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch b/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
new file mode 100644
index 000000000000..17904f96f458
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
@@ -0,0 +1,22 @@
+diff -urd xfsdump-3.0.4.orig/dump/Makefile xfsdump-3.0.4/dump/Makefile
+--- xfsdump-3.0.4.orig/dump/Makefile	2010-01-13 03:53:18.000000000 +0200
++++ xfsdump-3.0.4/dump/Makefile	2010-04-02 11:56:50.723229130 +0300
+@@ -102,7 +102,6 @@
+ 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
+ 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+ 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+-	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+ install-dev:
+ 
+ $(COMMINCL) $(COMMON):
+diff -urd xfsdump-3.0.4.orig/restore/Makefile xfsdump-3.0.4/restore/Makefile
+--- xfsdump-3.0.4.orig/restore/Makefile	2010-01-13 03:53:18.000000000 +0200
++++ xfsdump-3.0.4/restore/Makefile	2010-04-02 11:57:07.971449947 +0300
+@@ -114,7 +114,6 @@
+ 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
+ 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
+ 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+-	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+ install-dev:
+ 
+ $(COMMINCL) $(COMMON):
diff --git a/sys-fs/xfsdump/xfsdump-3.0.4.ebuild b/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild
index 588b619ad754..1991f3e176c1 100644
--- a/sys-fs/xfsdump/xfsdump-3.0.4.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.1 2010/03/26 03:03:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild,v 1.1 2010/07/11 21:22:52 patrick Exp $
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="xfs dump/restore utilities"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
@@ -28,6 +28,7 @@ src_unpack() {
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		include/builddefs.in \
 		|| die
+	epatch "${FILESDIR}/${P}-no-symlink.patch"
 }
 
 src_compile() {