From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 30 Dec 2006 04:07:17 +0000 (+0000)
Subject: Move consolelog.sh to /sbin.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0921a11147c6457bf262ca9e170601270f93e85;p=gentoo.git

Move consolelog.sh to /sbin.
Package-Manager: portage-2.1.2_rc4-r2
---

diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index f02511eed3f5..71d500b36625 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/metalog
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.52 2006/11/22 18:23:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.53 2006/12/30 04:07:17 vapier Exp $
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/consolelog.sh,
+  files/metalog.conf, metalog-0.8_rc1-r2.ebuild:
+  Move consolelog.sh to /sbin.
 
   22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   metalog-0.8_rc1-r2.ebuild:
diff --git a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh
index effb565d377a..54102e4d6f7f 100644
--- a/app-admin/metalog/files/consolelog.sh
+++ b/app-admin/metalog/files/consolelog.sh
@@ -14,3 +14,5 @@ fi
 for d in ${CONSOLE} ; do
 	eval echo ${FORMAT} > ${d}
 done
+
+exit 0
diff --git a/app-admin/metalog/files/metalog.conf b/app-admin/metalog/files/metalog.conf
index ca8f888a4813..ce30692eab33 100644
--- a/app-admin/metalog/files/metalog.conf
+++ b/app-admin/metalog/files/metalog.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.conf,v 1.6 2006/02/08 01:04:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.conf,v 1.7 2006/12/30 04:07:17 vapier Exp $
 #
 # Sample Metalog configuration file 
 
@@ -88,4 +88,4 @@ Everything very important :
 #console logging :
 #
 #  facility = "*"
-#  command = "/usr/sbin/consolelog.sh"
+#  command = "/sbin/consolelog.sh"
diff --git a/app-admin/metalog/metalog-0.8_rc1-r2.ebuild b/app-admin/metalog/metalog-0.8_rc1-r2.ebuild
index 123a62352e81..4e21f5722293 100644
--- a/app-admin/metalog/metalog-0.8_rc1-r2.ebuild
+++ b/app-admin/metalog/metalog-0.8_rc1-r2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8_rc1-r2.ebuild,v 1.12 2006/11/22 18:23:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8_rc1-r2.ebuild,v 1.13 2006/12/30 04:07:17 vapier Exp $
 
 inherit versionator autotools
 
 MY_P="${PN}-$(replace_version_separator 2 '-')"
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 HOMEPAGE="http://metalog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@@ -18,28 +17,30 @@ IUSE=""
 DEPEND=">=dev-libs/libpcre-3.4"
 PROVIDE="virtual/logger"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog README NEWS TODO
 	newdoc metalog.conf metalog.conf.sample
 
 	insinto /etc
-	doins "${FILESDIR}"/metalog.conf
+	doins "${FILESDIR}"/metalog.conf || die
 
-	newinitd "${FILESDIR}"/metalog.rc7 metalog
+	newinitd "${FILESDIR}"/metalog.initd metalog
 	newconfd "${FILESDIR}"/metalog.confd metalog
 
-	exeinto /usr/sbin
-	doexe "${FILESDIR}"/consolelog.sh
+	exeinto /sbin
+	doexe "${FILESDIR}"/consolelog.sh || die
 }
 
 pkg_preinst() {