--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- a/e2fsprogs-1.42.6.ebuild +++ b/e2fsprogs-1.42.6.ebuild @@ -18,7 +18,7 @@ LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" -IUSE="nls static-libs elibc_FreeBSD" +IUSE="nls static-libs static elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 @@ -42,6 +42,7 @@ epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch + epatch "${FILESDIR}"/${P}-static-progs.patch if [[ ${CHOST} == *-mint* ]] ; then epatch "${FILESDIR}"/${PN}-1.41-mint.patch epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch @@ -51,7 +52,8 @@ sed -i -r \ -e 's:@LIBINTL@:@LTLIBINTL@:' \ -e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ - -e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \ + -e '/^DEP(|STATIC_)LIB(COM_ERR|SS)/s:=.*:=:' \ + -e '/^STATIC_LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@STATIC_LIB_EXT@:-l\1:' \ MCONFIG.in || die "muck libs" #122368 sed -i -r \ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ @@ -89,7 +91,8 @@ --disable-libuuid \ --disable-quota \ --disable-fsck \ - --disable-uuidd + --disable-uuidd \ + $(use_enable static static-progs) if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then eerror "INTL sanity check failed, aborting build." eerror "Please post your ${S}/config.log file as an"