5 files changed, 28 insertions, 64 deletions

diff --git a/app-misc/ondir/ChangeLog b/app-misc/ondir/ChangeLog
index debe74d1e2fa..ba24c71351f8 100644
--- a/app-misc/ondir/ChangeLog
+++ b/app-misc/ondir/ChangeLog
@@ -1,44 +1,6 @@
 # ChangeLog for app-misc/ondir
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ondir/ChangeLog,v 1.14 2005/08/07 13:23:38 hansmi Exp $
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> ondir-0.2.2.ebuild:
-  Stable on ppc.
-
-  02 Jun 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
-  ondir-0.2.2.ebuild:
-  mark ~ppc
-
-  21 Apr 2005; Simon Stelling <blubb@gentoo.org> ondir-0.2.2.ebuild:
-  stable on amd64
-
-  27 Dec 2004; <gongloo@gentoo.org> ondir-0.2.2.ebuild:
-  Added ~ppc-macos
-
-  29 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
-  ondir-0.2.2.ebuild:
-  Marked stable on x86; added myself as maintainer.
-
-  26 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> ondir-0.2.2.ebuild:
-  Use tc-getCC from toolchain-funcs.eclass instead of ${CC}; fixes bug #68985
-
-*ondir-0.2.2 (25 Oct 2004)
-
-  25 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> +ondir-0.2.2.ebuild:
-  Version bump; updated HOMEPAGE and SRC_URI; respect user CFLAGS; use make
-  install instead of a sleu of do* functions.
-
-  21 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
-  Add metadata (shell-tools)
-
-  10 Jul 2004; Tom Martin <slarti@gentoo.org> ondir-0.2.1.ebuild:
-  Marked ~amd64.
-
-  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ondir-0.2.1.ebuild:
-  Don't assign default to S; header fix
-
-  08 Oct 2003; Joel Hill <hillster@gentoo.org> ondir-0.2.1.ebuild:
-  cleanup, marking stable
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ondir/ChangeLog,v 1.1 2003/08/21 21:02:07 pylon Exp $
 
 *ondir-0.2.1 (21 Aug 2003)
 
diff --git a/app-misc/ondir/Manifest b/app-misc/ondir/Manifest
index 98489aec301c..f693c567258f 100644
--- a/app-misc/ondir/Manifest
+++ b/app-misc/ondir/Manifest
@@ -1,6 +1,3 @@
-MD5 62c60c9070ecb5a2556cac322cc20d56 ondir-0.2.2.ebuild 909
-MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
-MD5 0ad5c250b6293d926f81d2096798b43f ondir-0.2.1.ebuild 873
-MD5 52d97685cf67cb897d311e4bc6e1e8c5 ChangeLog 1631
-MD5 62c60a68887b0d75738e24cd63fe1a23 files/digest-ondir-0.2.2 62
+MD5 0f486afa4def7f7600365df9ccf3a2dd ondir-0.2.1.ebuild 885
+MD5 2c4d10f9dce465708afbf8f205b9b9af ChangeLog 306
 MD5 60c8f133ff798b83676f2909366dbfbf files/digest-ondir-0.2.1 62
diff --git a/app-misc/ondir/metadata.xml b/app-misc/ondir/metadata.xml
index 1bd09b7fe2c3..40149c995561 100644
--- a/app-misc/ondir/metadata.xml
+++ b/app-misc/ondir/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>shell-tools</herd>
-	<maintainer>
-		<email>ka0ttic@gentoo.org</email>
-		<name>Aaron Walker</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/ondir/ondir-0.2.1.ebuild b/app-misc/ondir/ondir-0.2.1.ebuild
index da8cc972bf39..3d7b0b1ff5d7 100644
--- a/app-misc/ondir/ondir-0.2.1.ebuild
+++ b/app-misc/ondir/ondir-0.2.1.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ondir/ondir-0.2.1.ebuild,v 1.7 2005/01/01 15:17:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ondir/ondir-0.2.1.ebuild,v 1.1 2003/08/21 21:02:07 pylon Exp $
 
 inherit eutils
 
-DESCRIPTION="program that automatically executes scripts as you traverse directories"
-HOMEPAGE="http://ondir.sourceforge.net/"
+DESCRIPTION="ondir is a program that automatically executes scripts as you traverse directories."
 SRC_URI="http://ondir.sourceforge.net/${PV}/ondir-${PV}.tar.gz"
-
+HOMEPAGE="http://ondir.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~x86"
 IUSE=""
-
 DEPEND=""
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+}
 
 src_compile() {
 	emake PREFIX=/usr CONF=/etc/ondirrc || die "Make failed"
@@ -31,6 +35,13 @@ src_install() {
 	insopts -oroot -groot -m0644
 	doins ondirrc.eg
 	## DOCS
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-	doman ondir.1
+	dodoc \
+		AUTHORS \
+		ChangeLog \
+		COPYING \
+		INSTALL \
+		README \
+		TODO
+	doman \
+		ondir.1
 }
diff --git a/app-misc/ondir/ondir-0.2.2.ebuild b/app-misc/ondir/ondir-0.2.2.ebuild
index 28b10da6e088..5f36394c90c3 100644
--- a/app-misc/ondir/ondir-0.2.2.ebuild
+++ b/app-misc/ondir/ondir-0.2.2.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ondir/ondir-0.2.2.ebuild,v 1.8 2005/08/07 13:23:38 hansmi Exp $
-
-inherit toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ondir/ondir-0.2.2.ebuild,v 1.1 2004/10/25 13:57:02 ka0ttic Exp $
 
 DESCRIPTION="program that automatically executes scripts as you traverse directories"
 HOMEPAGE="http://swapoff.org/OnDir"
@@ -10,7 +8,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc-macos x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -25,7 +23,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="${CC:-gcc}" || die
 }
 
 src_install() {