Version bump.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

3 files changed, 75 insertions, 13 deletions

diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index 80c2252cd98b..a78a17ae66a5 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/metalog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.93 2011/04/07 07:50:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.94 2011/09/23 03:15:23 vapier Exp $
+
+*metalog-2 (23 Sep 2011)
+
+  23 Sep 2011; Mike Frysinger <vapier@gentoo.org> +metalog-2.ebuild,
+  files/metalog.initd:
+  Version bump.
 
   07 Apr 2011; Ultrabug <ultrabug@gentoo.org> metalog-1.ebuild:
   migrate ebuilds to new-style virtual, wrt #358881
diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd
index 3f855c5a41a1..7f1d292827cf 100755
--- a/app-admin/metalog/files/metalog.initd
+++ b/app-admin/metalog/files/metalog.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.initd,v 1.4 2009/01/02 07:56:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.initd,v 1.5 2011/09/23 03:15:23 vapier Exp $
 
-opts="buffer unbuffer"
+extra_started_commands="buffer unbuffer"
 
 PIDFILE=/var/run/metalog.pid
 
@@ -14,31 +14,29 @@ depend() {
 	provide logger
 }
 
+ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; }
+
 start() {
 	ebegin "Starting metalog"
-	start-stop-daemon --start --exec /usr/sbin/metalog \
-	    --pidfile "${PIDFILE}" \
-	    -- --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS}
+	ssd --start -- \
+	    --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping metalog"
-	start-stop-daemon --stop --exec /usr/sbin/metalog \
-	    --pidfile "${PIDFILE}"
+	ssd --stop
 	eend $?
 }
 
 buffer() {
 	ebegin "Enabling log buffering"
-	start-stop-daemon --stop --oknodo --signal USR2 \
-	    --exec /usr/sbin/metalog --pidfile "${PIDFILE}"
+	ssd --signal USR2
 	eend $?
 }
 
 unbuffer() {
 	ebegin "Disabling log buffering"
-	start-stop-daemon --stop --oknodo --signal USR1 \
-	    --exec /usr/sbin/metalog --pidfile "${PIDFILE}"
+	ssd --signal USR1
 	eend $?
 }
diff --git a/app-admin/metalog/metalog-2.ebuild b/app-admin/metalog/metalog-2.ebuild
new file mode 100644
index 000000000000..06601f8a83b3
--- /dev/null
+++ b/app-admin/metalog/metalog-2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-2.ebuild,v 1.1 2011/09/23 03:15:23 vapier Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="unicode"
+
+RDEPEND=">=dev-libs/libpcre-3.4"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+}
+
+src_configure() {
+	econf $(use_with unicode)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README NEWS metalog.conf
+
+	into /
+	dosbin "${FILESDIR}"/consolelog.sh || die
+
+	newinitd "${FILESDIR}"/metalog.initd metalog
+	newconfd "${FILESDIR}"/metalog.confd metalog
+}
+
+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
+		export MOVED_METALOG_CONF=true
+	else
+		export MOVED_METALOG_CONF=false
+	fi
+}
+
+pkg_postinst() {
+	if ${MOVED_METALOG_CONF} ; then
+		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."
+	fi
+}