Semi auto-sync

(manually editted for 8m 3s) -- sys-process/lsof (2009-05-15 20:21:02.088733968 +0200)
(Portage version: 2.2.00.13621-prefix/svn/SunOS i386)

7 files changed, 93 insertions, 298 deletions

diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index ae873591de..1fa79468e1 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/lsof
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.61 2009/03/17 10:22:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.63 2009/05/11 18:08:24 vapier Exp $
+
+  11 May 2009; Mike Frysinger <vapier@gentoo.org> lsof-4.82.ebuild:
+  Improve how we past build flags/settings to avoid custom patches.
+
+*lsof-4.82 (11 May 2009)
+
+  11 May 2009; Mike Frysinger <vapier@gentoo.org> +lsof-4.82.ebuild:
+  Version bump #269341 by Lars Wendler.
 
   17 Mar 2009; Raúl Porcel <armin76@gentoo.org> lsof-4.81-r2.ebuild:
   m68k stable wrt #258195, thanks to kolla for testing
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index aed50ee7df..76abe5f73e 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -6,13 +6,9 @@ AUX lsof-4.81-config-solaris.patch 742 RMD160 1fe6574171907d69a704f63b0b41fa8f07
 AUX lsof-4.81-proc_c.patch 309 RMD160 9ebe1cb0b82b837d2afc829e4bc5ef82b4c461f8 SHA1 c4d1507dc5f5d465b30b0b25920769e95855ef7c SHA256 dafc4b0e6660586ea07553246cddf5c681e72bc383d48578a7ca37e5f6d08950
 AUX lsof-4.81-recmake.patch 635 RMD160 8381ac62c03f92c5da2c7c3f65170a30165c2d63 SHA1 29f29ce05e6d143f15a9c3f03578d78ae27b6a2e SHA256 b64bb2a39639364e6341a697d81a4cc7779731d4b8d47ccb527c5b40d06a18ba
 AUX solaris11-extdirent.h 2286 RMD160 ac38bf290872bdce2f90ce6277beec1cd9233d6f SHA1 15191c6495bf5e3fc04842e3abd288e33990de32 SHA256 f7c624e8b3c733790d8552de31083e78d3c78f61993082cb3ab54e97619c8b94
-DIST lsof_4.78.tar.bz2 756729 RMD160 50d71e500f1109cda717b73ce209c0e100a6dbe9 SHA1 0379fc9f38a931ce19e8386e662314d96fc2a099 SHA256 898db51a4016efca7d408163578443238373773357949e1b4978e26807a1fb2b
-DIST lsof_4.80.tar.bz2 768053 RMD160 069feac73569197bfeebbd06d97852bc3e5f5c2c SHA1 f03f64a0b7528dc3622d51327133a7df9f27b233 SHA256 793dad29852649b69f29254dfe60a13c5bd71ca177a483319cbd5da9121b13e0
 DIST lsof_4.81.tar.bz2 778385 RMD160 8dd7db388adc7d0bf320212953067514155f5d1a SHA1 1c8923f054101146a4ad23a32bf29c7bf30e0932 SHA256 29d8a0a039dda5640fed271216e9689e1abca88359acf4e758efb38b51ab8ab9
-EBUILD lsof-4.78-r1.ebuild 1690 RMD160 99e7ff73890652171123f788bea0ad712adf3669 SHA1 bf1919624c1d7431983f4a31fb2b53a4eb51fb46 SHA256 2b73d31c0568a12808d8fb630263fa862d459363ec2aa212a8352e095472a40f
-EBUILD lsof-4.78-r2.ebuild 2002 RMD160 a25d67508ceb1cb0025ead2fa4bbc121fafb19f7 SHA1 c6886ff044378144110838f2d1e6227db65434f3 SHA256 99f7e3f9496366d6ea7262a0366e7c83499ac02b517b1593244910143ca3e385
-EBUILD lsof-4.80-r1.ebuild 2174 RMD160 89744864994bbeb62e8cbf8489f2ee4c94f36c0c SHA1 ec777d68b6c175148f253af76971793c25d4ff33 SHA256 c196b6f7a85fff92719b8008b9dbef663fa04799496911736d15fbc0139c16c4
-EBUILD lsof-4.80.ebuild 1970 RMD160 3a025bdd20bfa095bcc3bc95a658fe89ce47aa99 SHA1 e27faf1be073cb3085639a8c638244c93ad3271e SHA256 c5ff0b7088bf0715b25c298d008985062665b411abf724a1ba9de31f89c0b92d
+DIST lsof_4.82.tar.bz2 793919 RMD160 de7e8441ec80ce13ba7dbf8b023a6403bd670841 SHA1 200aaf7494bddab4c47eea2466c65e57ef2f3786 SHA256 cbfa9fb6ce21b77f1be8a9c0b7fa245965120d968876212697b92617c2b0bd0f
 EBUILD lsof-4.81-r2.ebuild 2653 RMD160 f2c711d4886d3a14e8c3c620f9c1d7eb01f7c205 SHA1 29e6a47590986263e975e58f58c9a5dc07b00967 SHA256 016c98df55b474be4dad527697a02fb8d8f4e2a03b3aecdc39f33c997710e768
-MISC ChangeLog 11251 RMD160 428c0cfafc5a32e287dae0bf6c4d76ccd495b42e SHA1 d54b0a0b2d7312a304bf666d51a0df232189accd SHA256 ae261b007ddf319cfc8a3065949682cd12bbddbffcf8cd422bd48b265fdfd551
+EBUILD lsof-4.82.ebuild 2008 RMD160 3fd32f61f1183073d01912db72f22edcbc7041f5 SHA1 217eaf1571f2933c43a24febe4c57025bbf954b6 SHA256 05793bf42cd2a15dac58c71c9e73b5bb8ac91e433cb7e3fc70ad681205ec8bef
+MISC ChangeLog 11523 RMD160 5c3c0ec5f4aafb8d3e6d85a096c1590c9bb3907b SHA1 1738f327f7acfc888147e85b7d8059ac1135c292 SHA256 1f57d1bb129356be63324d13548ead99f388a80daaf6dd80d3d4890265e4f076
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-process/lsof/lsof-4.78-r1.ebuild b/sys-process/lsof/lsof-4.78-r1.ebuild
deleted file mode 100644
index beb27cddd4..0000000000
--- a/sys-process/lsof/lsof-4.78-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.78-r1.ebuild,v 1.6 2008/03/28 07:43:08 jer Exp $
-
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="static"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-
-	# now patch the scripts to automate everything
-	cd "${S}"
-	ht_fix_file Configure Customize
-	touch .neverInv
-	epatch "${FILESDIR}"/${P}-answer-config.patch
-	epatch "${FILESDIR}"/${P}-freebsd.patch
-	epatch "${FILESDIR}"/${P}-config-solaris.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local target="linux"
-	use kernel_FreeBSD && target=freebsd
-	[[ ${CHOST} == *-solaris* ]] && target=solaris
-	./Configure ${target} || die "configure failed"
-
-	# Make sure we use proper toolchain
-	sed -i \
-		-e "/^CC=/s:g\?cc:$(tc-getCC):" \
-		-e "/^AR=/s:ar:$(tc-getAR):" \
-		-e "/^RANLIB=/s:ranlib:$(tc-getRANLIB):" \
-		Makefile lib/Makefile
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-	dolib lib/liblsof.a || die "dolib"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.78-r2.ebuild b/sys-process/lsof/lsof-4.78-r2.ebuild
deleted file mode 100644
index 2a52bb76ee..0000000000
--- a/sys-process/lsof/lsof-4.78-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.78-r2.ebuild,v 1.7 2008/10/26 03:33:30 vapier Exp $
-
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="static selinux"
-
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-
-	# now patch the scripts to automate everything
-	cd "${S}"
-	ht_fix_file Configure Customize
-	touch .neverInv
-	epatch "${FILESDIR}"/${P}-answer-config.patch
-	epatch "${FILESDIR}"/${P}-freebsd.patch
-	epatch "${FILESDIR}"/${P}-config-solaris.patch
-	#Fix automagic dependency on libselinux. Bug 188272.
-	if ! use selinux; then
-		sed -i \
-			-e 's/ -DHASSELINUX//' \
-			-e 's/ -lselinux//' \
-			Configure || die "Sed failed. 404. WTF..."
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local target="linux"
-	use kernel_FreeBSD && target=freebsd
-	case ${CHOST} in
-	*-solaris*) target=solaris ;;
-	*-aix*) target=aixgcc; export LSOF_AR='ar -X32_64 -v -q' ;;
-	esac
-	./Configure ${target} || die "configure failed"
-
-	# Make sure we use proper toolchain
-	sed -i \
-		-e "/^CC=/s:g\?cc:$(tc-getCC):" \
-		-e "/^AR=/s:ar:$(tc-getAR):" \
-		-e "/^RANLIB=/s:ranlib:$(tc-getRANLIB):" \
-		Makefile lib/Makefile
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-	dolib lib/liblsof.a || die "dolib"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.80-r1.ebuild b/sys-process/lsof/lsof-4.80-r1.ebuild
deleted file mode 100644
index 88fe97860f..0000000000
--- a/sys-process/lsof/lsof-4.80-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.80-r1.ebuild,v 1.1 2008/10/03 16:50:46 flameeyes Exp $
-
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="static selinux"
-
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-
-	# now patch the scripts to automate everything
-	cd "${S}"
-	ht_fix_file Configure Customize
-	touch .neverInv
-	epatch "${FILESDIR}"/${PN}-4.78-answer-config.patch
-	epatch "${FILESDIR}"/${PN}-4.78-config-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.80-solaris11.patch
-	if [[ ${CHOST} == *-solaris2.11 ]] ; then
-		mkdir -p ext/sys
-		# missing system header :(
-		cp "${FILESDIR}"/solaris11-extdirent.h ext/sys/extdirent.h
-		( cd lib && ln -s ../ext )
-	fi
-	#Fix automagic dependency on libselinux. Bug 188272.
-	if ! use selinux; then
-		sed -i \
-			-e 's/ -DHASSELINUX//' \
-			-e 's/ -lselinux//' \
-			Configure || die "Sed failed. 404. WTF..."
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local target="linux"
-	use kernel_FreeBSD && target=freebsd
-	case ${CHOST} in
-	*-solaris*) target=solaris ;;
-	*-aix*) target=aixgcc; export LSOF_AR='ar -X32_64 -v -q' ;;
-	esac
-	./Configure ${target} || die "configure failed"
-
-	# Make sure we use proper toolchain
-	sed -i \
-		-e "/^CC=/s:g\?cc:$(tc-getCC):" \
-		-e "/^AR=/s:ar:$(tc-getAR):" \
-		-e "/^RANLIB=/s:ranlib:$(tc-getRANLIB):" \
-		Makefile lib/Makefile
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.80.ebuild b/sys-process/lsof/lsof-4.80.ebuild
deleted file mode 100644
index 0f63ebf83a..0000000000
--- a/sys-process/lsof/lsof-4.80.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.80.ebuild,v 1.1 2008/08/16 15:36:47 vapier Exp $
-
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="static selinux"
-
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-
-	# now patch the scripts to automate everything
-	cd "${S}"
-	ht_fix_file Configure Customize
-	touch .neverInv
-	epatch "${FILESDIR}"/${PN}-4.78-answer-config.patch
-	epatch "${FILESDIR}"/${PN}-4.78-config-solaris.patch
-	#Fix automagic dependency on libselinux. Bug 188272.
-	if ! use selinux; then
-		sed -i \
-			-e 's/ -DHASSELINUX//' \
-			-e 's/ -lselinux//' \
-			Configure || die "Sed failed. 404. WTF..."
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local target="linux"
-	use kernel_FreeBSD && target=freebsd
-	case ${CHOST} in
-	*-solaris*) target=solaris ;;
-	*-aix*) target=aixgcc; export LSOF_AR='ar -X32_64 -v -q' ;;
-	esac
-	./Configure ${target} || die "configure failed"
-
-	# Make sure we use proper toolchain
-	sed -i \
-		-e "/^CC=/s:g\?cc:$(tc-getCC):" \
-		-e "/^AR=/s:ar:$(tc-getAR):" \
-		-e "/^RANLIB=/s:ranlib:$(tc-getRANLIB):" \
-		Makefile lib/Makefile
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-	dolib lib/liblsof.a || die "dolib"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.82.ebuild b/sys-process/lsof/lsof-4.82.ebuild
new file mode 100644
index 0000000000..179fb18296
--- /dev/null
+++ b/sys-process/lsof/lsof-4.82.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v 1.2 2009/05/11 18:08:24 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="Lists open files for running Unix processes"
+HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
+SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
+	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
+	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
+
+LICENSE="lsof"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+
+S=${WORKDIR}/${MY_P}/${MY_P}_src
+
+src_unpack() {
+	unpack ${A}
+	cd ${MY_P}
+	unpack ./${MY_P}_src.tar
+	cd "${S}"
+
+	sed -i \
+		-e '/LSOF_CFGF="-/s:=":="$LSOF_CFGF :' \
+		-e '/^LSOF_CFGF=/s:$:" ${CFLAGS} ${CPPFLAGS}":' \
+		-e "/^LSOF_CFGL=/s:\$:' \$(LDFLAGS)':" \
+		-e "/^LSOF_RANLIB/s:ranlib:$(tc-getRANLIB):" \
+		Configure
+}
+
+yesno() { use $1 && echo y || echo n ; }
+target() {
+	case ${CHOST} in
+		*-darwin*)  echo darwin  ;;
+		*-freebsd*) echo freebsd ;;
+		*-solaris*) echo solaris ;;
+		*-aix*)     echo aixgcc  ;;
+		*)          echo linux   ;;
+	esac
+}
+ar() {
+	case ${CHOST} in
+		*-aix*)     echo 'ar -X32_64 -v -q' ;;
+		*)          echo '$(tc-getAR) rc'   ;;
+	esac
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	touch .neverInv
+	LINUX_HASSELINUX=$(yesno selinux) \
+	LSOF_CC=$(tc-getCC) \
+	LSOF_AR="$(ar)" \
+	./Configure -n $(target) || die
+
+	emake DEBUG="" all || die "emake failed"
+}
+
+src_install() {
+	dobin lsof || die "dosbin"
+
+	insinto /usr/share/lsof/scripts
+	doins scripts/*
+
+	doman lsof.8
+	dodoc 00*
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	fi
+}