Merge pull request #347 from marineam/assert_compile_et

hack(sys-libs/e2fsprogs-libs): assert compile_et is being installed

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

@@ -75,7 +75,7 @@
 
 # Assorted bugfixes, avoids corrupting filesystems by updating UUID
 =sys-fs/e2fsprogs-1.42.9 ~amd64
-=sys-libs/e2fsprogs-libs-1.42.9 ~amd64
+~sys-libs/e2fsprogs-libs-1.42.9 ~amd64
 
 # Really really hoping this fixes our compile issues
 =dev-lang/python-2.7.6 ~amd64

sdk_container/src/third_party/coreos-overlay/sys-libs/e2fsprogs-libs/Manifest

@@ -0,0 +1 @@
+DIST e2fsprogs-libs-1.42.9.tar.gz 574130 SHA256 87778c5816bfab40cd5b1c64725b4f4c94c9cca42e74b6937211fbf6f3509667 SHA512 e68f9aef3415e95db85980c1677fb6c71338b69858a386e5eabab208121b0c26b37a2ceb9b60368492d365ab4161522dff0ba74cc69030d9bc5b4819762a9aed WHIRLPOOL da5ed2b45e01dbb836c9b7fafed0105329e883fdcd5915419886173be66956a240a2581c0517fc9dd1c5513be668ae9e416d46c5bde00b447c4624980872ce78

sdk_container/src/third_party/coreos-overlay/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9-r1.ebuild

@@ -0,0 +1 @@
+e2fsprogs-libs-1.42.9.ebuild

sdk_container/src/third_party/coreos-overlay/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild,v 1.3 2014/01/18 02:37:17 vapier Exp $
+
+EAPI="4"
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="nls static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P%_pre*}
+
+src_prepare() {
+	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
+	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
+}
+
+multilib_src_configure() {
+	# we use blkid/uuid from util-linux now
+	ac_cv_lib_uuid_uuid_generate=yes \
+	ac_cv_lib_blkid_blkid_get_cache=yes \
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-lib{blkid,uuid} \
+		--disable-quota \
+		$(tc-is-static-only || echo --enable-elf-shlibs) \
+		$(tc-has-tls || echo --disable-tls) \
+		$(use_enable nls)
+}
+
+multilib_src_install() {
+	emake STRIP=: DESTDIR="${D}" install || die
+	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
+	# configure doesn't have an option to disable static libs :/
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# double make sure that compile_et is being installed...
+	test -f "${ED}/usr/bin/compile_et" || die "missing compile_et"
+}

sdk_container/src/third_party/coreos-overlay/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.9-no-quota.patch

@@ -0,0 +1,36 @@
+From 947b1fe6c67b2399edd436c74408cb354c381e4a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 31 Dec 2013 13:35:05 -0500
+Subject: [PATCH] fix build when quota is disabled
+
+Building e2fsprogs-libs with quota disabled fails:
+
+making all in lib/quota
+make[2]: Entering directory '.../lib/quota'
+make[2]: *** No rule to make target '.../lib/ext2fs/ext2_fs.h', needed by 'mkquota.o'.  Stop.
+make[2]: *** Waiting for unfinished jobs....
+make[2]: Leaving directory '.../lib/quota'
+Makefile:380: recipe for target 'all-libs-recursive' failed
+make[1]: *** [all-libs-recursive] Error 1
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f327d19..544ed02 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13,7 +13,7 @@ INSTALL = @INSTALL@
+ @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
+ @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
+ @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
+-QUOTA_LIB_SUBDIR= lib/quota
++@QUOTA_CMT@QUOTA_LIB_SUBDIR= lib/quota
+ 
+ LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
+ PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
+-- 
+1.8.4.3
+