Fix consolelog.sh install #177424 by Pim Dennendal.

(Portage version: 2.1.3_rc7)

4 files changed, 60 insertions, 5 deletions

diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index 2381ba46ba32..4d885019ccf4 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/metalog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.78 2007/06/21 06:52:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.79 2007/07/10 09:12:22 vapier Exp $
+
+*metalog-0.8-r1 (10 Jul 2007)
+
+  10 Jul 2007; Mike Frysinger <vapier@gentoo.org> files/metalog.conf,
+  +metalog-0.8-r1.ebuild:
+  Fix consolelog.sh install #177424 by Pim Dennendal.
 
   21 Jun 2007; Joshua Kinard <kumba@gentoo.org> metalog-0.8.ebuild:
   Stable on mips, per #181622.
diff --git a/app-admin/metalog/files/digest-metalog-0.8-r1 b/app-admin/metalog/files/digest-metalog-0.8-r1
new file mode 100644
index 000000000000..e9935c842b74
--- /dev/null
+++ b/app-admin/metalog/files/digest-metalog-0.8-r1
@@ -0,0 +1,3 @@
+MD5 91552a26bfe976356e6108944e195aa6 metalog-0.8.tar.bz2 105471
+RMD160 6a941d76e568934cc4afcc26f3f8295e9ed2b4e1 metalog-0.8.tar.bz2 105471
+SHA256 d264742ec0d379385e80d231d3ac3cc591a1d5282c677cf80ac2fd6cd9ae078b metalog-0.8.tar.bz2 105471
diff --git a/app-admin/metalog/files/metalog.conf b/app-admin/metalog/files/metalog.conf
index 9bbf953a7445..68ee5bbc70ab 100644
--- a/app-admin/metalog/files/metalog.conf
+++ b/app-admin/metalog/files/metalog.conf
@@ -1,5 +1,3 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.conf,v 1.9 2006/12/30 07:03:22 vapier Exp $
-#
 # Sample Metalog configuration file 
 
 maxsize  = 1048576  # size in bytes
@@ -13,7 +11,7 @@ maxfiles = 5        # num files per dir
 #Metalog :
 #
 #  program  = "metalog"
-#  logidr   = "/var/log/metalog"
+#  logdir   = "/var/log/metalog"
 #  break    = 1
 
 # Uncomment and adjust the following lines according to your console logging
@@ -25,7 +23,7 @@ maxfiles = 5        # num files per dir
 #console logging :
 #
 #  facility = "*"
-#  command  = "/usr/sbin/consolelog.sh"
+#  command  = "/sbin/consolelog.sh"
 
 Everything important :
 
diff --git a/app-admin/metalog/metalog-0.8-r1.ebuild b/app-admin/metalog/metalog-0.8-r1.ebuild
new file mode 100644
index 000000000000..5158916b9484
--- /dev/null
+++ b/app-admin/metalog/metalog-0.8-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8-r1.ebuild,v 1.1 2007/07/10 09:12:22 vapier Exp $
+
+MY_P="${P/_/-}"
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-libs/libpcre-3.4"
+PROVIDE="virtual/logger"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README NEWS
+	newdoc metalog.conf metalog.conf.sample
+
+	insinto /etc
+	doins "${FILESDIR}"/metalog.conf || die
+
+	newinitd "${FILESDIR}"/metalog.initd metalog
+	newconfd "${FILESDIR}"/metalog.confd metalog
+
+	into /
+	dosbin "${FILESDIR}"/consolelog.sh || die
+}
+
+pkg_preinst() {
+	if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then
+		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
+		rmdir "${ROOT}"/etc/metalog
+	fi
+}
+
+pkg_postinst() {
+	ewarn "The default metalog.conf file has been moved"
+	ewarn "from /etc/metalog/metalog.conf to just"
+	ewarn "/etc/metalog.conf.  If you had a standard"
+	ewarn "setup, the file has been moved for you."
+}