fix init.d dependency problems #63538

11 files changed, 57 insertions, 154 deletions

diff --git a/sys-apps/isapnptools/ChangeLog b/sys-apps/isapnptools/ChangeLog
index 8a5a449426d6..7e1a5d4934ff 100644
--- a/sys-apps/isapnptools/ChangeLog
+++ b/sys-apps/isapnptools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/isapnptools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/ChangeLog,v 1.5 2004/06/24 22:12:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/ChangeLog,v 1.6 2004/10/06 01:41:46 vapier Exp $
+
+*isapnptools-1.26-r1 (05 Oct 2004)
+
+  05 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/isapnp.rc,
+ +isapnptools-1.26-r1.ebuild:
+  Move isapnp to /sbin/ to fix init.d dependency problems #63538.
 
 *isapnptools-1.23-r6.ebuild (14 July 2002)
 
diff --git a/sys-apps/isapnptools/Manifest b/sys-apps/isapnptools/Manifest
index a4980615488f..95be85d915a7 100644
--- a/sys-apps/isapnptools/Manifest
+++ b/sys-apps/isapnptools/Manifest
@@ -1,10 +1,15 @@
-MD5 6b4b80be47a2ccf0da8df5ad37d7a951 isapnptools-1.26.ebuild 1060
-MD5 724c8337cd8cb84d7ec2dca12dd49796 isapnptools-1.23-r6.ebuild 1044
-MD5 3a07dc2bda9c120ffc12c824e7747ed8 isapnptools-1.23-r1.ebuild 1049
-MD5 0894379ca0f15bcb670ab6e6bb93f1c7 ChangeLog 1162
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b7ebf9efdf0980c101dc8da91f593a6a ChangeLog 1361
+MD5 ede4df5ce314578352d41805399a56ea isapnptools-1.26-r1.ebuild 978
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 857832f44cadc6eccf76e2af627759d2 files/isapnp.rc5 640
-MD5 247a17886a2cc3c48e411074ddde0336 files/isapnp.rc6 669
-MD5 f1915a1decdb9bad292e52fb7ae5e727 files/digest-isapnptools-1.26 65
-MD5 21ba2111cd2235e318e7667f12d5ae64 files/digest-isapnptools-1.23-r1 65
-MD5 21ba2111cd2235e318e7667f12d5ae64 files/digest-isapnptools-1.23-r6 65
+MD5 54980db44fa935a4b0c3a04893cd2980 files/isapnp.rc 655
+MD5 f1915a1decdb9bad292e52fb7ae5e727 files/digest-isapnptools-1.26-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBY01kHTu7gpaalycRAnZ4AKDSHVqv+0itp8V92ftgXUb6etkPagCg6UDV
+W1IY2cDRqtr6cxDGWTvWXME=
+=vnn/
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/isapnptools/files/digest-isapnptools-1.23-r1 b/sys-apps/isapnptools/files/digest-isapnptools-1.23-r1
deleted file mode 100644
index a32d3ea99aed..000000000000
--- a/sys-apps/isapnptools/files/digest-isapnptools-1.23-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e365c7c7dabda6e4ef64b0630bdb28e isapnptools-1.23.tgz 215274
diff --git a/sys-apps/isapnptools/files/digest-isapnptools-1.23-r6 b/sys-apps/isapnptools/files/digest-isapnptools-1.23-r6
deleted file mode 100644
index a32d3ea99aed..000000000000
--- a/sys-apps/isapnptools/files/digest-isapnptools-1.23-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e365c7c7dabda6e4ef64b0630bdb28e isapnptools-1.23.tgz 215274
diff --git a/sys-apps/isapnptools/files/digest-isapnptools-1.26 b/sys-apps/isapnptools/files/digest-isapnptools-1.26-r1
index b499926c6700..b499926c6700 100644
--- a/sys-apps/isapnptools/files/digest-isapnptools-1.26
+++ b/sys-apps/isapnptools/files/digest-isapnptools-1.26-r1
diff --git a/sys-apps/isapnptools/files/isapnp.rc b/sys-apps/isapnptools/files/isapnp.rc
new file mode 100644
index 000000000000..d3d804d0f421
--- /dev/null
+++ b/sys-apps/isapnptools/files/isapnp.rc
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/files/isapnp.rc,v 1.1 2004/10/06 01:41:46 vapier Exp $
+
+check_config() {
+	if [ ! -e /etc/isapnp.conf ] ; then
+		eerror "You need an /etc/isapnp.conf file first"
+		eerror "Theres a sample in docs/isapnptools/txt"
+		return 1
+	fi
+	if [ ! -x /sbin/isapnp ] ; then
+		eerror "You're missing /sbin/isapnp; emerge sys-apps/isapnptools"
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	check_config || return 1
+
+	ebegin "Configuring ISA PnP devices"
+	/sbin/isapnp /etc/isapnp.conf
+	eend $?
+}
diff --git a/sys-apps/isapnptools/files/isapnp.rc5 b/sys-apps/isapnptools/files/isapnp.rc5
deleted file mode 100644
index 09d6452b4aa3..000000000000
--- a/sys-apps/isapnptools/files/isapnp.rc5
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#RCUPDATE:boot:25:This line is required for script management
-#This will enumerate the ISA PnP Boards in the system, and configure them if
-#it finds the file $CONFFILE
-
-source /etc/rc.d/config/functions
-
-CONFFILE=/etc/isapnp.conf
-
-start() {
-if [ -e $CONFFILE ] ; then
-	if [ -e /usr/sbin/isapnp ] ; then
-		ebegin "Configuring ISA PnP devices"
-		/usr/sbin/isapnp $CONFFILE 1>&2
-		eend $? "Error configuring ISA PnP"
-	else
-		eerror "You're missing /usr/sbin/isapnp. Do emerge sys-apps/isapnptools"
-		return 1
-	fi
-else
-	eerror "You need an /etc/isapnp.conf file first"
-	eerror "Theres a sample in docs/isapnptools/txt"
-	return 1
-fi
-}
diff --git a/sys-apps/isapnptools/files/isapnp.rc6 b/sys-apps/isapnptools/files/isapnp.rc6
deleted file mode 100644
index e1277e1e31db..000000000000
--- a/sys-apps/isapnptools/files/isapnp.rc6
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/files/isapnp.rc6,v 1.9 2004/07/15 00:44:36 agriffis Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	if [ -e /etc/isapnp.conf ]; then
-		if [ -e /usr/sbin/isapnp ] ; then
-			ebegin "Configuring ISA PnP devices"
-			/usr/sbin/isapnp /etc/isapnp.conf 1>&2
-			eend $?
-		else
-			eerror "You're missing /usr/sbin/isapnp. Do emerge sys-apps/isapnptools"
-			return 1
-		fi
-	else
-		eerror "You need an /etc/isapnp.conf file first"
-		eerror "Theres a sample in docs/isapnptools/txt"
-		return 1
-	fi
-}
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
deleted file mode 100644
index 640a8a2fd110..000000000000
--- a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild,v 1.14 2004/06/30 02:45:31 vapier Exp $
-
-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="x86 -ppc amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	cp pnpdump_main.c pnpdump_main.c.orig
-	sed -e "s/^static FILE\* o_file.*//" \
-	 -e "s/o_file/stdout/g" \
-	 -e "s/stdout_name/o_file_name/g" pnpdump_main.c.orig > pnpdump_main.c
-}
-
-src_compile() {
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS
-	docinto txt
-	dodoc doc/README*  doc/*.txt test/*.txt etc/isapnp.*
-
-	exeinto /etc/rc.d/init.d
-	newexe ${FILESDIR}/isapnp.rc5 isapnp
-}
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
deleted file mode 100644
index f4c0c37adbc9..000000000000
--- a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild,v 1.13 2004/06/30 02:45:31 vapier Exp $
-
-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="x86 -ppc amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	cp pnpdump_main.c pnpdump_main.c.orig
-	sed -e "s/^static FILE\* o_file.*//" \
-	 -e "s/o_file/stdout/g" \
-	 -e "s/stdout_name/o_file_name/g" pnpdump_main.c.orig > pnpdump_main.c
-}
-
-src_compile() {
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS
-	docinto txt
-	dodoc doc/README*  doc/*.txt test/*.txt etc/isapnp.*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/isapnp.rc6 isapnp
-}
diff --git a/sys-apps/isapnptools/isapnptools-1.26.ebuild b/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild
index 274e2f8a919d..5525fce0cad2 100644
--- a/sys-apps/isapnptools/isapnptools-1.26.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26.ebuild,v 1.13 2004/06/30 02:45:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild,v 1.1 2004/10/06 01:41:46 vapier Exp $
 
 DESCRIPTION="Tools for configuring ISA PnP devices"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
@@ -8,7 +8,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -ppc amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -16,28 +16,24 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}/src
-	cp pnpdump_main.c pnpdump_main.c.orig
-	sed -e "s/^static FILE\* o_file.*//" \
+	sed -i \
+		-e "s/^static FILE\* o_file.*//" \
 		-e "s/o_file/stdout/g" \
 		-e "s/stdout_name/o_file_name/g" \
-		pnpdump_main.c.orig > pnpdump_main.c
-}
-
-src_compile() {
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} || die
-	emake || die
+		pnpdump_main.c \
+		|| die "sed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
+	dodir /sbin
+	mv ${D}/usr/sbin/isapnp ${D}/sbin/ || die "couldnt relocate isapnp"
 
-	dodoc AUTHORS ChangeLog COPYING README NEWS
+	dodoc AUTHORS ChangeLog README NEWS
 	docinto txt
 	dodoc doc/README*  doc/*.txt test/*.txt
 	dodoc etc/isapnp.*
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/isapnp.rc6 isapnp
+	newexe ${FILESDIR}/isapnp.rc isapnp
 }