fix depend (bug #45110); tidy

12 files changed, 53 insertions, 58 deletions

diff --git a/net-misc/mknbi/ChangeLog b/net-misc/mknbi/ChangeLog
index ba84c36d0b54..61eb5a1d5e37 100644
--- a/net-misc/mknbi/ChangeLog
+++ b/net-misc/mknbi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/mknbi
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.7 2003/12/08 12:34:16 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.8 2004/03/19 10:11:36 mr_bones_ Exp $
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> mknbi-1.2.11.ebuild,
+  mknbi-1.2.12.ebuild, mknbi-1.4.0.ebuild, mknbi-1.4.1.ebuild,
+  mknbi-1.4.3.ebuild:
+  fix depend (bug #45110); tidy
 
 *mknbi-1.4.3 (08 Dec 2003)
 
diff --git a/net-misc/mknbi/mknbi-1.2.11.ebuild b/net-misc/mknbi/mknbi-1.2.11.ebuild
index 4814ee7c9b32..96b93ba9fd5d 100644
--- a/net-misc/mknbi/mknbi-1.2.11.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.4 2003/09/05 22:01:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.5 2004/03/19 10:11:36 mr_bones_ Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/etherboot/${SRC_FILE}"
 KEYWORDS="x86"
 IUSE="perl"
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
diff --git a/net-misc/mknbi/mknbi-1.2.12.ebuild b/net-misc/mknbi/mknbi-1.2.12.ebuild
index 22bc74649f2c..1fb2fb39092d 100644
--- a/net-misc/mknbi/mknbi-1.2.12.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.12.ebuild,v 1.2 2003/09/05 22:01:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.12.ebuild,v 1.3 2004/03/19 10:11:36 mr_bones_ Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/etherboot/${SRC_FILE}"
 KEYWORDS="~x86"
 IUSE="perl"
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
diff --git a/net-misc/mknbi/mknbi-1.4.0.ebuild b/net-misc/mknbi/mknbi-1.4.0.ebuild
index 18434422e5a5..92cbf052de88 100644
--- a/net-misc/mknbi/mknbi-1.4.0.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.0.ebuild,v 1.2 2003/09/05 22:01:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.0.ebuild,v 1.3 2004/03/19 10:11:36 mr_bones_ Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
@@ -10,11 +10,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
-S="${WORKDIR}/${P}"
-
 src_compile()
 {
 	mv Makefile Makefile.org
diff --git a/net-misc/mknbi/mknbi-1.4.1.ebuild b/net-misc/mknbi/mknbi-1.4.1.ebuild
index 25cde9d2a835..e0e569493a0f 100644
--- a/net-misc/mknbi/mknbi-1.4.1.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.1.ebuild,v 1.3 2003/12/08 12:34:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.1.ebuild,v 1.4 2004/03/19 10:11:36 mr_bones_ Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
@@ -11,11 +11,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
-S="${WORKDIR}/${P}"
-
 src_compile()
 {
 	sed -i -e "s:\/usr\/local:\/usr:"  Makefile
diff --git a/net-misc/mknbi/mknbi-1.4.3.ebuild b/net-misc/mknbi/mknbi-1.4.3.ebuild
index 85dc8f71ca2b..24d58db97e6f 100644
--- a/net-misc/mknbi/mknbi-1.4.3.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.3.ebuild,v 1.1 2003/12/08 12:34:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.3.ebuild,v 1.2 2004/03/19 10:11:36 mr_bones_ Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
@@ -11,11 +11,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
-S="${WORKDIR}/${P}"
-
 src_compile()
 {
 	sed -i -e "s:\/usr\/local:\/usr:"  Makefile
diff --git a/net-misc/rsnapshot/ChangeLog b/net-misc/rsnapshot/ChangeLog
index acb5d559daf0..d1711bd829a9 100644
--- a/net-misc/rsnapshot/ChangeLog
+++ b/net-misc/rsnapshot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/rsnapshot
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsnapshot/ChangeLog,v 1.1 2004/03/01 19:16:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsnapshot/ChangeLog,v 1.2 2004/03/19 10:12:49 mr_bones_ Exp $
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> rsnapshot-1.1.0.ebuild:
+  fix depend (bug #45110); tidy
 
 *rsnapshot-1.1.0 (01 Mar 2004)
 
diff --git a/net-misc/rsnapshot/rsnapshot-1.1.0.ebuild b/net-misc/rsnapshot/rsnapshot-1.1.0.ebuild
index fd082eec6d53..838d2f007e2f 100644
--- a/net-misc/rsnapshot/rsnapshot-1.1.0.ebuild
+++ b/net-misc/rsnapshot/rsnapshot-1.1.0.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsnapshot/rsnapshot-1.1.0.ebuild,v 1.1 2004/03/01 19:16:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsnapshot/rsnapshot-1.1.0.ebuild,v 1.2 2004/03/19 10:12:49 mr_bones_ Exp $
 
 inherit eutils
 
-IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="rsnapshot is a filesystem backup utility based on rsync."
 HOMEPAGE="http://www.rsnapshot.org"
 SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
@@ -14,29 +12,24 @@ SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.2
-		>=util-linux-2.12-r4
+		>=sys-apps/util-linux-2.12-r4
 		>=sys-apps/coreutils-5.0.91-r4
 		>=net-misc/openssh-3.7.1_p2-r1
 		>=net-misc/rsync-2.6.0"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#autoconf || die "autoconf problem"
-}
-
 src_compile() {
 	econf \
 		--prefix=/usr \
 		--sysconfdir=/etc || die
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR=${D} || die "make install failed"
 }
 
 pkg_postinst() {
diff --git a/net-misc/tkusr/ChangeLog b/net-misc/tkusr/ChangeLog
index f65545440b81..9238dcd53031 100644
--- a/net-misc/tkusr/ChangeLog
+++ b/net-misc/tkusr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/tkusr
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/ChangeLog,v 1.1 2003/04/22 16:41:32 utx Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/ChangeLog,v 1.2 2004/03/19 10:14:29 mr_bones_ Exp $
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> tkusr-0.80.ebuild:
+  fix depend (bug #45110); tidy
 
 *tkusr-0.80 (22 Apr 2003)
 
diff --git a/net-misc/tkusr/tkusr-0.80.ebuild b/net-misc/tkusr/tkusr-0.80.ebuild
index e52ede082059..4174d12f0130 100644
--- a/net-misc/tkusr/tkusr-0.80.ebuild
+++ b/net-misc/tkusr/tkusr-0.80.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/tkusr-0.80.ebuild,v 1.3 2003/09/05 22:13:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/tkusr-0.80.ebuild,v 1.4 2004/03/19 10:14:29 mr_bones_ Exp $
 
 DESCRIPTION="TkUsr is a small program that allows you to manage the Self-mode of USR/3COM Message (Plus), Professional Message modems."
 HOMEPAGE="http://www.drolez.com/tkusr"
 SRC_URI="http://www.drolez.com/tkusr/${PN}_${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-S="${WORKDIR}/${P}"
-
-DEPEND=">=tcl-8.0
-	>=tk-8.0"
-
-RDEPEND=">=tcl-8.0
-	>=tk-8.0"
-
-src_unpack() {
-	unpack "${PN}_${PV}.tar.gz"
-	cd "${S}"
-}
+DEPEND=">=dev-lang/tcl-8.0
+	>=dev-lang/tk-8.0"
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc COPYING README
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README
 }
 
 pkg_postinst() {
diff --git a/sys-boot/elilo/ChangeLog b/sys-boot/elilo/ChangeLog
index a57bad113331..f0e16d88dec5 100644
--- a/sys-boot/elilo/ChangeLog
+++ b/sys-boot/elilo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/elilo
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.4 2004/03/04 22:44:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.5 2004/03/19 10:15:37 mr_bones_ Exp $
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> elilo-3.4.ebuild:
+  fix depend (bug #45110); tidy
 
   04 Mar 2004; <agriffis@gentoo.org> elilo-3.4.ebuild:
   stable on ia64
diff --git a/sys-boot/elilo/elilo-3.4.ebuild b/sys-boot/elilo/elilo-3.4.ebuild
index bb671ac49080..8e7a3d035b56 100644
--- a/sys-boot/elilo/elilo-3.4.ebuild
+++ b/sys-boot/elilo/elilo-3.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4.ebuild,v 1.4 2004/03/04 22:44:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4.ebuild,v 1.5 2004/03/19 10:15:37 mr_bones_ Exp $
+
+inherit eutils
 
 DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
 HOMEPAGE="http://developer.intel.com/technology/efi"
@@ -11,8 +13,9 @@ LICENSE="GPL-2"
 IUSE=""
 
 # gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=gnu-efi-3.0"
-RDEPEND="sys-boot/efibootmgr sys-fs/dosfstools"
+DEPEND=">=sys-boot/gnu-efi-3.0"
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools"
 
 src_unpack() {
 	unpack ${A} && cd ${S} || die "failed to unpack"