Clean/fix up build.

Package-Manager: portage-2.1.4_rc14

6 files changed, 203 insertions, 21 deletions

diff --git a/sys-apps/cpint/ChangeLog b/sys-apps/cpint/ChangeLog
index 2276491ebb66..60dd62ba070c 100644
--- a/sys-apps/cpint/ChangeLog
+++ b/sys-apps/cpint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/cpint
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/ChangeLog,v 1.6 2007/04/07 15:05:39 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/ChangeLog,v 1.7 2008/01/11 07:16:12 vapier Exp $
+
+  11 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/cpint-2.5.3-build.patch, +files/cpint-2.5.3-kernel.patch,
+  +files/cpint-2.5.3-prototypes.patch, cpint-2.5.3.ebuild:
+  Clean/fix up build.
 
 *cpint-2.5.3 (07 Apr 2007)
 
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index abf009c59ed4..e969ce6f0a0e 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cpint-2.5.3-build.patch 1739 RMD160 34209e08883c67f5e011a0ee03c7be6780d883c4 SHA1 1189a69329e91c458a71b471c82edf8b8abb2ac4 SHA256 9cf6c325c02a89014309e8c80ab235120c592304ee95b5bc4459c3e03f251289
+MD5 81fcd71e3f80737b6b530961a2358525 files/cpint-2.5.3-build.patch 1739
+RMD160 34209e08883c67f5e011a0ee03c7be6780d883c4 files/cpint-2.5.3-build.patch 1739
+SHA256 9cf6c325c02a89014309e8c80ab235120c592304ee95b5bc4459c3e03f251289 files/cpint-2.5.3-build.patch 1739
+AUX cpint-2.5.3-kernel.patch 1454 RMD160 fe17c5ff290df1553a0b91fc28877d8f54d04fdf SHA1 179b0dbed38d065aa0ef6848a4d3e8d3c30f76ae SHA256 d21560bd05fc67e56f2a4fac5e0a45cdb252eb6a6c6b0e309b051604aa80a990
+MD5 3c49b8d6678cdccf57c2e262136842d7 files/cpint-2.5.3-kernel.patch 1454
+RMD160 fe17c5ff290df1553a0b91fc28877d8f54d04fdf files/cpint-2.5.3-kernel.patch 1454
+SHA256 d21560bd05fc67e56f2a4fac5e0a45cdb252eb6a6c6b0e309b051604aa80a990 files/cpint-2.5.3-kernel.patch 1454
+AUX cpint-2.5.3-prototypes.patch 1008 RMD160 f8249a9c168d06cf8e283df68dc8b658dd3d3e51 SHA1 1c7383a95908c62bf99523b0d10df8fd28079948 SHA256 b08cf05fc410659f5a2be4945df5c956f3bdb9025f00976e47d17b94e6cc1178
+MD5 cc8a2eb6ddc0530e7f15fca853e96596 files/cpint-2.5.3-prototypes.patch 1008
+RMD160 f8249a9c168d06cf8e283df68dc8b658dd3d3e51 files/cpint-2.5.3-prototypes.patch 1008
+SHA256 b08cf05fc410659f5a2be4945df5c956f3bdb9025f00976e47d17b94e6cc1178 files/cpint-2.5.3-prototypes.patch 1008
 DIST cpint116.tgz 20626 RMD160 ce8c1aaaf8673e40245eab9a700a5ffe28a7a1a4 SHA1 3e0fdc7bac623e34ac7a00678e262cad261ff849 SHA256 8bfc3d7add9c860de93154331af30198e06564d5a03aa1f627b239a27d7a8b89
 DIST cpint253.tgz 31143 RMD160 d48ae820123a9efe9ce2a2ca0edabbee504bcbfa SHA1 62fd714875daa7995a67b841b854b9d4ef365458 SHA256 a82d66d38c9cd0e99e7226f5e56598ec41e4b4bf27d5c7c94cad9f96314791fd
 EBUILD cpint-1.1.6.ebuild 672 RMD160 2391f3008713332f670e6175f0160ec12c970261 SHA1 dbd887f10b08585d1218d38c0656d5871144f165 SHA256 05f5651c30b9b45d78ec2567c9a0db2aa1a53558c6aaa86894f6871ad4217a44
 MD5 b9c2169eed00ee9a21b647644e51999b cpint-1.1.6.ebuild 672
 RMD160 2391f3008713332f670e6175f0160ec12c970261 cpint-1.1.6.ebuild 672
 SHA256 05f5651c30b9b45d78ec2567c9a0db2aa1a53558c6aaa86894f6871ad4217a44 cpint-1.1.6.ebuild 672
-EBUILD cpint-2.5.3.ebuild 673 RMD160 236afd0dabc3264a7897a85c3f3e30dd922e5d7a SHA1 b297818f69152cd319d77e503997d928cdbf514d SHA256 97518d4a5a8811a0176bbdba4ba698996fcb4f7941c3df381d6d505930071462
-MD5 1119170d98c7abb22600147c1b3a0d37 cpint-2.5.3.ebuild 673
-RMD160 236afd0dabc3264a7897a85c3f3e30dd922e5d7a cpint-2.5.3.ebuild 673
-SHA256 97518d4a5a8811a0176bbdba4ba698996fcb4f7941c3df381d6d505930071462 cpint-2.5.3.ebuild 673
-MISC ChangeLog 699 RMD160 d114fe8cfa6ec888d3b9f262f993e58456f82faf SHA1 f434f255cfd6022bf0189b74a441b5c487f3bc2f SHA256 21a86834f1e745d8ca274fc696e332618194945fbfcb3d9287c95a381c5f28dd
-MD5 00ba5552363dcd372260b01f0cdfcdb9 ChangeLog 699
-RMD160 d114fe8cfa6ec888d3b9f262f993e58456f82faf ChangeLog 699
-SHA256 21a86834f1e745d8ca274fc696e332618194945fbfcb3d9287c95a381c5f28dd ChangeLog 699
+EBUILD cpint-2.5.3.ebuild 789 RMD160 452e7557a98303738a0fa589dea806e139fbebd9 SHA1 dc8fa1bf331d3462afda0cbb90da50149c736c30 SHA256 c841c288a3bdd17c92a4b4d02c4751e581079c28794e2066b4cda3ed7af44d2f
+MD5 319d4b2d57f36b195da9137be9b4ce1f cpint-2.5.3.ebuild 789
+RMD160 452e7557a98303738a0fa589dea806e139fbebd9 cpint-2.5.3.ebuild 789
+SHA256 c841c288a3bdd17c92a4b4d02c4751e581079c28794e2066b4cda3ed7af44d2f cpint-2.5.3.ebuild 789
+MISC ChangeLog 898 RMD160 27667c4cffaa5b553e27f0b862ba6443db8f3eeb SHA1 aa46d36f97b35e9e1e1f91e35a07683f546169ec SHA256 d017f41a6ede3d56851f7ad6b60b44ab701ffa3d898a49cf870be91c5d31cc56
+MD5 1c6518ac97718de18f1d5bcbdb585829 ChangeLog 898
+RMD160 27667c4cffaa5b553e27f0b862ba6443db8f3eeb ChangeLog 898
+SHA256 d017f41a6ede3d56851f7ad6b60b44ab701ffa3d898a49cf870be91c5d31cc56 ChangeLog 898
 MISC metadata.xml 238 RMD160 06a22f21e03106a630e6a9841ee7cdd871aa38b8 SHA1 04ce78ef1ccfccc9a3112448ca9b43cd73e2ade5 SHA256 6e92ebcb53c117720ead248e825e97a038dfdfcd2c120652085151c87bba3990
 MD5 014df03419cf3f1a26698a95e7e695b8 metadata.xml 238
 RMD160 06a22f21e03106a630e6a9841ee7cdd871aa38b8 metadata.xml 238
@@ -26,9 +38,9 @@ MD5 13a53b86a0638310e351392e9fb14be2 files/digest-cpint-2.5.3 214
 RMD160 a4d07e7c6d6f575acd2f0d7cde8de3efc7c988f0 files/digest-cpint-2.5.3 214
 SHA256 40c1242b04a7bce4df9db970121fba17d73ec327a181519d4a07589344c2ab4e files/digest-cpint-2.5.3 214
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGF7Nb8bi6rjpTunYRAuwAAKDDKO+YwvmFExMCKJS7CC3wTKLn3gCfT+f3
-a/2twSNJaY0wm56L9FnwVeg=
-=rGEU
+iEYEARECAAYFAkeHF8IACgkQj9hvisErhMLZhQCgm3SmzspOJq52r9Bb2PTiTwib
+3O8AoMp+EmNn/kuQm+O5xWEHygHA4Be8
+=5PHV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/cpint/cpint-2.5.3.ebuild b/sys-apps/cpint/cpint-2.5.3.ebuild
index 0390cc813d02..46780b022f6e 100644
--- a/sys-apps/cpint/cpint-2.5.3.ebuild
+++ b/sys-apps/cpint/cpint-2.5.3.ebuild
@@ -1,8 +1,8 @@
-# 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/sys-apps/cpint/cpint-2.5.3.ebuild,v 1.1 2007/04/07 15:05:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/cpint-2.5.3.ebuild,v 1.2 2008/01/11 07:16:12 vapier Exp $
 
-inherit linux-info
+inherit linux-info eutils
 
 MY_PV=${PV//./}
 
@@ -17,12 +17,18 @@ IUSE=""
 
 DEPEND=""
 
-src_compile() {
-	emake INCLUDEDIR=-I/usr/src/linux/include || die "emake failed"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-prototypes.patch
+	epatch "${FILESDIR}"/${P}-kernel.patch
+
+	# the makefile uses this variable
+	export KERNEL_DIR
 }
 
 src_install() {
-	einstall prefix="${D}" || die
-	rm -rf "${D}"/lib/modules/misc
+	emake install prefix="${D}" || die
 	dodoc ChangeLog HOW-TO
 }
diff --git a/sys-apps/cpint/files/cpint-2.5.3-build.patch b/sys-apps/cpint/files/cpint-2.5.3-build.patch
new file mode 100644
index 000000000000..9dacbdb6c7ad
--- /dev/null
+++ b/sys-apps/cpint/files/cpint-2.5.3-build.patch
@@ -0,0 +1,73 @@
+--- cpint-2.5.3/Makefile
++++ cpint-2.5.3/Makefile
+@@ -5,59 +5,29 @@
+ prefix = 
+ bindir = /usr/sbin
+ etcdir = /etc
++krndir = /lib/modules/`uname -r`/misc
+ 
+-COMMAND = hcp mongen monstat actgen diag0
+-
+-tools: $(COMMAND)
++CFLAGS += -Wall
++CPPFLAGS += -I$(KERNEL_DIR)/include
+ 
+-hcp : hcp.o
+-	$(CC) -o $@ $^
++COMMAND = hcp mongen monstat actgen diag0
+ 
+-hcptest : hcptest.o
+-	$(CC) -o $@ $^
++all: $(COMMAND) cpint_mod.ko
+ 
+-mongen : mongen.o
+-	$(CC) -o $@ $^
++cpint_mod.ko:
++	$(MAKE) -C $(KERNEL_DIR) modules SUBDIRS=$(PWD)
+ 
+-actgen : actgen.o
+-	$(CC) -o $@ $^
++tools: $(COMMAND)
+ 
+ monstat : monstat.o sysinfo.o
+-	$(CC) -o $@ $^
+-
+-diag0   : diag0.o
+-	$(CC) -o $@ $^
+-
+-hcp.o : hcp.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c hcp.c
+-
+-hcptest.o : hcptest.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c hcptest.c
+-
+-mongen.o : mongen.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c mongen.c
+-
+-monstat.o : monstat.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c monstat.c
+-
+-sysinfo.o : sysinfo.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c sysinfo.c
+-
+-actgen.o : actgen.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c actgen.c
+-
+-diag0.o  : diag0.c
+-	$(CC) -o $@ $(INCLUDEDIR) -I. -O2 -c diag0.c
+ 
+ install: $(TARGET)
++	install -d -m 755 ${prefix}${bindir}
+ 	install -c -m 750 mongen ${prefix}${bindir}
+ 	install -c -m 750 monstat ${prefix}${bindir}
+ 	install -c -m 750 hcp ${prefix}${bindir}
+-	cp cpint_mod.ko /lib/modules/`uname -r`/kernel/drivers/s390/char/
+-	rm -rf /dev/cpcmd /dev/cpmod /dev/cpappl /dev/cpid \
+-		/dev/cpint0 /dev/cpint8 /dev/cpint76 /dev/cpint222
+-	modprobe -qr cpint_mod
+-	depmod -a
++	install -d -m 755 ${prefix}${krndir}
++	install -c -m 644 cpint_mod.ko ${prefix}${krndir}
+ 
+ clean:
+ 	rm -rf *.o *~ core mongen monstat actgen hcp diag0 *.ko *.cmd \
diff --git a/sys-apps/cpint/files/cpint-2.5.3-kernel.patch b/sys-apps/cpint/files/cpint-2.5.3-kernel.patch
new file mode 100644
index 000000000000..b4bb7640eb2c
--- /dev/null
+++ b/sys-apps/cpint/files/cpint-2.5.3-kernel.patch
@@ -0,0 +1,43 @@
+--- cpint-2.5.3/cpint.c
++++ cpint-2.5.3/cpint.c
+@@ -131,7 +131,7 @@
+ 
+ CPInt_Dev *cpint_devices;
+ 
+-static struct class_simple *cpint_class;
++static struct class *cpint_class;
+ 
+ /*----------------------------------------------------------*/
+ /* The different file operations                            */
+@@ -309,7 +309,7 @@
+     /*------------------------------------------------------*/
+ 	/* Register this device class                           */
+     /*------------------------------------------------------*/
+-	cpint_class = class_simple_create(THIS_MODULE, "cpint");
++	cpint_class = class_create(THIS_MODULE, "cpint");
+ 	if (IS_ERR(cpint_class)) {
+ 		printk(KERN_ERR "Error creating cpint class.\n");
+ 		kfree(cpint_devices);
+@@ -325,7 +325,7 @@
+ 
+ 		fopIdx = fopMap[i_dev];
+ 		if (fopIdx > -1 && !(cpint_devs_map & (1 << fopIdx))) {
+-			class_simple_device_add(cpint_class,
++			class_device_create(cpint_class, NULL,
+ 						MKDEV(cpint_major, i_dev), NULL,
+ 						cpNames[fopIdx]);
+ 			cpint_devs_map |= 1 << fopIdx;
+@@ -386,11 +386,11 @@
+ 
+ 		fopIdx = fopMap[i_dev];
+ 		if (fopIdx > -1 && (cpint_devs_map & (1 << fopIdx))) {
+-			class_simple_device_remove(MKDEV(cpint_major, i_dev));
++			class_device_destroy(cpint_class, MKDEV(cpint_major, i_dev));
+ 		}
+ 	}
+ 	cpint_devs_map = 0;
+-	class_simple_destroy(cpint_class);
++	class_destroy(cpint_class);
+ 
+ 	unregister_chrdev(cpint_major, "cpint");
+ 	for (i_dev = 0; i_dev < CPINT_NR_DEVS; i_dev++) {
diff --git a/sys-apps/cpint/files/cpint-2.5.3-prototypes.patch b/sys-apps/cpint/files/cpint-2.5.3-prototypes.patch
new file mode 100644
index 000000000000..376ee8c4fc87
--- /dev/null
+++ b/sys-apps/cpint/files/cpint-2.5.3-prototypes.patch
@@ -0,0 +1,43 @@
+--- cpint-2.5.3/actgen.c
++++ cpint-2.5.3/actgen.c
+@@ -45,6 +45,7 @@
+ /************************************************************/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- cpint-2.5.3/diag0.c
++++ cpint-2.5.3/diag0.c
+@@ -46,6 +46,8 @@
+ /************************************************************/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- cpint-2.5.3/hcp.c
++++ cpint-2.5.3/hcp.c
+@@ -48,6 +48,8 @@
+ /************************************************************/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- cpint-2.5.3/mongen.c
++++ cpint-2.5.3/mongen.c
+@@ -59,6 +59,8 @@
+ /************************************************************/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>