From 606190f127d4cade368a4ccdb7c61d7e440a4e7e Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 28 Nov 2012 21:25:06 +0100
Subject: [PATCH] add drbl patch for partclone

Package-Manager: portage-2.2.0_alpha142
RepoMan-Options: --force
---
 sys-fs/xfsprogs/ChangeLog                     |  10 ++
 sys-fs/xfsprogs/Manifest                      |   7 +
 .../files/xfsprogs-3.1.1-sharedlibs.patch     | 120 ++++++++++++++++++
 .../files/xfsprogs-3.1.8-readline.patch       |  35 +++++
 .../xfsprogs/files/xfsprogs_3.1.7-1drbl.patch |  11 ++
 sys-fs/xfsprogs/metadata.xml                  |   5 +
 sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild         | 105 +++++++++++++++
 7 files changed, 293 insertions(+)
 create mode 100644 sys-fs/xfsprogs/ChangeLog
 create mode 100644 sys-fs/xfsprogs/Manifest
 create mode 100644 sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
 create mode 100644 sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
 create mode 100644 sys-fs/xfsprogs/files/xfsprogs_3.1.7-1drbl.patch
 create mode 100644 sys-fs/xfsprogs/metadata.xml
 create mode 100644 sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
new file mode 100644
index 00000000..83e5a1b8
--- /dev/null
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sys-fs/xfsprogs
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*xfsprogs-3.1.8 (28 Nov 2012)
+
+  28 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
+  +files/xfsprogs-3.1.1-sharedlibs.patch, +files/xfsprogs-3.1.8-readline.patch,
+  +files/xfsprogs_3.1.7-1drbl.patch, +metadata.xml, +xfsprogs-3.1.8.ebuild:
+  add drbl patch for partclone
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
new file mode 100644
index 00000000..5d5e136b
--- /dev/null
+++ b/sys-fs/xfsprogs/Manifest
@@ -0,0 +1,7 @@
+AUX xfsprogs-3.1.1-sharedlibs.patch 3196 SHA256 61de2caa3c25dafaa2b7347804dfd3ed171a38d6b16ffeda7028b74b46d789e5 SHA512 056856d5ec57fcab52f3a89dafc85fb8d4545dec83a882672ff1552c44e8ea59ba09e9bf539f8f0f26e55f8f861c5957181f2a2500bcb9aedeeaf71447ee1b92 WHIRLPOOL 6ef46f3dbbc34c362d4ba358600be6c78ad7a2dc88db80e03112503a20179dc778b3ccda30cf14acdc18126b31cff13785858f65ebf73658047e38be57298237
+AUX xfsprogs-3.1.8-readline.patch 918 SHA256 8e2bbe1c9541893df8405ec603181f464088ef44dd7c0257dd2eb919cb8237ef SHA512 9dd9b9dcd603c095fa0da501f08fd4dc52d31e2edb100cac0c074c05508e04dd92a13ca4bc053067a0c53c661d1c433910266c9463f8999734d73d1861cb0c01 WHIRLPOOL 275c44346ff2ddbd08d1364ea5c91d51dd1c127c4583f1ad5ddae05aa8801b9496c204b24bf879cd828a7f0fef6ca4cb3cf9bb129aa95e0665a6ab3a0a3007d7
+AUX xfsprogs_3.1.7-1drbl.patch 501 SHA256 f8256ff0499556830ba5c2ae3bec58a1434c075b59efbd0a1fe4275f70d652e7 SHA512 d78a9d81850996ccb812ebb13663e5579742ac64e406b6777b2c588a3db8cf6d1ae0ba5445808bc7546f47edfffbb8095c1c2df400186a8408bda4f7ca2bc240 WHIRLPOOL 9431760beaca2a597ed1adf4b3755163fbcc763a951afff5e5bfc9fa4f5852e7c2b35d30c15315385f71643b7db974a232d1f200d800f91a300f6b08c0baccd4
+DIST xfsprogs-3.1.8.tar.gz 1399333 SHA256 74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab SHA512 55f325e2284a88f21f05b8a836b654de16109e509315b9f443888331e7f63bdf4bbd749643d7879c8007b95b98c7ff0a6574bb1e8cf809abe481b7584466524a WHIRLPOOL d637b01c68e3673a2b70f271068c63ad83bb18cd47252ee190204fcb94b103c513612f7111346c8eb6194d4043a236cc6ab5c1b94e4d4175ed7f34231e759601
+EBUILD xfsprogs-3.1.8.ebuild 2838 SHA256 06b63c903f3d91e572df2dafefc7793398f67f31413c444a4e4bca8294ea84bb SHA512 13044a6a8de7f5f9842dcfff4efb91365f6d915318655d218718ad5b8047a61ed47c82b4e36b86e7d6108dfcd4859a3f11592a83cb8d77dd8f1aed327a2672d3 WHIRLPOOL 05c9e1646e9be841693e0ac1d0af424f3145e82ab63ba7bac21c160dbaa8853c1991b40dc7e121be9a0acc49acb592826314549d853be1c2f35b67f7096152cd
+MISC ChangeLog 385 SHA256 328009277a4f318834d60fbc7ac23f21f4550d74bd12bfa20e3561dea57ceb20 SHA512 9b8239351cdde48a5bd74998fd3cdc57c6198b915eefe4e91d5e4da556d643f69ca6dde7a6c425015aadc6062839594aa6337a448231e7363ee4a73a2f9eb9d2 WHIRLPOOL fa9154ad998579ef1ee1f5a3e48743ec9f8f368633278c74fe0a901927e4c8bcab0f49f0dfdd1b8b32e9fd5fc9a91bce11bc4f7783321073fa341d4d37977cc6
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
new file mode 100644
index 00000000..ded1f30d
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
@@ -0,0 +1,120 @@
+ripped from PLD Linux
+
+--- xfsprogs-3.1.2/libdisk/Makefile
++++ xfsprogs-3.1.2/libdisk/Makefile
+@@ -25,8 +25,10 @@
+ include $(BUILDRULES)
+ 
+ install: default
++	$(INSTALL_LTLIB)
+ 
+ install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: install-dev
+ 
+--- xfsprogs-3.1.2/libxcmd/Makefile
++++ xfsprogs-3.1.2/libxcmd/Makefile
+@@ -32,6 +32,12 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
++install: default
++	$(INSTALL_LTLIB)
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
++
++install-qa: default
+ 
+ -include .dep
+--- xfsprogs-3.1.2/libxfs/Makefile
++++ xfsprogs-3.1.2/libxfs/Makefile
+@@ -41,7 +41,9 @@
+ include $(BUILDRULES)
+ 
+ install: default
++	$(INSTALL_LTLIB_ROOT)
+ 
+ install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: default
+--- xfsprogs-3.1.2/libxlog/Makefile
++++ xfsprogs-3.1.2/libxlog/Makefile
+@@ -12,6 +12,8 @@
+ 
+ CFILES = xfs_log_recover.c util.c
+ 
++LTLIBS = $(LIBUUID) $(LIBXFS)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+ 
+@@ -19,6 +21,12 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
++install: default
++	$(INSTALL_LTLIB_ROOT)
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
++
++install-qa: default
+ 
+ -include .dep
+--- xfsprogs-3.1.2/Makefile
++++ xfsprogs-3.1.2/Makefile
+@@ -66,6 +66,8 @@
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
++libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
+ 
+ ifneq ($(ENABLE_BLKID), yes)
+ mkfs: libdisk
+--- xfsprogs-3.1.2/include/buildmacros
++++ xfsprogs-3.1.2/include/buildmacros
+@@ -56,11 +56,13 @@
+ endif
+ 
+ ifeq ($(ENABLE_SHARED),yes)
+-INSTALL_LTLIB = \
++_INSTALL_LTLIB = set -e; \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
++	../$(INSTALL) -m 755 -d $(1); \
++	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(1); \
++	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1)
++INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR))
++INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR))
+ endif
+ 
+ # Libtool thinks the static and shared libs should be in the same dir, so
+@@ -71,17 +71,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
+-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+-	../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+-	fi
++	set -e; cd $(TOPDIR)/$(LIBNAME); \
++	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
new file mode 100644
index 00000000..c4f794e1
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
@@ -0,0 +1,35 @@
+From 52548f087e9c5ff05c9f43c859114cf2066f133b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 25 Aug 2012 19:06:28 -0400
+Subject: [PATCH] libxcmd: link against readline
+
+This library uses readline funcs (the input.c file), so we need to link
+this shared library against it.
+
+URL: https://bugs.gentoo.org/432644
+Reported-by: David Badia <dbadia@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libxcmd/Makefile |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libxcmd/Makefile b/libxcmd/Makefile
+index b3544f4..ce082a5 100644
+--- a/libxcmd/Makefile
++++ b/libxcmd/Makefile
+@@ -22,10 +22,12 @@ endif
+ 
+ ifeq ($(ENABLE_READLINE),yes)
+ LCFLAGS += -DENABLE_READLINE
++LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+ endif
+ 
+ ifeq ($(ENABLE_EDITLINE),yes)
+ LCFLAGS += -DENABLE_EDITLINE
++LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
+ endif
+ 
+ default: ltdepend $(LTLIBRARY)
+-- 
+1.7.9.7
+
diff --git a/sys-fs/xfsprogs/files/xfsprogs_3.1.7-1drbl.patch b/sys-fs/xfsprogs/files/xfsprogs_3.1.7-1drbl.patch
new file mode 100644
index 00000000..50583fad
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs_3.1.7-1drbl.patch
@@ -0,0 +1,11 @@
+diff -uNr xfsprogs-3.1.7.orig/include/Makefile xfsprogs-3.1.7/include/Makefile
+--- xfsprogs-3.1.7.orig/include/Makefile	2011-11-18 00:30:24.000000000 +0100
++++ xfsprogs-3.1.7/include/Makefile	2011-11-23 11:25:30.000000000 +0100
+@@ -53,6 +53,7 @@
+ 	$(INSTALL) -m 755 -d $(PKG_INC_DIR)
+ 	$(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR)
+ 	$(INSTALL) -m 644 platform_defs.h $(PKG_INC_DIR)
++	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
+ 
+ install-qa: install-dev
+ 	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
new file mode 100644
index 00000000..96a2d586
--- /dev/null
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
new file mode 100644
index 00000000..55b98c16
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.9 2012/08/25 23:10:10 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="xfs filesystem 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 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE="libedit nls readline static static-libs"
+REQUIRED_USE="static? ( static-libs )"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	readline? ( sys-libs/readline[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}
+	static? (
+		${LIB_DEPEND}
+		readline? ( sys-libs/ncurses[static-libs] )
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch
+	epatch "${FILESDIR}"/${PN}-3.1.8-readline.patch
+	epatch "${FILESDIR}"/xfsprogs_3.1.7-1drbl.patch
+
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+	sed -i \
+		-e '1iLLDFLAGS = -static' \
+		{estimate,fsr}/Makefile || die
+	sed -i \
+		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
+		$(find -name Makefile) || die
+
+	# libdisk has broken blkid conditional checking
+	sed -i \
+		-e '/LIB_SUBDIRS/s:libdisk::' \
+		Makefile || die
+
+	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
+	if use static && use readline ; then
+		sed -i \
+			-e 's|-lreadline|\0 -lncurses|' \
+			-e 's|-lblkid|\0 -luuid|' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
+	unset PLATFORM # if set in user env, this breaks configure
+
+	local myconf
+
+	if use readline ; then
+		myconf="--enable-readline --disable-editline"
+	elif use libedit ; then
+		myconf="--disable-readline --enable-editline"
+	else
+		myconf="--disable-readline --disable-editline"
+	fi
+
+	if use static || use static-libs ; then
+		myconf+=" --enable-static"
+	else
+		myconf+=" --disable-static"
+	fi
+
+	econf \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/$(get_libdir) \
+		$(use_enable nls gettext) \
+		${myconf}
+
+	MAKEOPTS+=" V=1"
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install install-dev
+
+	# handle is for xfsdump, the rest for xfsprogs
+	gen_usr_ldscript -a xfs xlog
+	# removing unnecessary .la files if not needed
+	use static-libs || find "${ED}" -name '*.la' -delete
+}