Version bump.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 82 insertions, 18 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/Manifest b/app-admin/metalog/Manifest
index efbc0b1b4fa2..60d3b8031887 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 AUX consolelog.sh 269 RMD160 27246643ed2212960ee434996f3750d2f70552d6 SHA1 73f413949b6cf34442187e839b83c815ce02b1fb SHA256 b076ed8329052c8ec6d61722c15c589dbf53487cc3e7dbc0c54af6965c54048e
 AUX metalog-0.9-metalog-conf.patch 265 RMD160 b1c380d5a5ed45e6aec7467cba899a2b04853db0 SHA1 edebdff7682800a60a4c6b0ec5e76a99226976b2 SHA256 a18bbb8c05608a8919937be37b0dfc5640c2981986ad67ed75c5ee56831c2d42
 AUX metalog.confd 505 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 SHA1 84031ea9a673aa87edbc0088a51d86809007a69c SHA256 ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99
-AUX metalog.initd 1018 RMD160 2dfc6646af1750536c78b74b641d2a3983616983 SHA1 fb2df4aec7e5d1f86f4e488988b9c8b6afec4b9e SHA256 efe4e190b7f363d03e769f95005136c267e4103fe6d7d23ed38ba4f73c97e244
+AUX metalog.initd 812 RMD160 8b20719c56487ca0b0ee3b62ec5c11f5467396b7 SHA1 9dfe074fe03608321a50eadece0852f719f05ae0 SHA256 906c31e0817517dc6c141a7a10565140ea272d3c958a065f520a0ecb6f81912f
 DIST metalog-1.tar.lzma 276450 RMD160 219257e59e7634c9c38ab979fe01ce167ed3ce2c SHA1 420c9d1050a5085bd8b1b7fd849804c589bda26d SHA256 4f27a64e7abb1a1ecb078147db8db4e1edf2bcb72723ec5d9456af09255ff167
+DIST metalog-2.tar.xz 342848 RMD160 687d7aa17f58ba0c5f4011d852d60de3d69740ef SHA1 c22e94c95c41285f5b54c98cc94849d29e0edd78 SHA256 4c7e6a6aae6b38d3e03bf34bb9256fcba68888a58c4dbbb1c7d14ba73f8d8f42
 EBUILD metalog-1.ebuild 1573 RMD160 4c8cd0cbd12ecd0ff2191c4cc2f5339687c47508 SHA1 01f570572a0b8e5f74d34d9d28b60c015bdd678b SHA256 d1c6689a1315df1d010f27f2ec63208ea456fc9efae0585fe53f515fecae1556
-MISC ChangeLog 11613 RMD160 1e78147637ac49e6e3ec0df6c580f6df96fd5b23 SHA1 6903cc350eb7341901713fec33f5fc9bba4ed4fa SHA256 75b124250acacc5a07791ca613b48d92cda18807c25fab77a2fb10f04bd7047d
+EBUILD metalog-2.ebuild 1552 RMD160 8f6ba384c126669ce30f481277b025b210b22769 SHA1 c5a5d2bed0a4bb5cc0d87019fdfe61334baa2cae SHA256 1cf46f81a503697d815a90cdb43ad06ff6c5366d3f311bbcba210018030ed14b
+MISC ChangeLog 11746 RMD160 bfceb8f51a73bdc3bd0e7bab59ed22cb598a169c SHA1 2a4cc835d7aeb8821a1526c3a20e40e37cd32a0d SHA256 9f858c800bd98f5abb645d0ee6c933db1525d44faf9b812b054bba972b621a92
 MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2dbNsACgkQKiQSS7ZY+hO9YQD/Xx4SxxJq11AMvUg9g71e27W1
-rq20IwsC/F8lyHM5bkQBAMYt4TYmB2yOui4XRmarlPpdx1As7nFnsid0+0Rp9VDI
-=OkLu
+iF4EAREIAAYFAk57+dMACgkQaC/OocHi7JbpBgD9FSxv2TXHVhRNivQb1P84IFvU
+cgAS+9usDrYylcuVfjYBAINDWiChTcV2SienEWEBtMSFgk1P3ZNVHPa1ObCRxPPG
+=WAEQ
 -----END PGP SIGNATURE-----
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
+}