Use linux-info.eclass to figure out KERNEL_DIR for tipc_config.h include wrt #205415.

Package-Manager: portage-2.1.4

4 files changed, 55 insertions, 23 deletions

diff --git a/net-misc/tipcutils/ChangeLog b/net-misc/tipcutils/ChangeLog
index 6d4a4a3afb2b..f97c014793e0 100644
--- a/net-misc/tipcutils/ChangeLog
+++ b/net-misc/tipcutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tipcutils
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tipcutils/ChangeLog,v 1.2 2007/08/29 17:25:28 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tipcutils/ChangeLog,v 1.3 2008/01/21 16:41:27 drac Exp $
+
+  21 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/tipcutils-1.0.4-cflags.patch, tipcutils-1.0.4.ebuild:
+  Use linux-info.eclass to figure out KERNEL_DIR for tipc_config.h include wrt
+  #205415.
 
   29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing gustavoz from metadata due to his retirement (see #36010 for
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index 244eab00cdd3..c6243730f729 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tipcutils-1.0.4-cflags.patch 528 RMD160 2afe9fd19cf0d86d556315b4c8e9e1ad68318414 SHA1 2443e1bbb8f04872bf160c143a2119807c3a5a2c SHA256 dc8aeadacc267479bdde27649fb5f16401a38c393a90e19578d7d9012e463f43
+MD5 0e68d240a361e46cfece4c8286b65877 files/tipcutils-1.0.4-cflags.patch 528
+RMD160 2afe9fd19cf0d86d556315b4c8e9e1ad68318414 files/tipcutils-1.0.4-cflags.patch 528
+SHA256 dc8aeadacc267479bdde27649fb5f16401a38c393a90e19578d7d9012e463f43 files/tipcutils-1.0.4-cflags.patch 528
 DIST tipcutils-1.0.4.tar.gz 12918 RMD160 d5888ecf1c2fc501b4b75392ad94373055918354 SHA1 643b6ac528f5652f6a347cd48a885ec59390ba9b SHA256 92c31dcdd42d2c3e0fe5ad0b69816333fd2b0f4e7cde9254f2ea638a99f2b8d2
-EBUILD tipcutils-1.0.4.ebuild 508 RMD160 3b79ff768697c2ff251d43cf29c49ff89b81aa82 SHA1 78ce69b4f42e3fe9e17a8da6861bd2706b706585 SHA256 61d2367dbfdb6b2ec90d09857ccf0a1eab83fad80af088d3066317571654a77d
-MD5 1f32aee97a8a00196a825e3080779217 tipcutils-1.0.4.ebuild 508
-RMD160 3b79ff768697c2ff251d43cf29c49ff89b81aa82 tipcutils-1.0.4.ebuild 508
-SHA256 61d2367dbfdb6b2ec90d09857ccf0a1eab83fad80af088d3066317571654a77d tipcutils-1.0.4.ebuild 508
-MISC ChangeLog 534 RMD160 0ca2424624137b75ac74d87be83cae9b856ca3e0 SHA1 8628416dd88304ed742a20d407d59955e2cb0e99 SHA256 decf47b4134957b616a33c594621f0178d56908b19e6fe7aaedb240a6e1954ff
-MD5 4654948b2be531761e16e05806241765 ChangeLog 534
-RMD160 0ca2424624137b75ac74d87be83cae9b856ca3e0 ChangeLog 534
-SHA256 decf47b4134957b616a33c594621f0178d56908b19e6fe7aaedb240a6e1954ff ChangeLog 534
+EBUILD tipcutils-1.0.4.ebuild 711 RMD160 094deda3117f57fe36bb32f2a9d8727afde3f007 SHA1 3e6b528fbd060019b1b97eb5cb9b0931a98572ff SHA256 ad8581e95047aaeffd324d855c6885f5eae5e1051fd7e80270476f43652f395b
+MD5 1d22613face8767ba78ce712c53d4ec0 tipcutils-1.0.4.ebuild 711
+RMD160 094deda3117f57fe36bb32f2a9d8727afde3f007 tipcutils-1.0.4.ebuild 711
+SHA256 ad8581e95047aaeffd324d855c6885f5eae5e1051fd7e80270476f43652f395b tipcutils-1.0.4.ebuild 711
+MISC ChangeLog 735 RMD160 f1384cf029d9752952f233c64e7ba1ff85bf09d8 SHA1 782c12eba5d91f36033c07df13ce6213cd5c1802 SHA256 62fb9c1b26e76d28c8c996ffcf6acb03a3c5185c540ac6f3952ca1d05a003845
+MD5 bc6f2c23a207800c041bc3de868c6179 ChangeLog 735
+RMD160 f1384cf029d9752952f233c64e7ba1ff85bf09d8 ChangeLog 735
+SHA256 62fb9c1b26e76d28c8c996ffcf6acb03a3c5185c540ac6f3952ca1d05a003845 ChangeLog 735
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -17,10 +18,3 @@ SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 metadata
 MD5 264efb8351e9f2958c0f50d051246440 files/digest-tipcutils-1.0.4 244
 RMD160 6eb624a75f6394d44eefd8ba692cea6d43d386e4 files/digest-tipcutils-1.0.4 244
 SHA256 06ef84eaa0b9fc2549ecb7c967ed3cc192d71bc1ae1f840bd7b4982ae0580114 files/digest-tipcutils-1.0.4 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG1awPyuNVb5qfaOYRAhnvAJ9CcgVfVfmObqLLCpXBSHXkWSphggCfYZLT
-AOEGvz979z46LsphUv8E0EI=
-=vIcT
------END PGP SIGNATURE-----
diff --git a/net-misc/tipcutils/files/tipcutils-1.0.4-cflags.patch b/net-misc/tipcutils/files/tipcutils-1.0.4-cflags.patch
new file mode 100644
index 000000000000..4080aa70f7f3
--- /dev/null
+++ b/net-misc/tipcutils/files/tipcutils-1.0.4-cflags.patch
@@ -0,0 +1,19 @@
+diff -ur tipcutils-1.0.4.orig/Makefile tipcutils-1.0.4/Makefile
+--- tipcutils-1.0.4.orig/Makefile	2006-10-12 17:46:49.000000000 +0300
++++ tipcutils-1.0.4/Makefile	2008-01-21 18:38:02.000000000 +0200
+@@ -2,12 +2,12 @@
+ # Makefile for tipcutils
+ #
+ 
+-ifndef KERNELDIR
+-	KERNELDIR = /usr/src/linux
++ifndef KERNEL_DIR
++	KERNEL_DIR = /usr/src/linux
+ endif
+ 
+ VERSION = 1.0.4
+-CFLAGS = -Wall -O2 -I${KERNELDIR}/include -D VERSION=\"${VERSION}\"
++CFLAGS += -Wall -I${KERNEL_DIR}/include -D VERSION=\"${VERSION}\"
+ 
+ all: tipc-config
+ 
diff --git a/net-misc/tipcutils/tipcutils-1.0.4.ebuild b/net-misc/tipcutils/tipcutils-1.0.4.ebuild
index df24de8b0d97..afa4d9a6e773 100644
--- a/net-misc/tipcutils/tipcutils-1.0.4.ebuild
+++ b/net-misc/tipcutils/tipcutils-1.0.4.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tipcutils/tipcutils-1.0.4.ebuild,v 1.1 2007/01/26 19:07:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tipcutils/tipcutils-1.0.4.ebuild,v 1.2 2008/01/21 16:41:27 drac Exp $
+
+inherit eutils linux-info toolchain-funcs
 
 DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
-HOMEPAGE="http://tipc.sourceforge.net/"
+HOMEPAGE="http://tipc.sourceforge.net"
 SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz"
 
 LICENSE="as-is"
@@ -14,6 +16,18 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cflags.patch
+}
+
+src_compile() {
+	tc-export CC
+	export KERNEL_DIR
+	emake || die "emake failed."
+}	
+
 src_install () {
 	dosbin tipc-config
 }