Fix consolelog.sh install #177424 by Pim Dennendal.

Package-Manager: portage-2.1.3_rc7

5 files changed, 85 insertions, 48 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/Manifest b/app-admin/metalog/Manifest
index 36f393033cfc..abf195b59566 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,15 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX consolelog.sh 274 RMD160 4b56fec016ef9fdd56ad6740e8585e0a79208759 SHA1 7f5ec30286caa9c874e8d4206c96b70b29660449 SHA256 feac696a2d567cd159922ea2ea88194f24ef7574e49a73520528f6116bd3dfa9
 MD5 5e145b00f973f1b9ed8cfa12dcd9a928 files/consolelog.sh 274
 RMD160 4b56fec016ef9fdd56ad6740e8585e0a79208759 files/consolelog.sh 274
 SHA256 feac696a2d567cd159922ea2ea88194f24ef7574e49a73520528f6116bd3dfa9 files/consolelog.sh 274
-AUX metalog-0.8_rc1-gcc41.patch 1034 RMD160 f41a07e5f42374a42122498ae8ab41023946c2a9 SHA1 0b95e4395d94c2a97b47d0fb541843eab1aef1bf SHA256 d2419dfc7b8bd98abc526dac62dc5332e6e6cd5d4c60e843669a03705fdd0eee
-MD5 68806326e368e39b5bbb7927a9467646 files/metalog-0.8_rc1-gcc41.patch 1034
-RMD160 f41a07e5f42374a42122498ae8ab41023946c2a9 files/metalog-0.8_rc1-gcc41.patch 1034
-SHA256 d2419dfc7b8bd98abc526dac62dc5332e6e6cd5d4c60e843669a03705fdd0eee files/metalog-0.8_rc1-gcc41.patch 1034
-AUX metalog.conf 2833 RMD160 ded1342ff5e18d95362004297af1dad1d4655c19 SHA1 268628000f358069fffc0a73f109204fe0e14e47 SHA256 3de0c9f348bf414e03eee9333e525d5f0e746cf39ff708c3a8beb51869ced3bf
-MD5 76343697f5384e96357e3249cb94d34b files/metalog.conf 2833
-RMD160 ded1342ff5e18d95362004297af1dad1d4655c19 files/metalog.conf 2833
-SHA256 3de0c9f348bf414e03eee9333e525d5f0e746cf39ff708c3a8beb51869ced3bf files/metalog.conf 2833
+AUX metalog.conf 2716 RMD160 4f2bdc2a4de05bac5f74e6615aceece661d54906 SHA1 96e27461ea23c911b57514d81e41cee45ee7dfd3 SHA256 4fc6acdc313184b7e0240b93fb1caf11e4f6172b5be1cdb010ae15c0f86f0fcf
+MD5 fb287408d4f00d634fe83eb3b87285f3 files/metalog.conf 2716
+RMD160 4f2bdc2a4de05bac5f74e6615aceece661d54906 files/metalog.conf 2716
+SHA256 4fc6acdc313184b7e0240b93fb1caf11e4f6172b5be1cdb010ae15c0f86f0fcf files/metalog.conf 2716
 AUX metalog.confd 505 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 SHA1 84031ea9a673aa87edbc0088a51d86809007a69c SHA256 ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99
 MD5 ec30e8aa71d3b8fa92e0d6d1ca908797 files/metalog.confd 505
 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 files/metalog.confd 505
@@ -18,43 +17,26 @@ AUX metalog.initd 1029 RMD160 4c609ae69daa3acb32f6081653ba23f97f3e63d9 SHA1 a8d7
 MD5 deb49ff3e6119491ebd80ff737001d89 files/metalog.initd 1029
 RMD160 4c609ae69daa3acb32f6081653ba23f97f3e63d9 files/metalog.initd 1029
 SHA256 9801ae4046321740980798c40dd5b19bc015ab7f1f68b1066b5f0ecd3338a0df files/metalog.initd 1029
-DIST metalog-0.8-rc1.tar.gz 121744 RMD160 29747402e79fdbe73a1880c792d62af534d407a4 SHA1 0c704ec61ebb799a1826116207d2ac5945d50192 SHA256 45a77348b834482ecfd5e0455c4444009cf26bc319e2a4c409e9ea1df890ab51
-DIST metalog-0.8-rc2.tar.gz 129209 RMD160 9da1f5c2b066d6858fca922c18d884e1ec60608d SHA1 e165598b90d67a6089d0d29e9f4abf32575e1c93 SHA256 37969e465c2ab9706e8bf27d396d4b864464cc62e62aa1ac38a9b20a37cc14f6
-DIST metalog-0.8-rc4.tar.bz2 104664 RMD160 fd48804cfccaec07ad197463d78eb95912c27e18 SHA1 aa010080e94c8347716066ff97771778bb2146cb SHA256 df373d1c02506e983d049b825399388757fad95b9b7090d9f8696a4837e87647
 DIST metalog-0.8.tar.bz2 105471 RMD160 6a941d76e568934cc4afcc26f3f8295e9ed2b4e1 SHA1 e0f4a25ef2cbc3be91b4cafe2d614feda6b1e582 SHA256 d264742ec0d379385e80d231d3ac3cc591a1d5282c677cf80ac2fd6cd9ae078b
-EBUILD metalog-0.8.ebuild 1399 RMD160 8007582a735bb3d1163c7015e981a1e961ddb9b5 SHA1 3c4d7026245d1379ebff63e1ff3bae22c6012798 SHA256 0cff02a0053d4114c5b5ac261df2314b116c4de8b00a9316296335b985196c0e
-MD5 0c72c607eb566734fbcda0e7f5129881 metalog-0.8.ebuild 1399
-RMD160 8007582a735bb3d1163c7015e981a1e961ddb9b5 metalog-0.8.ebuild 1399
-SHA256 0cff02a0053d4114c5b5ac261df2314b116c4de8b00a9316296335b985196c0e metalog-0.8.ebuild 1399
-EBUILD metalog-0.8_rc1-r2.ebuild 1615 RMD160 e6314ffde18c254e4037e57acfdcabc344cee7a8 SHA1 c0359ad8dcc2910ac55c2a563874c68a641ada83 SHA256 5f00a0373fdce2bf00e2cf789f6b696ad64338d73301740d9c7ba403e8db85ed
-MD5 62a2ff5ded7f465919fc1cec55c0a22e metalog-0.8_rc1-r2.ebuild 1615
-RMD160 e6314ffde18c254e4037e57acfdcabc344cee7a8 metalog-0.8_rc1-r2.ebuild 1615
-SHA256 5f00a0373fdce2bf00e2cf789f6b696ad64338d73301740d9c7ba403e8db85ed metalog-0.8_rc1-r2.ebuild 1615
-EBUILD metalog-0.8_rc2.ebuild 1419 RMD160 705effb049cc323b35d067a69f0e99d41d8081f6 SHA1 53157cf43657b6898bbe8ff948a6d01d538b6def SHA256 450b70a5f7b272fa08c1450d94eac9c06987a0564709ccac90c028ffbe3f1cdd
-MD5 11ec73e411c9ec2e72904f72222f506b metalog-0.8_rc2.ebuild 1419
-RMD160 705effb049cc323b35d067a69f0e99d41d8081f6 metalog-0.8_rc2.ebuild 1419
-SHA256 450b70a5f7b272fa08c1450d94eac9c06987a0564709ccac90c028ffbe3f1cdd metalog-0.8_rc2.ebuild 1419
-EBUILD metalog-0.8_rc4.ebuild 1404 RMD160 38d8e94c73087fd635cda62c5c12f6fb33604535 SHA1 5d4ffb9149ce06354c14aa6fe15203b009ea748a SHA256 da733829c6eac65e00b5c2f078be0ac3269604214c4016bb10b44f6fc8cf6ff2
-MD5 8aa2f65a30106d63d273d8eb8e0cc9c8 metalog-0.8_rc4.ebuild 1404
-RMD160 38d8e94c73087fd635cda62c5c12f6fb33604535 metalog-0.8_rc4.ebuild 1404
-SHA256 da733829c6eac65e00b5c2f078be0ac3269604214c4016bb10b44f6fc8cf6ff2 metalog-0.8_rc4.ebuild 1404
-MISC ChangeLog 9702 RMD160 21d7a5be9998732877a696809db84df14ac89059 SHA1 506036666e922e7af265fbade36fa22f6d9fc388 SHA256 047d48474716b3ebfa8cbf729d98708a54d9a798dc3471f3c0d74e89d51a9071
-MD5 4b6d6986286a9de07e582e0e3aa916b9 ChangeLog 9702
-RMD160 21d7a5be9998732877a696809db84df14ac89059 ChangeLog 9702
-SHA256 047d48474716b3ebfa8cbf729d98708a54d9a798dc3471f3c0d74e89d51a9071 ChangeLog 9702
+EBUILD metalog-0.8-r1.ebuild 1392 RMD160 6784b9b340cb6e0d1d6b06e38ee97d93d4db5e8b SHA1 61998aa6c21827d4bac7a43675e92eca2e197b16 SHA256 a2662084b301873589e45d574ad0688835eb83a3ce8ea534503134662c25553b
+MD5 707801b7abdc8f3cd21a28aeb2df1e04 metalog-0.8-r1.ebuild 1392
+RMD160 6784b9b340cb6e0d1d6b06e38ee97d93d4db5e8b metalog-0.8-r1.ebuild 1392
+SHA256 a2662084b301873589e45d574ad0688835eb83a3ce8ea534503134662c25553b metalog-0.8-r1.ebuild 1392
+MISC ChangeLog 9885 RMD160 7b03c9572888ee5146b5363d27c8575e056919ca SHA1 56c5b5769c44704601d2e19bc6eacfcf0050f40f SHA256 a88250efb95b361d5927b5ab9b7659bdd93df439767921514fb17dbf9c2d78ca
+MD5 08600227bc16e81edbc31d291232567b ChangeLog 9885
+RMD160 7b03c9572888ee5146b5363d27c8575e056919ca ChangeLog 9885
+SHA256 a88250efb95b361d5927b5ab9b7659bdd93df439767921514fb17dbf9c2d78ca ChangeLog 9885
 MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 metadata.xml 225
 SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 metadata.xml 225
-MD5 0ef27853457778e763356062c602fffe files/digest-metalog-0.8 238
-RMD160 97968205d18481d8e9214a1347dc22d717e8d018 files/digest-metalog-0.8 238
-SHA256 78879ddd0008ad280fa5fbff1516de5403ca41a89d833aa22680b119c690ae8d files/digest-metalog-0.8 238
-MD5 ccf12153ca890f8ee1fcb519a0be9a03 files/digest-metalog-0.8_rc1-r2 247
-RMD160 8b7abab3060858619a5879562dc81697b505313f files/digest-metalog-0.8_rc1-r2 247
-SHA256 d5f647650b62ed5ba7b0e39489a0c29b1e3080517de57b6f22b9ff03f07a74cb files/digest-metalog-0.8_rc1-r2 247
-MD5 1187fa331d3f3e2057df98fc43410e91 files/digest-metalog-0.8_rc2 247
-RMD160 8c26fffec6811f9157c2a2c9694760e5353654d9 files/digest-metalog-0.8_rc2 247
-SHA256 a29e83b4181d7f0d0439637098e4e26582595fd79b9575c57ec19872a06d2e21 files/digest-metalog-0.8_rc2 247
-MD5 0a586777ea44236021d9615ba2bb4a3e files/digest-metalog-0.8_rc4 250
-RMD160 bf4e61ee03f5bc3c7c89c6e4146e90e82688431e files/digest-metalog-0.8_rc4 250
-SHA256 710762fe7ddbe628e2190a79b1ccfbd2b335a23ae1f6a28a81b8ab9b6110b742 files/digest-metalog-0.8_rc4 250
+MD5 0ef27853457778e763356062c602fffe files/digest-metalog-0.8-r1 238
+RMD160 97968205d18481d8e9214a1347dc22d717e8d018 files/digest-metalog-0.8-r1 238
+SHA256 78879ddd0008ad280fa5fbff1516de5403ca41a89d833aa22680b119c690ae8d files/digest-metalog-0.8-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGk02Ip/wUKkr7RBoRAsK2AJ9sDx861AnM1125hdx9O1mI9ukk3wCeKSGt
+qxJ3hNjCYoAfDMFGZhjKIaU=
+=ftcP
+-----END PGP SIGNATURE-----
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."
+}