Install /var/log/portage/elog for bug #415911.

(Portage version: 2.2.0_alpha174/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)

7 files changed, 67 insertions, 7 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 2b2e5d30df29..446885a110fe 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1262 2013/05/03 21:09:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1263 2013/05/06 21:42:24 zmedico Exp $
+
+  06 May 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.11.55.ebuild,
+  portage-2.1.11.62.ebuild, portage-2.1.11.63.ebuild,
+  portage-2.2.0_alpha173.ebuild, portage-2.2.0_alpha174.ebuild,
+  portage-9999.ebuild:
+  Install /var/log/portage/elog for bug #415911.
 
 *portage-2.2.0_alpha174 (03 May 2013)
 
diff --git a/sys-apps/portage/portage-2.1.11.55.ebuild b/sys-apps/portage/portage-2.1.11.55.ebuild
index 6d0cd9bbbe31..edf340e1e8b8 100644
--- a/sys-apps/portage/portage-2.1.11.55.ebuild
+++ b/sys-apps/portage/portage-2.1.11.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.55.ebuild,v 1.7 2013/04/28 18:39:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.55.ebuild,v 1.8 2013/05/06 21:42:24 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -294,6 +294,15 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${D}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${D}"var/log/portage{,/elog}
+	fi
+
 	if [[ -d ${ROOT}var/log/portage && \
 		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
 		has_version '<sys-apps/portage-2.1.10.11' ; then
diff --git a/sys-apps/portage/portage-2.1.11.62.ebuild b/sys-apps/portage/portage-2.1.11.62.ebuild
index 6aef86b558de..45f86c25b4c8 100644
--- a/sys-apps/portage/portage-2.1.11.62.ebuild
+++ b/sys-apps/portage/portage-2.1.11.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild,v 1.9 2013/04/25 09:25:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild,v 1.10 2013/05/06 21:42:24 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -376,6 +376,15 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${D}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${D}"var/log/portage{,/elog}
+	fi
+
 	if [[ -d ${ROOT}var/log/portage && \
 		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
 		has_version '<sys-apps/portage-2.1.10.11' ; then
diff --git a/sys-apps/portage/portage-2.1.11.63.ebuild b/sys-apps/portage/portage-2.1.11.63.ebuild
index 21ae13fdc61f..46b05d58dc15 100644
--- a/sys-apps/portage/portage-2.1.11.63.ebuild
+++ b/sys-apps/portage/portage-2.1.11.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.63.ebuild,v 1.1 2013/05/03 21:08:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.63.ebuild,v 1.2 2013/05/06 21:42:24 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -376,6 +376,15 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${D}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${D}"var/log/portage{,/elog}
+	fi
+
 	if [[ -d ${ROOT}var/log/portage && \
 		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
 		has_version '<sys-apps/portage-2.1.10.11' ; then
diff --git a/sys-apps/portage/portage-2.2.0_alpha173.ebuild b/sys-apps/portage/portage-2.2.0_alpha173.ebuild
index 42ff491a8729..2bc067d53578 100644
--- a/sys-apps/portage/portage-2.2.0_alpha173.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha173.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha173.ebuild,v 1.1 2013/04/12 07:48:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha173.ebuild,v 1.2 2013/05/06 21:42:24 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -409,6 +409,15 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
 	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
 		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
 
diff --git a/sys-apps/portage/portage-2.2.0_alpha174.ebuild b/sys-apps/portage/portage-2.2.0_alpha174.ebuild
index 84a7e224a996..28553590e334 100644
--- a/sys-apps/portage/portage-2.2.0_alpha174.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha174.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha174.ebuild,v 1.1 2013/05/03 21:09:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha174.ebuild,v 1.2 2013/05/06 21:42:24 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -409,6 +409,15 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
 	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
 		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
 
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a7690bfccc74..24c5427e71ca 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.74 2013/04/04 17:45:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.75 2013/05/06 21:42:24 zmedico Exp $
 
 EAPI=3
 PYTHON_COMPAT=(
@@ -387,6 +387,15 @@ pkg_preinst() {
 		ewarn "enable USE=python3 for $CATEGORY/$PN."
 	fi
 
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
 	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
 		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false