ver bump and clean up

12 files changed, 50 insertions, 167 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 93fdfe9b3759..5aaa40e20526 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/strace
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.45 2004/09/22 17:17:48 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.46 2004/11/22 02:21:52 vapier Exp $
+
+*strace-4.5.8 (21 Nov 2004)
+
+  21 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +strace-4.5.8.ebuild:
+  Version bump #71696.
 
 *strace-4.5.7 (21 Sep 2004)
 
diff --git a/dev-util/strace/files/digest-strace-4.4.94 b/dev-util/strace/files/digest-strace-4.4.94
deleted file mode 100644
index 0f708b467ade..000000000000
--- a/dev-util/strace/files/digest-strace-4.4.94
+++ /dev/null
@@ -1 +0,0 @@
-MD5 483890e6ea930f8c09ccae55121ca7ac strace-4.4.94.tar.bz2 361744
diff --git a/dev-util/strace/files/digest-strace-4.4.98 b/dev-util/strace/files/digest-strace-4.4.98
deleted file mode 100644
index 62df5ce787fc..000000000000
--- a/dev-util/strace/files/digest-strace-4.4.98
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9181e3871c0bf64052bcda51da2928a5 strace-4.4.98.tar.bz2 375679
diff --git a/dev-util/strace/files/digest-strace-4.4.98-r1 b/dev-util/strace/files/digest-strace-4.4.98-r1
deleted file mode 100644
index 62df5ce787fc..000000000000
--- a/dev-util/strace/files/digest-strace-4.4.98-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9181e3871c0bf64052bcda51da2928a5 strace-4.4.98.tar.bz2 375679
diff --git a/dev-util/strace/files/digest-strace-4.5.8 b/dev-util/strace/files/digest-strace-4.5.8
new file mode 100644
index 000000000000..27ffad1d338e
--- /dev/null
+++ b/dev-util/strace/files/digest-strace-4.5.8
@@ -0,0 +1 @@
+MD5 9320ac849890b8e2cc623193bd5733ba strace-4.5.8.tar.bz2 419996
diff --git a/dev-util/strace/files/strace-get_scno.patch b/dev-util/strace/files/strace-get_scno.patch
deleted file mode 100644
index 4ac29c42e798..000000000000
--- a/dev-util/strace/files/strace-get_scno.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- strace/syscall.c.orig	2003-09-10 21:02:20.000000000 +0200
-+++ strace/syscall.c	2003-09-10 21:04:29.000000000 +0200
-@@ -735,6 +735,8 @@
- 	int pid = tcp->pid;
- #endif /* !PROCFS */
- 
-+	if (tcp->flags & TCB_INSYSCALL)
-+		return 1;
- #ifdef LINUX
- #if defined(S390) || defined(S390X)
- 	if (tcp->flags & TCB_WAITEXECVE) {
-@@ -1197,8 +1199,7 @@
- #endif /* FREEBSD */
- #endif /* !HAVE_PR_SYSCALL */
- #endif /* USE_PROCFS */
--	if (!(tcp->flags & TCB_INSYSCALL))
--		tcp->scno = scno;
-+	tcp->scno = scno;
- 	return 1;
- }
- 
diff --git a/dev-util/strace/strace-4.4.94.ebuild b/dev-util/strace/strace-4.4.94.ebuild
deleted file mode 100644
index 7710668db397..000000000000
--- a/dev-util/strace/strace-4.4.94.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.4.94.ebuild,v 1.11 2004/08/07 22:35:34 slarti Exp $
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc ~sparc alpha ~hppa mips"
-inherit flag-o-matic
-
-DEPEND="virtual/libc >=sys-devel/autoconf-2.54"
-
-
-src_compile() {
-	# Compile fails with -O3 on sparc but works on x86
-	if [ "${ARCH}" == "sparc" -o "${ARCH}" == "" ]; then
-		replace-flags -O[3-9] -O2
-	fi
-	# configure is broken by default for sparc and possibly others, regen
-	# from configure.in
-	autoconf
-	./configure --prefix=/usr || die
-	emake || die
-}
-
-src_install () {
-	# Can't use make install because it is stupid and
-	# doesn't make leading directories before trying to
-	# install. Thus, one would have to make /usr/bin
-	# and /usr/man/man1 (at least).
-	# So, we do it by hand.
-	doman strace.1
-	dobin strace
-	dobin strace-graph
-	dodoc ChangeLog COPYRIGHT CREDITS NEWS PORTING README* TODO
-}
diff --git a/dev-util/strace/strace-4.4.98-r1.ebuild b/dev-util/strace/strace-4.4.98-r1.ebuild
deleted file mode 100644
index 22d72b8515de..000000000000
--- a/dev-util/strace/strace-4.4.98-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.4.98-r1.ebuild,v 1.4 2004/07/02 05:13:52 eradicator Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa -mips ~amd64 ~ia64 s390"
-IUSE="static"
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.54"
-
-src_compile() {
-	# Compile fails with -O3 on sparc but works on x86
-	if [ "${ARCH}" == "sparc" -o "${ARCH}" == "" ]; then
-		replace-flags -O[3-9] -O2
-	fi
-	#s390 Specific fix
-	#See bug 47916
-	if [ "${ARCH}" == "s390" ]; then
-		cd ${S}
-		patch < ${FILESDIR}/strace-get_scno.patch
-	fi
-	# configure is broken by default for sparc and possibly others, regen
-	# from configure.in
-	autoconf
-	if use static; then
-		LDFLAGS="-static" ./configure --prefix=/usr || die
-	else
-		./configure --prefix=/usr || die
-	fi
-	emake || die
-}
-
-src_install() {
-	# Can't use make install because it is stupid and
-	# doesn't make leading directories before trying to
-	# install. Thus, one would have to make /usr/bin
-	# and /usr/man/man1 (at least).
-	# So, we do it by hand.
-	doman strace.1
-	dobin strace
-	dobin strace-graph
-	dodoc ChangeLog COPYRIGHT CREDITS NEWS PORTING README* TODO
-}
diff --git a/dev-util/strace/strace-4.4.98.ebuild b/dev-util/strace/strace-4.4.98.ebuild
deleted file mode 100644
index 14be89e6a8f9..000000000000
--- a/dev-util/strace/strace-4.4.98.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.4.98.ebuild,v 1.15 2004/07/02 05:13:52 eradicator Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha hppa -mips amd64 ia64"
-IUSE="static"
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.54"
-
-src_compile() {
-	# Compile fails with -O3 on sparc but works on x86
-	if [ "${ARCH}" == "sparc" -o "${ARCH}" == "" ]; then
-		replace-flags -O[3-9] -O2
-	fi
-	# configure is broken by default for sparc and possibly others, regen
-	# from configure.in
-	autoconf
-	if use static; then
-		LDFLAGS="-static" ./configure --prefix=/usr || die
-	else
-		./configure --prefix=/usr || die
-	fi
-	emake || die
-}
-
-src_install() {
-	# Can't use make install because it is stupid and
-	# doesn't make leading directories before trying to
-	# install. Thus, one would have to make /usr/bin
-	# and /usr/man/man1 (at least).
-	# So, we do it by hand.
-	doman strace.1
-	dobin strace
-	dobin strace-graph
-	dodoc ChangeLog COPYRIGHT CREDITS NEWS PORTING README* TODO
-}
diff --git a/dev-util/strace/strace-4.5.1.ebuild b/dev-util/strace/strace-4.5.1.ebuild
index e92cbac80e9d..fd1cf5cf3eba 100644
--- a/dev-util/strace/strace-4.5.1.ebuild
+++ b/dev-util/strace/strace-4.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.1.ebuild,v 1.15 2004/07/02 05:13:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.1.ebuild,v 1.16 2004/11/22 02:21:52 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ~ia64 ppc64"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/dev-util/strace/strace-4.5.7.ebuild b/dev-util/strace/strace-4.5.7.ebuild
index a72f73ee23cf..8777bb720036 100644
--- a/dev-util/strace/strace-4.5.7.ebuild
+++ b/dev-util/strace/strace-4.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.7.ebuild,v 1.1 2004/09/22 03:15:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.7.ebuild,v 1.2 2004/11/22 02:21:52 vapier Exp $
 
 inherit flag-o-matic gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 DEPEND="virtual/libc"
diff --git a/dev-util/strace/strace-4.5.8.ebuild b/dev-util/strace/strace-4.5.8.ebuild
new file mode 100644
index 000000000000..05b3b2fe6103
--- /dev/null
+++ b/dev-util/strace/strace-4.5.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.8.ebuild,v 1.1 2004/11/22 02:21:52 vapier Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Compile fails with -O3 on sparc but works on x86
+	[ "${ARCH}" == "sparc" ] && replace-flags -O[3-9] -O2
+	filter-lfs-flags
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	# Can't use make install because it is stupid and
+	# doesn't make leading directories before trying to
+	# install. Thus, one would have to make /usr/bin
+	# and /usr/man/man1 (at least).
+	# So, we do it by hand.
+	doman strace.1
+	dobin strace strace-graph || die
+	dodoc ChangeLog CREDITS NEWS PORTING README* TODO
+}