Fixed bug #156585 where the init.d script could call eend twice with only one ebegin.

(Portage version: 2.1.2_rc2-r2)
 (Signed Manifest commit)

3 files changed, 36 insertions, 86 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 0ca0122f74e8..e36461dafba5 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX syslog-ng.conf.debian 5445 RMD160 c3c2f319d437bb2548226f4f78db96cd6210c7cc SHA1 80256f810a5b87adf5b39320eb4b5758ba3003a0 SHA256 74943e12a92b415306e2fca27056a839fa7ce443ccd08fdafcfac9bcba08a1c3
 MD5 b9cf104e2020c2d8c5fa164b6f54de5c files/syslog-ng.conf.debian 5445
 RMD160 c3c2f319d437bb2548226f4f78db96cd6210c7cc files/syslog-ng.conf.debian 5445
@@ -22,9 +25,17 @@ AUX syslog-ng.rc6 1615 RMD160 8cb414bc09c48fdb591320203947035f9c32e968 SHA1 3752
 MD5 b74c976f08eb333cd29db85f69ba5c36 files/syslog-ng.rc6 1615
 RMD160 8cb414bc09c48fdb591320203947035f9c32e968 files/syslog-ng.rc6 1615
 SHA256 d4e574597148ae1b7009a9bc14df97c0b7b05e54f61619607e532984b5903b73 files/syslog-ng.rc6 1615
+AUX syslog-ng.rc6-r1 1752 RMD160 baace81a3852ba52ffa5fd968cd1e3970e006c1f SHA1 9c7daf066e9ab037af9ccd28d42026412699032f SHA256 a4bbffd2986cef072bf4c67d20108e0f2b18c4f9bab94faea64140d59c0024eb
+MD5 e70e7acbb3b6b2d56c61780b7b313978 files/syslog-ng.rc6-r1 1752
+RMD160 baace81a3852ba52ffa5fd968cd1e3970e006c1f files/syslog-ng.rc6-r1 1752
+SHA256 a4bbffd2986cef072bf4c67d20108e0f2b18c4f9bab94faea64140d59c0024eb files/syslog-ng.rc6-r1 1752
 DIST syslog-ng-1.6.11.tar.gz 712166 RMD160 2ddd5eaae12dbcef4b4e67f83d01a3bab8b2cce0 SHA1 acbee602fd4cb6a1ca40238742642413cd6f1787 SHA256 dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
 DIST syslog-ng-1.6.9.tar.gz 765341 RMD160 5220ee5b0859974cdf7e86fd884c1505f91228c6 SHA1 d9e92a9a82fdd5aa4642f0f6b1d164005c91f6f3 SHA256 e7f2d6dbeae17c14245cd20e9893d0144b969d98a29c230d4e8a0c9cc0f7dde9
 DIST syslog-ng-2.0.0.tar.gz 337553 RMD160 ed2c3ff8eea834c0c2fdae03ce2f9068a6d24128 SHA1 11a00e49f51056873d9889b8f2a62733b71bd040 SHA256 6f1e22554eb7292d9322de0623fd13dbd11bdda8d52d66280c1d4e193a69fac7
+EBUILD syslog-ng-1.6.11-r1.ebuild 1981 RMD160 799ffc28cda886201fe39701a1af00872f9c999a SHA1 e99ea684363c153fd6da3d6133d57c6a360fb7ca SHA256 a08c2d25475591cf7f45363b5f5d5224c0a922c5bfce8b16ea7acc0ea63f8ab6
+MD5 b9d04fce196a3fe562f09dd240fe655e syslog-ng-1.6.11-r1.ebuild 1981
+RMD160 799ffc28cda886201fe39701a1af00872f9c999a syslog-ng-1.6.11-r1.ebuild 1981
+SHA256 a08c2d25475591cf7f45363b5f5d5224c0a922c5bfce8b16ea7acc0ea63f8ab6 syslog-ng-1.6.11-r1.ebuild 1981
 EBUILD syslog-ng-1.6.11.ebuild 1966 RMD160 6e6ad921a83c524a64e7cff1a3be0d4145d42f8b SHA1 2628a8bb9a65f7747530dae189d2c76598e87dd8 SHA256 632ff8da1177d10bc5ea45bfafd700433297e10aa9e3b9ffa42b2f0a1bb606ea
 MD5 c3b1a7ac91c5f6e34d3784d268a16824 syslog-ng-1.6.11.ebuild 1966
 RMD160 6e6ad921a83c524a64e7cff1a3be0d4145d42f8b syslog-ng-1.6.11.ebuild 1966
@@ -33,24 +44,34 @@ EBUILD syslog-ng-1.6.9.ebuild 2003 RMD160 7278c7ad8027abdf3a05ca8c9c403ee7c090c3
 MD5 21c0112820b1d1f241e12d8a9360e718 syslog-ng-1.6.9.ebuild 2003
 RMD160 7278c7ad8027abdf3a05ca8c9c403ee7c090c30c syslog-ng-1.6.9.ebuild 2003
 SHA256 388a6757637060de37feac3aa4346dcb58c66a8f0ec2ddc71d71136114e8e42c syslog-ng-1.6.9.ebuild 2003
-EBUILD syslog-ng-2.0.0.ebuild 1951 RMD160 9da33c4876d082eb81e73ceb513e583ed615c605 SHA1 2a24016eba71b395077ce423938a79b5e5af5a13 SHA256 1de077432328854747bba5412fecb5f0d8d5127d8184d8842af0cafa0e925029
-MD5 12475eba73a27ea1b4180a01b6a2eed1 syslog-ng-2.0.0.ebuild 1951
-RMD160 9da33c4876d082eb81e73ceb513e583ed615c605 syslog-ng-2.0.0.ebuild 1951
-SHA256 1de077432328854747bba5412fecb5f0d8d5127d8184d8842af0cafa0e925029 syslog-ng-2.0.0.ebuild 1951
-MISC ChangeLog 18019 RMD160 f239c18512826d336547688785f0850779fa9d98 SHA1 ee67357c136c5d37ee7cdcbfca44287da38f1522 SHA256 9a3df124c1d29dfddc2b61e957c7fce600616ac3cc231404568843774cd7ab95
-MD5 9ce3493f521f70681b4c2ff04040cf66 ChangeLog 18019
-RMD160 f239c18512826d336547688785f0850779fa9d98 ChangeLog 18019
-SHA256 9a3df124c1d29dfddc2b61e957c7fce600616ac3cc231404568843774cd7ab95 ChangeLog 18019
-MISC metadata.xml 257 RMD160 42855264f35e8e834ee96a1140b24c82df0a0cb2 SHA1 94bf3510726056882c707f8f3f5c51fd84929453 SHA256 2b9dd09d2c92c1f9ae799f53cc0440871441b5f1aa9b949d0b8e227d607bf22d
-MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257
-RMD160 42855264f35e8e834ee96a1140b24c82df0a0cb2 metadata.xml 257
-SHA256 2b9dd09d2c92c1f9ae799f53cc0440871441b5f1aa9b949d0b8e227d607bf22d metadata.xml 257
+EBUILD syslog-ng-2.0.0-r1.ebuild 1958 RMD160 f2c9e8329c91bf2d14f12c7c8f9e8a44eb0f150f SHA1 b0cd35bdda56a60ac97b311dffcd515095265d5b SHA256 660eb7c6770193364c65583633ee1ee336c33a578da8a4e85bac33a3e29aae0a
+MD5 342bf326802ed6b3fc544df5f0d084fb syslog-ng-2.0.0-r1.ebuild 1958
+RMD160 f2c9e8329c91bf2d14f12c7c8f9e8a44eb0f150f syslog-ng-2.0.0-r1.ebuild 1958
+SHA256 660eb7c6770193364c65583633ee1ee336c33a578da8a4e85bac33a3e29aae0a syslog-ng-2.0.0-r1.ebuild 1958
+MISC ChangeLog 18345 RMD160 4c220b89cada1374d1f629dc918e1f34ff18f70e SHA1 5072c90049b7ca66ca25e840295bd5662683481e SHA256 d5e2af67602b3558263523146aa5775845571eb9047add59fe97f86f2492d0df
+MD5 c32dbcb0772aaee3bffedd631970e9c9 ChangeLog 18345
+RMD160 4c220b89cada1374d1f629dc918e1f34ff18f70e ChangeLog 18345
+SHA256 d5e2af67602b3558263523146aa5775845571eb9047add59fe97f86f2492d0df ChangeLog 18345
+MISC metadata.xml 255 RMD160 53f4041a04a683c1e6380721a5207730d986491f SHA1 6321fb4f7568a7f34494c3b8296c7c4d656a8dde SHA256 dbf6d5b64056da60b0e445af0dadc10592b84ed97e38b9c95acb9d723dcc98a3
+MD5 ac145feedb4b5bc6a7ea80d08994c5aa metadata.xml 255
+RMD160 53f4041a04a683c1e6380721a5207730d986491f metadata.xml 255
+SHA256 dbf6d5b64056da60b0e445af0dadc10592b84ed97e38b9c95acb9d723dcc98a3 metadata.xml 255
 MD5 e0e9f2576dde4529eeebd5dfa64ea22f files/digest-syslog-ng-1.6.11 250
 RMD160 708a4ff922d6edf3777476d1472737d62941548e files/digest-syslog-ng-1.6.11 250
 SHA256 80d13b2ee1f29d4b225e45aa097120679652e3ffd50863761bfa95bbc4484117 files/digest-syslog-ng-1.6.11 250
+MD5 e0e9f2576dde4529eeebd5dfa64ea22f files/digest-syslog-ng-1.6.11-r1 250
+RMD160 708a4ff922d6edf3777476d1472737d62941548e files/digest-syslog-ng-1.6.11-r1 250
+SHA256 80d13b2ee1f29d4b225e45aa097120679652e3ffd50863761bfa95bbc4484117 files/digest-syslog-ng-1.6.11-r1 250
 MD5 b481e7ac2702faefd67cf6266d9c6a5b files/digest-syslog-ng-1.6.9 247
 RMD160 b5be057a8fd361d942d01fe19d7af4cbf95deadc files/digest-syslog-ng-1.6.9 247
 SHA256 138e95860913ab20fa8c785e48308d51bb6448136f24e60f0ffd35ff489fb853 files/digest-syslog-ng-1.6.9 247
-MD5 031572c215cb3174335d2eed145a45bf files/digest-syslog-ng-2.0.0 247
-RMD160 3fc94ef8c78e17bb87fc6ca374e9fd3d3c5f2cbc files/digest-syslog-ng-2.0.0 247
-SHA256 5a325a10ed0ff7d58ab6df7ce47de121b79717c2b78d3393b94c36ea0df28acb files/digest-syslog-ng-2.0.0 247
+MD5 031572c215cb3174335d2eed145a45bf files/digest-syslog-ng-2.0.0-r1 247
+RMD160 3fc94ef8c78e17bb87fc6ca374e9fd3d3c5f2cbc files/digest-syslog-ng-2.0.0-r1 247
+SHA256 5a325a10ed0ff7d58ab6df7ce47de121b79717c2b78d3393b94c36ea0df28acb files/digest-syslog-ng-2.0.0-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFbca9cxLzpIGCsLQRAvbdAJ4xdSvIZf51RYyY1xj/68Rzxhc9xwCfY8xa
+2u+G4yBOhQ3bqW6HzX3hGwI=
+=nB3w
+-----END PGP SIGNATURE-----
diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0 b/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0
deleted file mode 100644
index 41db1b198553..000000000000
--- a/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 134db2e3d7b16bb70fd86d749cc2e4fd syslog-ng-2.0.0.tar.gz 337553
-RMD160 ed2c3ff8eea834c0c2fdae03ce2f9068a6d24128 syslog-ng-2.0.0.tar.gz 337553
-SHA256 6f1e22554eb7292d9322de0623fd13dbd11bdda8d52d66280c1d4e193a69fac7 syslog-ng-2.0.0.tar.gz 337553
diff --git a/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild b/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild
deleted file mode 100644
index bf72bcf381a5..000000000000
--- a/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild,v 1.1 2006/11/02 20:51:37 mr_bones_ Exp $
-
-inherit fixheadtails
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/syslog-ng/2.0/src/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="hardened selinux static ipv6"
-
-RDEPEND=">=dev-libs/eventlog-0.2
-	>=dev-libs/glib-2.2"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-PROVIDE="virtual/logger"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ht_fix_file configure
-	cd "${S}/doc/reference"
-	tar xzf syslog-ng.html.tar.gz || die "tar failed"
-}
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/syslog-ng \
-		--disable-dependency-tracking \
-		$(use_enable ipv6) \
-		$(use_enable !static dynamic-linking) \
-		$(use_enable static static-linking) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
-		contrib/syslog-ng.conf* \
-		doc/reference/syslog-ng.txt \
-		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-	dohtml doc/reference/syslog-ng.html/*
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf
-	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	# Install snippet for logrotate, which may or may not be installed
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc6" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-}