Stabilize and cleanup.

(Portage version: 2.1.2_rc1-r7)

4 files changed, 34 insertions, 26 deletions

diff --git a/sys-kernel/ksymoops/ChangeLog b/sys-kernel/ksymoops/ChangeLog
index e2f0cd8ae690..75f2c8976f26 100644
--- a/sys-kernel/ksymoops/ChangeLog
+++ b/sys-kernel/ksymoops/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ksymoops
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ksymoops/ChangeLog,v 1.21 2005/07/07 22:30:54 dsd Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ksymoops/ChangeLog,v 1.22 2006/11/16 22:42:51 vapier Exp $
+
+  16 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ksymoops-2.4.11-build.patch, ksymoops-2.4.11.ebuild:
+  Stabilize and cleanup.
 
   07 Jul 2005; Daniel Drake <dsd@gentoo.org> -ksymoops-2.4.5.ebuild,
   -ksymoops-2.4.7.ebuild, -ksymoops-2.4.8.ebuild, -ksymoops-2.4.10.ebuild:
diff --git a/sys-kernel/ksymoops/files/digest-ksymoops-2.4.11 b/sys-kernel/ksymoops/files/digest-ksymoops-2.4.11
index fde7cbfd26be..0ddf903127a3 100644
--- a/sys-kernel/ksymoops/files/digest-ksymoops-2.4.11
+++ b/sys-kernel/ksymoops/files/digest-ksymoops-2.4.11
@@ -1 +1,3 @@
 MD5 d281a723e67137e8d2185b75acc92721 ksymoops-2.4.11.tar.gz 66497
+RMD160 2b3a06701529805b12ed112d902a07c4ff802b71 ksymoops-2.4.11.tar.gz 66497
+SHA256 e16b50097e0ef258c76c73c7794cbd8b45f77c6e93b2087657bdb67e2e9ff56b ksymoops-2.4.11.tar.gz 66497
diff --git a/sys-kernel/ksymoops/files/ksymoops-2.4.11-build.patch b/sys-kernel/ksymoops/files/ksymoops-2.4.11-build.patch
new file mode 100644
index 000000000000..b99310fbb29f
--- /dev/null
+++ b/sys-kernel/ksymoops/files/ksymoops-2.4.11-build.patch
@@ -0,0 +1,12 @@
+--- Makefile.orig	2006-11-16 17:39:45.000000000 -0500
++++ Makefile	2006-11-16 17:39:55.000000000 -0500
+@@ -96,9 +96,6 @@
+ 	INSTALL_MANDIR := $(INSTALL_PREFIX)/man
+ endif
+ 
+-STATIC := -Wl,-Bstatic
+-DYNAMIC := -Wl,-Bdynamic
+-
+ OBJECTS := io.o ksyms.o ksymoops.o map.o misc.o object.o oops.o re.o symbol.o
+ 
+ all: $(PROGS)
diff --git a/sys-kernel/ksymoops/ksymoops-2.4.11.ebuild b/sys-kernel/ksymoops/ksymoops-2.4.11.ebuild
index 25109a40f5a5..feca599cbfc9 100644
--- a/sys-kernel/ksymoops/ksymoops-2.4.11.ebuild
+++ b/sys-kernel/ksymoops/ksymoops-2.4.11.ebuild
@@ -1,38 +1,28 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ksymoops/ksymoops-2.4.11.ebuild,v 1.1 2005/03/17 00:59:38 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ksymoops/ksymoops-2.4.11.ebuild,v 1.2 2006/11/16 22:42:51 vapier Exp $
 
-DESCRIPTION="Utility to decode a kernel oops, or other kernel call traces."
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/${P}.tar.gz"
+inherit eutils
+
+DESCRIPTION="Utility to decode a kernel oops, or other kernel call traces"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/ksymoops/"
-DEPEND="virtual/libc >=sys-devel/binutils-2.9.1.0.25"
-SLOT="0"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~mips ~sparc ~amd64 ~ia64 ~s390"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 mips ppc s390 sparc x86"
 IUSE=""
 
+DEPEND=""
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	mv Makefile Makefile.orig
-	# static/dynamic hack
-	# unfortunately, binutils and gcc ebuilds both install a libiberty.a
-	# and gcc's is not compatible with binutils libbfd.a
-	# linking against a bad mixuture results in missing symbols.
-	# linking against the shared (dynamic) objects seems to work.
-	sed -e "/^STATIC/s:-Bstatic:-Bdynamic:" -e "s:-O2:${CFLAGS}:" < \
-		Makefile.orig > Makefile
-	# Note: this problem is fixed as of gcc-2.95.3-r6, so we can remove this
-	# fix eventually
-}
-
-src_compile() {
-	emake all || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe ksymoops
+	dobin ksymoops || die
 	doman ksymoops.8
 	dodoc Changelog README README.XFree86
 }