diff options
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 10 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-9999.ebuild | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index e3ec423..435653f 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -15,13 +15,13 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="crypt loop-aes nls old-linux selinux slang unicode" +KEYWORDS="" +IUSE="+builtin-blkid crypt loop-aes nls old-linux selinux slang unicode" RDEPEND="!sys-process/schedutils !sys-apps/setarch >=sys-libs/ncurses-5.2-r2 - >=sys-libs/e2fsprogs-libs-1.41 + sys-libs/e2fsprogs-libs[without-blkid] selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )" DEPEND="${RDEPEND} @@ -32,12 +32,12 @@ src_unpack() { git_src_unpack cd "${S}" ./autogen.sh + elibtoolize } src_compile() { econf \ - --with-fsprobe=builtin \ - --enable-static-programs=blkid \ + $(useq builtin-blkid && echo --with-fsprobe=builtin --enable-static-programs=blkid) \ $(use_enable nls) \ --enable-agetty \ --enable-cramfs \ diff --git a/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild b/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild index 9242291..af26cc4 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild @@ -13,14 +13,16 @@ EGIT_REPO_URI="git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls elibc_FreeBSD" +KEYWORDS="" +IUSE="nls elibc_FreeBSD +without-blkid" -RDEPEND="sys-libs/${PN}-libs +RDEPEND="without-blkid? ( !sys-libs/${PN}-libs ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) - sys-apps/texinfo" + sys-apps/texinfo + without-blkid? ( sys-apps/util-linux[builtin-blkid] ) + " pkg_setup() { if [[ ! -e ${ROOT}/etc/mtab ]] ; then @@ -65,11 +67,13 @@ src_compile() { esac econf \ + --libdir=/lib \ --bindir=/bin \ --sbindir=/sbin \ --enable-${libtype}-shlibs \ --with-ldopts="${LDFLAGS}" \ $(use_enable !elibc_uclibc tls) \ + $(useq without-blkid && echo --disable-libblkid) \ --without-included-gettext \ $(use_enable nls) \ $(use_enable userland_GNU fsck) \ @@ -80,7 +84,7 @@ src_compile() { eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" die "Preventing included intl cruft from building" fi - emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die + emake || die # Build the FreeBSD helper if use elibc_FreeBSD ; then |