Use Debian patch set. Use sed instead of dosed, emake instead of make. Make static-libs optional. Remove extra spaces. Remove upgrade warning after ~7 years. Remove rc-update advice.

Package-Manager: portage-2.2_rc98/cvs/Linux i686

4 files changed, 58 insertions, 88 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index 0fffd608777a..17e8fa47c076 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/fam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.63 2010/02/13 16:29:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.64 2010/10/21 17:40:38 jer Exp $
+
+*fam-2.7.0-r6 (21 Oct 2010)
+
+  21 Oct 2010; Jeroen Roovers <jer@gentoo.org> -fam-2.7.0-r4.ebuild,
+  +fam-2.7.0-r6.ebuild:
+  Use Debian patch set. Use sed instead of dosed, emake instead of make.
+  Make static-libs optional. Remove extra spaces. Remove upgrade warning
+  after ~7 years. Remove rc-update advice.
 
   13 Feb 2010; Raúl Porcel <armin76@gentoo.org> fam-2.7.0-r5.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #302499
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index c73dca84ede6..89b1b674dd58 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -6,7 +6,8 @@ AUX fam-2.7.0-limits.patch 316 RMD160 13df15ec643cb8b976b3704b8e6dc9d5aaeb83d0 S
 AUX famd 490 RMD160 ba0a1761b473c946d645aac2cc6b20d6bfbe8382 SHA1 a705c2b8dda3fb79fad015523ea2fced12569170 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc22bd9
 DIST fam-2.7.0-dnotify.patch.bz2 7127 RMD160 dfca4dc1fa98c968ba684cb0510e0ad241dc7d4a SHA1 058c8eb3dee154e2f63b1a2ec585911ec76b13fd SHA256 c5b7df410521f919c98ca9814743c9dd753b71c1bbc048d62f967625d8e4afdb
 DIST fam-2.7.0.tar.gz 301974 RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 SHA1 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
-EBUILD fam-2.7.0-r4.ebuild 2194 RMD160 657801ef322558761c69506015b0bbe21fd4e7ed SHA1 9ad4e9baf350191f7286f81e6a8e74de555528b8 SHA256 9a583c4fa3b3ce39c81cbf278176c632423525b3cfa99c686543fa679465a436
+DIST fam_2.7.0-17.diff.gz 28056 RMD160 1d1eccacd5dd2cfffacb4daa2bda2610062dc0b2 SHA1 680b03081b014246425f5b722fdb832ee254393e SHA256 2362384d1fbde5dcbccf70f617aedbcae44d3f826a5b9df1331b070da1e0d5c2
 EBUILD fam-2.7.0-r5.ebuild 2285 RMD160 4d19d506d15087357a74bf2528e42a6136c08524 SHA1 656a0d393d4c43b3c2be07877c34a3c120819c15 SHA256 ea01d1514ecff5a6cb4809b07229d04edeb791dc8bbc60bcdac594979cf749fe
-MISC ChangeLog 11589 RMD160 9bc311c6426e8e6b0d438b4f792c01298e22353b SHA1 84a57856f77b3eb196adca23a37eb50a31017a72 SHA256 9f8c9bc43037c2df3d1be7868dbfde5e06dacf67eccb06289c29f11b5f02a447
+EBUILD fam-2.7.0-r6.ebuild 1272 RMD160 e696089fed5fcaea1950f8c3b406ce5a59d67d59 SHA1 b5c26525012f41d89763566a39c9256c04a498c4 SHA256 1c9bc611b7afc340a653f96cbaa903d3b2a91784bacb647b8e22df41cd03c5b9
+MISC ChangeLog 11897 RMD160 96ec12801a574e9e13eedaec459c97fa175b9918 SHA1 a72f9bf3cdfe15f19bdb8a4ac99492778d0a645a SHA256 1ebaf403915b4717be72ff3b9a50b99a9aa376bbcc51de298bf75964d1e05c92
 MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3
diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild
deleted file mode 100644
index 1ec667141477..000000000000
--- a/app-admin/fam/fam-2.7.0-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 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-r4.ebuild,v 1.23 2009/06/07 15:54:05 jer Exp $
-
-inherit libtool eutils autotools
-
-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://gentoo/fam-2.7.0-dnotify.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
-	!app-admin/gamin"
-RDEPEND="${DEPEND}"
-PROVIDE="virtual/fam"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# large file patch #76679
-	epatch "${FILESDIR}/${P}-largefiles.patch"
-
-	# dnotify patch #43027
-	echo $WORKDIR
-	epatch "${WORKDIR}/${P}-dnotify.patch"
-
-	# Use limits correctly -#89478
-	epatch "${FILESDIR}/${P}-limits.patch"
-
-	# Fix gcc 4.1 problems
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	eautoreconf
-}
-
-src_install() {
-
-	make install DESTDIR="${D}" || die
-
-	dosed "s:local_only = false:local_only = true:g" /etc/fam.conf
-
-	doinitd "${FILESDIR}/famd"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS TODO README
-
-}
-
-pkg_postinst() {
-
-	elog "To enable fam on	 boot you will have to add it to the"
-	elog "default profile, issue the following command as root to do so."
-	elog
-	elog "rc-update add famd default"
-
-	# temporary warning for people upgrading
-	# 6-12-03 foser <foser@gentoo.org>
-	if [ -e /etc/init.d/fam ]
-	then
-		echo
-		elog "IMPORTANT INFO FOR USERS UPGRADING FROM OLDER (<2.7.0) FAM VERSIONS :"
-		elog
-		elog "With the 2.7.0 version the fam daemon moved to sbin and was"
-		elog "renamed from 'fam' to 'famd'. These changes are for consistency"
-		elog "reasons also applied to the Gentoo init script. This means you"
-		elog "will have to remove fam from the default runlevel and add famd."
-		elog "This can be done by issueing the following commands :"
-		elog
-		elog "rc-update del fam"
-		elog "rc-update add famd default"
-		elog "rm /etc/init.d/fam"
-		elog
-		elog "The last command removes the old init script."
-		echo
-	fi
-
-}
diff --git a/app-admin/fam/fam-2.7.0-r6.ebuild b/app-admin/fam/fam-2.7.0-r6.ebuild
new file mode 100644
index 000000000000..265ee261c7b6
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0-r6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 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.1 2010/10/21 17:40:38 jer Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+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}"
+PROVIDE="virtual/fam"
+
+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
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	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
+}