diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2009-06-27 08:34:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2009-06-27 08:34:18 +0300 |
| commit | 83b6870291c5d44b38b2089d3498a49e56a869ff (patch) | |
| tree | 04e3689107829034ec0359a2c3168184d68533f1 /sys-fs | |
| parent | cb6532933a6f3540b2b0a5e08ce7a6de91f4e2ec (diff) | |
modified: sys-apps/util-linux/util-linux-9999.ebuild
modified: sys-fs/e2fsprogs/e2fsprogs-9999.ebuild
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-9999.ebuild | 17 |
1 files changed, 7 insertions, 10 deletions
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) \ |