From f89e52523db809bb90ae5c10486cc20acdb4d5c9 Mon Sep 17 00:00:00 2001 From: Patrick Lauer <patrick@gentoo.org> Date: Sun, 11 Jul 2010 21:22:52 +0000 Subject: Fix for #311881, actually installs xfsdump/xfsrestore now. Thanks to Yuri Karaban (Portage version: 2.2_rc67/cvs/Linux x86_64) --- sys-fs/xfsdump/ChangeLog | 9 +++- .../xfsdump/files/xfsdump-3.0.4-no-symlink.patch | 22 ++++++++++ sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild | 50 ++++++++++++++++++++++ sys-fs/xfsdump/xfsdump-3.0.4.ebuild | 49 --------------------- 4 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch create mode 100644 sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild delete mode 100644 sys-fs/xfsdump/xfsdump-3.0.4.ebuild (limited to 'sys-fs/xfsdump') 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/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-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild new file mode 100644 index 000000000000..1991f3e176c1 --- /dev/null +++ b/sys-fs/xfsdump/xfsdump-3.0.4-r1.ebuild @@ -0,0 +1,50 @@ +# 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.1 2010/07/11 21:22:52 patrick 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}/${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.4.ebuild b/sys-fs/xfsdump/xfsdump-3.0.4.ebuild deleted file mode 100644 index 588b619ad754..000000000000 --- a/sys-fs/xfsdump/xfsdump-3.0.4.ebuild +++ /dev/null @@ -1,49 +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.ebuild,v 1.1 2010/03/26 03:03:25 vapier Exp $ - -inherit multilib - -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 -} - -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 -} -- cgit v1.2.3-65-gdbad