diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-04-24 17:53:43 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-04-24 17:53:43 +0000 |
| commit | 1c74586abbff7de23821f7dcd1409c8e590367b3 (patch) | |
| tree | a91ba97ebb6a0ff02d9806e79a453fb14f64051b /app-admin | |
| parent | Use subslot operator for the libpng dependency. Use AC_CONFIG_HEADERS instead... (diff) | |
| download | gentoo-2-1c74586abbff7de23821f7dcd1409c8e590367b3.tar.gz gentoo-2-1c74586abbff7de23821f7dcd1409c8e590367b3.tar.bz2 gentoo-2-1c74586abbff7de23821f7dcd1409c8e590367b3.zip | |
Fix building with automake-1.13.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/fam/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/fam/fam-2.7.0-r6.ebuild | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog index 9ca220476100..b3f1a35af4bf 100644 --- a/app-admin/fam/ChangeLog +++ b/app-admin/fam/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/fam -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.75 2012/02/25 15:54:05 ssuominen Exp $ +# 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 $ + + 24 Apr 2013; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r6.ebuild: + Fix building with automake-1.13. 25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -fam-2.7.0-r5.ebuild, -files/fam-2.7.0-gcc41.patch, -files/fam-2.7.0-gcc43.patch, diff --git a/app-admin/fam/fam-2.7.0-r6.ebuild b/app-admin/fam/fam-2.7.0-r6.ebuild index 5b33dc275af6..2ca816ed994c 100644 --- a/app-admin/fam/fam-2.7.0-r6.ebuild +++ b/app-admin/fam/fam-2.7.0-r6.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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-r6.ebuild,v 1.10 2012/02/25 15:11:14 ssuominen Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.11 2013/04/24 17:53:43 jer Exp $ +EAPI=5 inherit eutils autotools DEBIAN_PATCH="17" @@ -21,10 +20,13 @@ 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 } @@ -34,15 +36,12 @@ src_configure() { } src_install() { - emake install DESTDIR="${D}" || die - if ! use static-libs; then - rm -f "${D}"/usr/lib*/libfam.la - fi + default + 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" - dodoc AUTHORS ChangeLog INSTALL NEWS TODO README } |