[patch] ebuild diff

e2fs-multilib.patch (text/plain), 1.89 KB, created by Alexis Ballier on 2013-08-16 19:53:56 UTC

--- e2fsprogs-libs-1.42.7.ebuild	2013-05-21 15:26:32.069182017 -0400
+++ e2fsprogs-libs-1.42.7-r1.ebuild	2013-08-16 15:08:49.469162754 -0400
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7.ebuild,v 1.12 2013/05/20 17:42:33 ago Exp $
 
-EAPI="2"
+EAPI="4"
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
 *)      UP_PV=${PV} ;;
 esac
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
@@ -32,7 +32,7 @@
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 }
 
-src_configure() {
+multilib_src_configure() {
 	# We want to use the "bsd" libraries while building on Darwin, but while
 	# building on other Gentoo/*BSD we prefer elf-naming scheme.
 	local libtype
@@ -46,6 +46,7 @@
 	ac_cv_lib_blkid_blkid_get_cache=yes \
 	ac_cv_path_LDCONFIG=: \
 	QUOTA_CMT='#' \
+	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-lib{blkid,uuid} \
 		--disable-quota \
@@ -54,9 +55,9 @@
 		$(use_enable nls)
 }
 
-src_install() {
+multilib_src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
-	gen_usr_ldscript -a com_err ss
+	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
+	use static-libs || find "${ED}" -name '*.a' -delete
 }