diff options
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 9 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-9999.ebuild | 17 |
2 files changed, 12 insertions, 14 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 18a6320..06fd121 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -16,7 +16,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="" KEYWORDS="" -IUSE="+builtin-blkid crypt loop-aes nls old-linux selinux slang unicode" +IUSE="+enable-blkid crypt loop-aes nls old-linux selinux slang unicode" RDEPEND="!sys-process/schedutils !sys-apps/setarch @@ -33,11 +33,9 @@ src_unpack() { ./autogen.sh elibtoolize } - - src_compile() { econf \ - $(useq builtin-blkid && echo --with-fsprobe=builtin) \ + $(useq enable-blkid && echo --with-fsprobe=builtin) \ $(use_enable nls) \ --enable-agetty \ --enable-cramfs \ @@ -65,5 +63,8 @@ src_compile() { src_install() { emake install DESTDIR="${D}" || die "install failed" +# dodir "${D}/$(get_libdir)" +# rsync -a --no-r -v "${D}/usr/$(get_libdir)/" "${D}/$(get_libdir)/" +# die dodoc AUTHORS NEWS README* TODO docs/* } diff --git a/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild b/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild index 88b3cbf..097620a 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild @@ -14,14 +14,12 @@ EGIT_REPO_URI="git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git" LICENSE="GPL-2 BSD" SLOT="" KEYWORDS="" -IUSE="nls elibc_FreeBSD +without-blkid" +IUSE="nls elibc_FreeBSD +disable-blkid +disable-uuidd" -RDEPEND="without-blkid? ( !sys-libs/${PN}-libs ) - nls? ( virtual/libintl )" +RDEPEND="nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) sys-apps/texinfo - without-blkid? ( sys-apps/util-linux[builtin-blkid] ) " pkg_setup() { @@ -36,10 +34,10 @@ src_unpack() { # unpack ${A} git_src_unpack cd "${S}" - eautoreconf - epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 +# eautoreconf +# epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 # epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch +# epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc sed -i -r \ @@ -65,15 +63,14 @@ src_compile() { *-darwin*) libtype=bsd;; *) libtype=elf;; 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) \ + $(useq disable-blkid && echo --disable-libblkid) \ + $(useq disable-uuidd && echo --disable-uuidd) \ --without-included-gettext \ $(use_enable nls) \ $(use_enable userland_GNU fsck) \ |