Touchup building #117333 and remove old sed line.

Package-Manager: portage-2.1_pre3

5 files changed, 92 insertions, 6 deletions

diff --git a/sys-apps/isapnptools/ChangeLog b/sys-apps/isapnptools/ChangeLog
index 274d06eb63b1..1b01f6f2d501 100644
--- a/sys-apps/isapnptools/ChangeLog
+++ b/sys-apps/isapnptools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/isapnptools
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/ChangeLog,v 1.7 2005/04/22 00:19:27 wormo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/ChangeLog,v 1.8 2006/01/01 22:12:56 vapier Exp $
+
+*isapnptools-1.26-r2 (01 Jan 2006)
+
+  01 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/isapnptools-1.26-gcc.patch, +isapnptools-1.26-r2.ebuild:
+  Touchup building #117333 and remove old sed line.
 
   21 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
   isapnptools-1.26-r1.ebuild:
diff --git a/sys-apps/isapnptools/Manifest b/sys-apps/isapnptools/Manifest
index 6ceb9bdc37a4..a646d606f2a4 100644
--- a/sys-apps/isapnptools/Manifest
+++ b/sys-apps/isapnptools/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dd767398c51ddec5aeef56457f61b7bd ChangeLog 1512
+MD5 22dc0af71c0a4f0849adef44a0051bb6 ChangeLog 1718
 MD5 f1915a1decdb9bad292e52fb7ae5e727 files/digest-isapnptools-1.26-r1 65
+MD5 f1915a1decdb9bad292e52fb7ae5e727 files/digest-isapnptools-1.26-r2 65
 MD5 54980db44fa935a4b0c3a04893cd2980 files/isapnp.rc 655
+MD5 ac46737d9b03f9315991b6b3ee6ab906 files/isapnptools-1.26-gcc.patch 907
 MD5 a8f065f20a3433ab9941e79f76dc41cd isapnptools-1.26-r1.ebuild 960
+MD5 baa81930d870d85d7c6e1736326eb7ad isapnptools-1.26-r2.ebuild 866
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDmN4VgIKl8Uu19MoRAjO/AJ4mzRA8ryUjkSyCMlrgTEVazPGwgQCfc4XF
-H+jetJbgXMSV7UV9eTCs1yo=
-=iQnm
+iD8DBQFDuFQY2+ySkm8kpY0RAjI7AKCYf8O/s9h+VnbmJoytyEKHvzEDLwCgktOz
+2tpNwJCnF4XgZmh4EN0Upss=
+=57F2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/isapnptools/files/digest-isapnptools-1.26-r2 b/sys-apps/isapnptools/files/digest-isapnptools-1.26-r2
new file mode 100644
index 000000000000..b499926c6700
--- /dev/null
+++ b/sys-apps/isapnptools/files/digest-isapnptools-1.26-r2
@@ -0,0 +1 @@
+MD5 26def2016548edeafe383113f0bc8ac6 isapnptools-1.26.tgz 231098
diff --git a/sys-apps/isapnptools/files/isapnptools-1.26-gcc.patch b/sys-apps/isapnptools/files/isapnptools-1.26-gcc.patch
new file mode 100644
index 000000000000..3d1f2cee9f80
--- /dev/null
+++ b/sys-apps/isapnptools/files/isapnptools-1.26-gcc.patch
@@ -0,0 +1,41 @@
+http://bugs.gentoo.org/117333
+
+--- isapnptools/src/isapnp_main.l
++++ isapnptools/src/isapnp_main.l
+@@ -363,7 +363,6 @@
+ 	return 0;
+ }
+ 
+-static unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
+ static char *boardid[NUM_CARDS+1];
+ static unsigned long serno[NUM_CARDS+1];
+ 
+--- isapnptools/src/callbacks.c
++++ isapnptools/src/callbacks.c
+@@ -49,6 +49,7 @@
+ #include <isapnp/callbacks.h>
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
+ 
+--- isapnptools/src/resource.c
++++ isapnptools/src/resource.c
+@@ -12,6 +12,7 @@
+    alloc_in_range_list() reordered to handle source name by P.Fox
+ */
+ 
++#define _GNU_SOURCE
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+@@ -285,7 +286,7 @@
+ void allocate_pci_resources( void )
+ {
+    char *line = 0;
+-   int lineMax = 0;
++   size_t lineMax = 0;
+ 
+    FILE *fp = fopen( "/proc/bus/pci/devices", "rt" );
+    if( !fp )
diff --git a/sys-apps/isapnptools/isapnptools-1.26-r2.ebuild b/sys-apps/isapnptools/isapnptools-1.26-r2.ebuild
new file mode 100644
index 000000000000..e34df1e1f8e3
--- /dev/null
+++ b/sys-apps/isapnptools/isapnptools-1.26-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26-r2.ebuild,v 1.1 2006/01/01 22:12:56 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Tools for configuring ISA PnP devices"
+HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodir /sbin
+	mv "${D}"/usr/sbin/isapnp "${D}"/sbin/ || die "couldnt relocate isapnp"
+
+	dodoc AUTHORS ChangeLog README NEWS
+	docinto txt
+	dodoc doc/README*  doc/*.txt test/*.txt
+	dodoc etc/isapnp.*
+
+	newinitd "${FILESDIR}"/isapnp.rc isapnp
+}