glibc ----------------------------> libc !

3 files changed, 20 insertions, 24 deletions

diff --git a/app-admin/integrit/integrit-3.02.00.ebuild b/app-admin/integrit/integrit-3.02.00.ebuild
index f7d084a22ed6..c2bc3b13bc4c 100644
--- a/app-admin/integrit/integrit-3.02.00.ebuild
+++ b/app-admin/integrit/integrit-3.02.00.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-3.02.00.ebuild,v 1.10 2004/06/24 21:29:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-3.02.00.ebuild,v 1.11 2004/06/25 17:44:54 vapier Exp $
 
 DESCRIPTION="file integrity verification program"
-SRC_URI="http://www.noserose.net/e/integrit/download/${P}.tar.gz"
 HOMEPAGE="http://integrit.sourceforge.net/"
+SRC_URI="http://www.noserose.net/e/integrit/download/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc"
 IUSE=""
+
+DEPEND="virtual/libc"
+
 S=${WORKDIR}/${PN}-3.02
 
 src_compile() {
@@ -26,11 +27,9 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-
-	dosbin integrit
+	dosbin integrit || die
 	dolib libintegrit.a
-	dodoc Changes HACKING INSTALL LICENSE README todo.txt
+	dodoc Changes HACKING INSTALL README todo.txt
 
 	cd ${S}/utils
 	dosbin i-viewdb
@@ -56,5 +55,4 @@ pkg_postinst() {
 	einfo "It is recommended that the integrit binary is copied to a secure"
 	einfo "location and re-copied at runtime or run from a secure medium."
 	einfo "You should also create a configuration file (see examples)."
-	echo
 }
diff --git a/app-admin/jinit/jinit-0.1.11.ebuild b/app-admin/jinit/jinit-0.1.11.ebuild
index 7dc81277fb67..f64f1ef2f9e1 100644
--- a/app-admin/jinit/jinit-0.1.11.ebuild
+++ b/app-admin/jinit/jinit-0.1.11.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/app-admin/jinit/jinit-0.1.11.ebuild,v 1.5 2004/06/24 21:29:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.11.ebuild,v 1.6 2004/06/25 17:46:13 vapier Exp $
 
 DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
 HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/ http://www.atnf.csiro.au/~rgooch/linux/boot-scripts/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 
 src_compile() {
@@ -21,10 +21,10 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	mv ${D}/usr/sbin ${D}
+	mv ${D}/usr/sbin ${D}/
 	mv ${D}/sbin/init ${D}/sbin/jinit
 	dodoc AUTHORS ChangeLog NEWS README TODO
-	cp -R example-setup ${D}/usr/share/doc/${PF}
+	cp -R example-setup ${D}/usr/share/doc/${PF}/
 
 	#find ${D}/usr/share/doc/${PF}/example-setup -name "Makefile*"
 }
diff --git a/app-admin/killproc/killproc-1.12-r2.ebuild b/app-admin/killproc/killproc-1.12-r2.ebuild
index 8ac861cd607c..dcb232a18cc0 100644
--- a/app-admin/killproc/killproc-1.12-r2.ebuild
+++ b/app-admin/killproc/killproc-1.12-r2.ebuild
@@ -1,27 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-1.12-r2.ebuild,v 1.18 2004/06/24 21:30:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-1.12-r2.ebuild,v 1.19 2004/06/25 17:47:37 vapier Exp $
 
 DESCRIPTION="killproc and assorted tools for boot scripts"
 HOMEPAGE="http://www.suse.de/"
 SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	if [ ${ARCH} = "x86" ] ; then
-		sed -i -e "s:-O2:${CFLAGS}:" -e "s:-m486::" Makefile
-	else
-		sed -i -e "s:-O2:${CFLAGS}:" Makefile
-	fi
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:-m486::" \
+		Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -30,7 +28,7 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin checkproc startproc killproc
+	dosbin checkproc startproc killproc || die
 	into /usr
 	doman *.8
 	dodoc README *.lsm