--- /usr/portage/sys-fs/evms/evms-2.5.5-r5.ebuild 2007-02-02 18:36:21.000000000 +0100 +++ evms-2.5.5-r5.ebuild 2007-02-03 21:23:28.000000000 +0100 @@ -24,7 +24,11 @@ gtk? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) ncurses? ( sys-libs/ncurses - >=dev-libs/glib-2.12.4-r1 )" + elibc_uclibc? ( || ( =dev-libs/glib-1* + >=dev-libs/glib-2.12.4-r1 ) + ) + )" + DEPEND="${RDEPEND}" src_unpack() { @@ -43,7 +47,7 @@ epatch "${FILESDIR}/${PV}/BaseName.patch" epatch "${FILESDIR}/${P}-as-needed.patch" - epatch "${FILESDIR}/${P}-glib_dep.patch" + use elibc_uclibc || epatch "${FILESDIR}/${P}-glib_dep.patch" epatch "${FILESDIR}/${P}-ocfs2.patch" epatch "${FILESDIR}/${P}-use_disk_group.patch" @@ -56,19 +60,23 @@ replace-flags -O3 -O2 replace-flags -Os -O2 - local excluded_interfaces="" - use ncurses || excluded_interfaces="--disable-text-mode" - use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui" + local myconf="" + + use ncurses || myconf="--disable-text-mode" + use gtk || myconf="${myconf} --disable-gui" # We have to link statically against glib because evmsn resides in /sbin + # but we can't do this, glib-2* not supported on uclibc + use elibc_uclibc || myconf="${myconf} --with-static-glib" + + myconf="${myconf} $(use_with debug) \ + $(use_enable nls) " + econf \ --libdir=/$(get_libdir) \ --sbindir=/sbin \ --includedir=/usr/include \ - --with-static-glib \ - $(use_with debug) \ - $(use_enable nls) \ - ${excluded_interfaces} || die "Failed configure" + ${myconf} || die "Failed configure" emake || die "Failed emake" }