old, broken with new glibc

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 4 insertions, 505 deletions

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 457b58991f15..d96052b2632f 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX xfsprogs-3.0.1-sharedlibs.patch 2453 RMD160 782f49a1842586d7319872730810c92e967b8a2e SHA1 109f89f130d46a8044c7676976d34c183db12f28 SHA256 57152260aa118159533133e7c1e0e20181237c428ce282f6c70f3c9767cd058b
 AUX xfsprogs-3.1.1-sharedlibs.patch 3155 RMD160 50be1dfe1ce5bfca949cb9ca350398a9a9140c44 SHA1 731bd98af57ca163dba9c55e0cdfd36ed8dfeb96 SHA256 4faf261ea393421297a15745fcda184aa088ec5b1456f0fdf92c2053070ebf00
-AUX xfsprogs-3.1.2-depend.patch 4283 RMD160 bf245515dff4d2c385acba3fdec67eddffaaa51d SHA1 1596c731f658c50ef5e0e08bebe5cfb6395079dc SHA256 72445316dcf125964ff962d6fe53d56c0f6be7bc374ee4800608918a340d3411
-DIST xfsprogs-3.0.3.tar.gz 1336000 RMD160 ae7195e176b02b4ec0c54b32599aec69f267d52c SHA1 621653d73227c5c273f0dd8972998b4c8dad3eb1 SHA256 58b33a4b19ee85eb14d5c3908fa60ce822d1eccc89f1a9b7839171ab576c0d95
-DIST xfsprogs-3.1.2.tar.gz 1375497 RMD160 9ac4a99df3e97928e3b991f236eecab03401d80b SHA1 e96465819b496adf0156bb53313fc1ad884debc6 SHA256 9128046ea978a65560b0e87406af9646a283fa0b54eab1801b971d8a89086ddd
 DIST xfsprogs-3.1.4.tar.gz 1377412 RMD160 8085c82cfaa8f2efa1496fa851d22c53866cb59d SHA1 54472812ecf2f0e5e3addcdef639895dd80081f8 SHA256 1cdceb890622dbe7b9d42b9b81f37bb9f7d380b44606db138cf7c4676ad0a1a6
-EBUILD xfsprogs-3.0.3.ebuild 1526 RMD160 1384dad6ab5a2caafce5bdaa02537e5d9f374207 SHA1 d8dc3f723755d285e22945448c08aded90b6e1f4 SHA256 47e74e9f9db9864f8e77f536809157d3fe8a0d526c4eb827e6b396735d04b5c9
-EBUILD xfsprogs-3.1.2.ebuild 2779 RMD160 c8299e6130e57121dd615e5a359c9ad2e883c862 SHA1 319ec1f5937ea5efa12eb16cee7c8ee3b2dd82ca SHA256 78cd53a826690977cf2384eddb1874053dc076451b5423535a8bf557508b2c47
 EBUILD xfsprogs-3.1.4.ebuild 2745 RMD160 ae8061f23e58c3d5dad6781ae757183d3b7beb91 SHA1 770d6145e38642c2a4a927797d939d911d686ecf SHA256 19799432858cce4b66e13d259b6a5f9e8c76d8dc70ad2be2ae544ac3878598fc
 MISC ChangeLog 20965 RMD160 5ae0957ae184576d7b6f65ffdcf7a1c9881b5a7d SHA1 f2128234f14af038ff440a04d312a8980e4d5976 SHA256 f91a8b5d6a9daba7a9782fba6a2387aefb7e8e3b6a09dd6a695b410c30f582bb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2TVjAACgkQVWmRsqeSphMjEQCfclTZTfuwWFXrxCUG6DEsvxJU
-augAn0btIDgPuNJnSQTZZ7hWvrqTAmn+
-=9N92
+iF4EAREIAAYFAk2TYmYACgkQXkR9YqOcLPGHEgD/RDy0AKVUN88nTVPP1ZD60/YD
+ebNsQIGiuouW2j2AOMwBAKmncDN/Poc57/6kS6U4lkxv0dh5BQh5WBPq8GBwAFwW
+=Hfhi
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch
deleted file mode 100644
index 32af7a2fede8..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-ripped from PLD Linux
-
---- xfsprogs-3.0.0/libdisk/Makefile
-+++ xfsprogs-3.0.0/libdisk/Makefile
-@@ -25,8 +25,9 @@
- include $(BUILDRULES)
- 
- install: default
-+	$(INSTALL_LTLIB)
- 
- install-dev: default
--	$(INSTALL_LTLIB_STATIC)
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
---- xfsprogs-3.0.1/libxcmd/Makefile
-+++ xfsprogs-3.0.1/libxcmd/Makefile
-@@ -24,4 +24,10 @@
-
- include $(BUILDRULES)
-
--install install-dev install-qa: default
-+install: default
-+	$(INSTALL_LTLIB)
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
---- xfsprogs-3.0.0/libxfs/Makefile
-+++ xfsprogs-3.0.0/libxfs/Makefile
-@@ -41,7 +41,9 @@
- include $(BUILDRULES)
- 
- install: default
-+	$(INSTALL_LTLIB)
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: default
---- xfsprogs-3.0.0/libxlog/Makefile
-+++ xfsprogs-3.0.0/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,4 +21,10 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+	$(INSTALL_LTLIB)
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+       
-+install-qa: default
-
---- xfsprogs-3.0.0/Makefile
-+++ xfsprogs-3.0.0/Makefile
-@@ -41,6 +41,7 @@
- mkfs: libxfs libdisk
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
- 
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
---- xfsprogs-3.0.0/include/buildmacros
-+++ xfsprogs-3.0.0/include/buildmacros
-@@ -69,17 +69,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
--	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
--	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
--	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
--	fi
-+	cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_DEVLIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch
deleted file mode 100644
index 4c1b16e8ad7c..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-http://bugs.gentoo.org/333155
-
-hackish fix for constant dependency and parallel build failures
-
---- a/copy/Makefile
-+++ b/copy/Makefile
-@@ -13,7 +13,7 @@
- LTDEPENDENCIES = $(LIBXFS)
- LLDFLAGS = 
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/db/Makefile
-+++ b/db/Makefile
-@@ -30,7 +30,7 @@
- CFLAGS += -DENABLE_EDITLINE
- endif
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/estimate/Makefile
-+++ b/estimate/Makefile
-@@ -9,7 +9,7 @@
- LTCOMMAND = xfs_estimate
- CFILES = xfs_estimate.c
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/fsr/Makefile
-+++ b/fsr/Makefile
-@@ -10,7 +10,7 @@
- CFILES = xfs_fsr.c
- LLDLIBS = $(LIBHANDLE)
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/growfs/Makefile
-+++ b/growfs/Makefile
-@@ -22,7 +22,7 @@
- LLDFLAGS = 
- LSRCFILES = xfs_info.sh
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/include/buildrules
-+++ b/include/buildrules
-@@ -94,10 +94,9 @@
- 
- MAKEDEP := $(MAKEDEPEND) $(CFLAGS)
- 
--ltdepend: $(CFILES) $(HFILES)
-+# a bit hackish, but works for now
-+LTDEP_FILTER = $(SED) -e 's,^\([^:]*\)\.o,\1.lo,'
-+DEP_FILTER   = cat
-+.dep: $(CFILES) $(HFILES)
- 	@echo "    [DEP]"
--	$(Q)$(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' > .dep
--
--depend: $(CFILES) $(HFILES)
--	@echo "    [DEP]"
--	$(Q)$(MAKEDEP) $(CFILES) > .dep
-+	$(Q)$(MAKEDEP) $(CFILES) | $(DEP_FILTER) > .dep
---- a/io/Makefile
-+++ b/io/Makefile
-@@ -63,7 +63,7 @@
- LCFLAGS += -DHAVE_FALLOCATE
- endif
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/libdisk/Makefile
-+++ b/libdisk/Makefile
-@@ -20,7 +20,7 @@
- LSRCFILES = $(LINUX_DRIVERS)
- endif
- 
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
- 
- include $(BUILDRULES)
- 
-@@ -32,4 +32,5 @@
- 
- install-qa: install-dev
- 
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libhandle/Makefile
-+++ b/libhandle/Makefile
-@@ -15,7 +15,7 @@
- CFILES = handle.c jdm.c
- LSRCFILES = libhandle.sym
- 
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
- 
- include $(BUILDRULES)
- 
-@@ -27,4 +27,5 @@
- 
- install-qa: install-dev
- 
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -28,7 +28,7 @@
- LCFLAGS += -DENABLE_EDITLINE
- endif
- 
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
- 
- include $(BUILDRULES)
- 
-@@ -40,4 +40,5 @@
- 
- install-qa: default
- 
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -36,7 +36,7 @@
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
- 
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
- 
- include $(BUILDRULES)
- 
-@@ -48,4 +48,5 @@
- 
- install-qa: default
- 
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -17,7 +17,7 @@
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
- 
- include $(BUILDRULES)
- 
-@@ -29,4 +29,5 @@
- 
- install-qa: default
- 
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/logprint/Makefile
-+++ b/logprint/Makefile
-@@ -16,7 +16,7 @@
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
- LLDFLAGS = 
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/mdrestore/Makefile
-+++ b/mdrestore/Makefile
-@@ -12,7 +12,7 @@
- LTDEPENDENCIES = $(LIBXFS)
- LLDFLAGS = 
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/mkfs/Makefile
-+++ b/mkfs/Makefile
-@@ -27,7 +27,7 @@
- LSRCFILES = $(FSTYP).c
- LDIRT = $(FSTYP)
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- ifneq ($(ENABLE_BLKID),yes)
- default: $(FSTYP)
---- a/quota/Makefile
-+++ b/quota/Makefile
-@@ -28,7 +28,7 @@
- CFLAGS += -DENABLE_EDITLINE
- endif
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
---- a/repair/Makefile
-+++ b/repair/Makefile
-@@ -24,7 +24,7 @@
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
- LLDFLAGS = 
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- globals.o: globals.h
- 
---- a/rtcp/Makefile
-+++ b/rtcp/Makefile
-@@ -9,7 +9,7 @@
- CFILES = xfs_rtcp.c
- LLDFLAGS = 
- 
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
- 
- include $(BUILDRULES)
- 
diff --git a/sys-fs/xfsprogs/xfsprogs-3.0.3.ebuild b/sys-fs/xfsprogs/xfsprogs-3.0.3.ebuild
deleted file mode 100644
index 144d3b17ed12..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.0.3.ebuild
+++ /dev/null
@@ -1,54 +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/xfsprogs/xfsprogs-3.0.3.ebuild,v 1.5 2010/05/11 20:50:42 josejx Exp $
-
-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="nls static"
-
-RDEPEND="sys-fs/e2fsprogs
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0.1-sharedlibs.patch
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die "sed include/builddefs.in failed"
-	sed -i '1iLLDFLAGS = -static' {estimate,fsr}/Makefile
-	sed -i \
-		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
-		$(find -name Makefile)
-}
-
-src_compile() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-	econf \
-		--bindir=/usr/bin \
-		--sbindir=/sbin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		|| die "config failed"
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev || die "make install failed"
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a disk handle xfs xlog
-	prepalldocs
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
deleted file mode 100644
index f0b0b53d8afb..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
+++ /dev/null
@@ -1,104 +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/xfsprogs/xfsprogs-3.1.2.ebuild,v 1.4 2010/08/18 00:33:33 vapier Exp $
-
-EAPI="3"
-
-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"
-
-RDEPEND=">=sys-apps/util-linux-2.17.2
-	!<sys-fs/xfsdump-3
-	readline? (
-		sys-libs/readline
-		static? ( sys-libs/ncurses )
-	)
-	!readline? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	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
-
-	if use static && use !static-libs ; then
-		ewarn "Can't build a static variant of the executables without static-libs."
-		ewarn "Static libs will also be built."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch
-	epatch "${FILESDIR}"/${PN}-3.1.2-depend.patch #333155
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die "sed include/builddefs.in failed"
-	sed -i \
-		-e '1iLLDFLAGS = -static' \
-		{estimate,fsr}/Makefile || die "sed failed"
-
-	sed -i \
-		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
-		$(find -name Makefile) || die "sed failed"
-
-	# 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 "sed failed"
-	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="${myconf} --enable-static"
-	else
-		myconf="${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="${D}" install install-dev || die
-	prepalldocs
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-}