Add multilib support by Alexis Ballier (bug #479318).

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 64 insertions, 6 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index b3f1a35af4bf..9531882ea510 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/fam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.76 2013/04/24 17:53:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.77 2013/08/01 01:28:23 jer Exp $
+
+*fam-2.7.0-r7 (01 Aug 2013)
+
+  01 Aug 2013; Jeroen Roovers <jer@gentoo.org> +fam-2.7.0-r7.ebuild:
+  Add multilib support by Alexis Ballier (bug #479318).
 
   24 Apr 2013; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r6.ebuild:
   Fix building with automake-1.13.
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index fd7eefa165f3..166dfb489470 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -5,12 +5,13 @@ AUX famd 490 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc2
 DIST fam-2.7.0.tar.gz 301974 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2 WHIRLPOOL de90043aaaa6fd792975c13589564f85feb735738b9476b57e80d26a224fcb6f3a858ae383417e5ea48c2fa28b1a7e9c33d729caff5bb417bfbfa840ec228e47
 DIST fam_2.7.0-17.diff.gz 28056 SHA256 2362384d1fbde5dcbccf70f617aedbcae44d3f826a5b9df1331b070da1e0d5c2 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209 WHIRLPOOL 59ed522ccfc8825051d1b281ced215c8b045dc0021bf0f28755aeb1f580ebb6eddb09934128aed51e91ea3d0ac24bfd976f0733ac90b7ef0e377fa982996efbd
 EBUILD fam-2.7.0-r6.ebuild 1305 SHA256 23c523776e0fb7d3aa5602856010700a6601ef1ce13aaa5ae23eb76f66208312 SHA512 5faad428b1b579f2abb6872d433c660abd0a1bcdee55d1a3fdd4eb9a7021db84e1b592283b07ed63d36c2edd7256f2fe0f1cd9dacbc35b1c28e215a227614083 WHIRLPOOL 53905e29872f0291b42ef15bbadba82892a8cc9032f0dc7928f6e6016e6be1eec1e512559b24c72782a08f868081df43315efc8cbc936bba8674394bb21c38ac
-MISC ChangeLog 13450 SHA256 0e5286c236e8178c8cc5f7046f0bf17c9d71aef5fba08671fa98b6e0809db60d SHA512 da874259b7e38da0f152856c4036ef63500fd28588533280e908077a33698774e8cdd2993d54f50cd6b7fc557145dbe194a177187c6841f723ad0ef9eb8e1bab WHIRLPOOL 102766267e7cb3217aee7d18f7ab930a6dd15431fda4d447de10c4a42c8f403ae014fde3bf1e06b4378b32f11dc600a0860440924a06f6059a65543da5d8f822
+EBUILD fam-2.7.0-r7.ebuild 1487 SHA256 69b669526001e1be9a73aae88ea2194843883d7188cd4877f0e4d7a84151cd38 SHA512 52e811966f8c21add8580550fe27f93c5cb1adb3e1c88805dbd84fbdad9d4a31be1077b939e28eed431c082b3f2f4dc4012c244f232aba075d95e0c0062d16dc WHIRLPOOL f2a879a33a38f84a12059fb2ad2e3bcc14b167a80f22652b5586738959a15caebad9a6083c9d07349607d5b3cc081d047ce46e5471b96bc988f1d05e82167d9a
+MISC ChangeLog 13605 SHA256 28918d8eedb3510255b85482410cb7b076b0e23ac110896b6dbdf159f8ef8ee5 SHA512 cf482b84625d7eefcbcf6a067a30baf2265d8fe831fa8bd6ea4f274ef361dea8872210e8aa81f371eba462bd82020b9bd0c107105f2aa5c274cb57e31540000e WHIRLPOOL e513edd9acac55927a32e4cf79ed4538985d6676b1264697ce2141fadba01c26d28973f6e5b6ad02e750751eb38fd4695432464cab018f460a78049d06621345
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlF4HCgACgkQVWmRsqeSphPCFgCeM+BxnaCtqLbCe5/fCtf6u0P6
-13cAnAs0xE5dPP6T6XfJdJyvQkIxGxdI
-=sccm
+iEYEAREIAAYFAlH5ubkACgkQVWmRsqeSphNm5gCfaN1Q6bx8ajR4taTYPbN345wG
+c5EAn36kXtPnKXSZGvrTtcazXsUkNbpt
+=9IbL
 -----END PGP SIGNATURE-----
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
new file mode 100644
index 000000000000..2989cebea5c9
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r7.ebuild,v 1.1 2013/08/01 01:28:23 jer Exp $
+
+EAPI=5
+inherit eutils autotools multilib-minimal
+
+DEBIAN_PATCH="17"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
+	mirror://debian/pool/main/f/${PN}/${P/-/_}-${DEBIAN_PATCH}.diff.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
+	!app-admin/gamin"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+
+src_prepare() {
+	epatch "${WORKDIR}/${P/-/_}-${DEBIAN_PATCH}.diff"
+	edos2unix "${S}"/${P}/debian/patches/10_debianbug375967.patch
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}