Compile fix for bug #98997, need linux-2.6 headers on linux.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 34 insertions, 15 deletions

diff --git a/net-misc/mrouted/ChangeLog b/net-misc/mrouted/ChangeLog
index 7aaba4c5e289..536e03690846 100644
--- a/net-misc/mrouted/ChangeLog
+++ b/net-misc/mrouted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mrouted
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mrouted/ChangeLog,v 1.6 2005/05/01 17:08:30 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mrouted/ChangeLog,v 1.7 2006/04/02 23:17:57 robbat2 Exp $
+
+  02 Apr 2006; Robin H. Johnson <robbat2@gentoo.org>
+  mrouted-3.9_beta3.ebuild:
+  Compile fix for bug #98997, need linux-2.6 headers on linux.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   mrouted-3.9_beta3.ebuild:
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 1e61ff1ad2aa..c58b295947b4 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,4 +1,12 @@
-MD5 83ee66b59d4d3346bb4896728c2e679c mrouted-3.9_beta3.ebuild 978
-MD5 45e2aa4d3c0b34d2fc8ef7e98b0ef9b9 ChangeLog 770
-MD5 fef0562a211b6b834bfd82d55d548c4e files/digest-mrouted-3.9_beta3 144
+MD5 93d7ad31f8a11d806ef9a28304c95cd4 ChangeLog 916
+RMD160 cdbee9edfb8bb01f2b55db87d55c04133ad3b4fc ChangeLog 916
+SHA256 d7f0b7a739b2d9b9c313de2f750b9ba681e2ad376c6a73572c22cacd432b188a ChangeLog 916
+MD5 8af05ce9c2b81b68969d8de866587f33 files/digest-mrouted-3.9_beta3 524
+RMD160 d306a660758e4922810f60f77ff2254368650f71 files/digest-mrouted-3.9_beta3 524
+SHA256 96e3fddee3b7378bbaf2fbd402ef56cf8861be4f524d8343dbcd7db6ca5f9616 files/digest-mrouted-3.9_beta3 524
 MD5 b063cfdcd78a545936175411c2da590e files/mrouted.rc 712
+RMD160 383ed2bcc235738955234332da18b491ca3c27f3 files/mrouted.rc 712
+SHA256 159843d1c76fc951aa785ca62d1ee66169f334387ee61debebdc0616e5323067 files/mrouted.rc 712
+MD5 12d5750af45bad78403f3e96b3369b15 mrouted-3.9_beta3.ebuild 1166
+RMD160 2539df7d6cf002cb8ab43c51fd6c3b00f2795a3b mrouted-3.9_beta3.ebuild 1166
+SHA256 cb7bc50f79ee90f8b25d8f5af5386ba5c5b52044501009abe4b8e8f17c518607 mrouted-3.9_beta3.ebuild 1166
diff --git a/net-misc/mrouted/files/digest-mrouted-3.9_beta3 b/net-misc/mrouted/files/digest-mrouted-3.9_beta3
index d48e3624c7fc..456546133fa0 100644
--- a/net-misc/mrouted/files/digest-mrouted-3.9_beta3
+++ b/net-misc/mrouted/files/digest-mrouted-3.9_beta3
@@ -1,2 +1,6 @@
 MD5 15bb287b5af0cef4ec8e4ad3bd56740c mrouted-3.9beta3+IOS12.tar.gz 110167
+RMD160 a238c4a03755fd447398270a3f9a39f51e82db0c mrouted-3.9beta3+IOS12.tar.gz 110167
+SHA256 fa9ad8150ca11044288162cf3056cca94ad737ee822b710994aa178eb0100908 mrouted-3.9beta3+IOS12.tar.gz 110167
 MD5 fe6964c573c9df699f2531bf2db02cd8 mrouted_3.9-beta3-3.diff.gz 4678
+RMD160 141cadb8922bc5f1c0c20a505224ba3da0b44d6e mrouted_3.9-beta3-3.diff.gz 4678
+SHA256 23f5cbd8c1e431c94f267188cd4c3714aa0b9a59a01501ff85738e8d3b8013c2 mrouted_3.9-beta3-3.diff.gz 4678
diff --git a/net-misc/mrouted/mrouted-3.9_beta3.ebuild b/net-misc/mrouted/mrouted-3.9_beta3.ebuild
index d5ee5d680bf1..482ad8cd2371 100644
--- a/net-misc/mrouted/mrouted-3.9_beta3.ebuild
+++ b/net-misc/mrouted/mrouted-3.9_beta3.ebuild
@@ -1,10 +1,10 @@
-# 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/net-misc/mrouted/mrouted-3.9_beta3.ebuild,v 1.9 2005/05/01 17:08:30 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mrouted/mrouted-3.9_beta3.ebuild,v 1.10 2006/04/02 23:17:57 robbat2 Exp $
 
 inherit eutils
 
-MY_P=${P/_}+IOS12
+MY_P="${P/_}+IOS12"
 DEB_PVER=3
 DESCRIPTION="IP multicast routing daemon"
 HOMEPAGE="http://freshmeat.net/projects/mrouted/?topic_id=87%2C150"
@@ -16,8 +16,11 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND="virtual/os-headers
-	dev-util/yacc"
+# this does NOT compile with 2.4 or earlier headers
+# and probably some early 2.6 headers as well
+DEPEND="kernel_linux? ( >=sys-kernel/linux-headers-2.6* )
+		!kernel_linux? ( virtual/os-headers )
+		dev-util/yacc"
 RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
@@ -25,8 +28,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${WORKDIR}/mrouted_${PV/_/-}-${DEB_PVER}.diff
-	sed -i "s:-O:${CFLAGS}:" Makefile
+	epatch "${WORKDIR}"/"mrouted_${PV/_/-}-${DEB_PVER}.diff"
+	sed -i "/^CFLAGS/s:-O:${CFLAGS}:" Makefile
 }
 
 src_compile() {
@@ -35,8 +38,8 @@ src_compile() {
 
 src_install() {
 	dobin mrouted || die
-	doman mrouted.8
+	doman mrouted.8 || die
 
-	insinto /etc ; doins mrouted.conf
-	exeinto /etc/init.d ; newexe ${FILESDIR}/mrouted.rc mrouted
+	insinto /etc ; doins mrouted.conf || die
+	newinitd ${FILESDIR}/mrouted.rc mrouted || die
 }