QA: non-maintainer commit. Fix metadata invariancy issues. Per bug #300370.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 90 insertions, 59 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 09d3da0e0f6a..88be4999be9c 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mips-sources
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.129 2009/04/11 08:17:15 kumba Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.130 2010/01/10 09:48:34 scarabeus Exp $
+
+  10 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  mips-sources-2.6.27.21-r1.ebuild, mips-sources-2.6.28.9-r1.ebuild,
+  mips-sources-2.6.29.1.ebuild:
+  QA: non-maintainer commit. Fix metadata invariancy issues. Per bug
+  #300370.
 
 *mips-sources-2.6.29.1 (11 Apr 2009)
 *mips-sources-2.6.28.9-r1 (11 Apr 2009)
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
index 105005fa55f4..7d14a85ae03c 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild,v 1.2 2009/04/13 01:06:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.27.21-r1.ebuild,v 1.3 2010/01/10 09:48:34 scarabeus Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -137,24 +137,32 @@ eblit-pkg() {
 
 #//------------------------------------------------------------------------------
 
-# All are in ${FILESDIR}/eblits
-# If a message for a given machine needs to change,
-# then we create a new eblit and increment the
-# version and reference it here.
-eblit-include err_disabled_mach v1
-eblit-include err_only_one_mach_allowed v1
-eblit-include show_ip22_info v1
-eblit-include show_ip27_info v1
-eblit-include show_ip28_info v1
-eblit-include show_ip30_info v1
-eblit-include show_ip32_info v1
-eblit-include show_cobalt_info v1
-
-# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-eblit-pkg setup v1
-eblit-pkg postinst v1
+load_eblit_funcs() {
+    # All are in ${FILESDIR}/eblits
+    # If a message for a given machine needs to change,
+    # then we create a new eblit and increment the
+    # version and reference it here.
+    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return;
+    eblit-include err_disabled_mach v1
+    eblit-include err_only_one_mach_allowed v1
+    eblit-include show_ip22_info v1
+    eblit-include show_ip27_info v1
+    eblit-include show_ip28_info v1
+    eblit-include show_ip30_info v1
+    eblit-include show_ip32_info v1
+    eblit-include show_cobalt_info v1
+
+    # This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+    # Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+    eblit-pkg setup v1
+    eblit-pkg postinst v1
+    MIPS_SOURCES_EBLITS_LOADED=1
+}
 
+pkg_setup() {
+    load_eblit_funcs
+    pkg_setup
+}
 src_unpack() { eblit-run src_unpack v1 ; }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
index 22803108e8a5..7eb0847ba77a 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild,v 1.2 2009/04/13 01:06:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.28.9-r1.ebuild,v 1.3 2010/01/10 09:48:34 scarabeus Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -137,23 +137,32 @@ eblit-pkg() {
 
 #//------------------------------------------------------------------------------
 
-# All are in ${FILESDIR}/eblits
-# If a message for a given machine needs to change,
-# then we create a new eblit and increment the
-# version and reference it here.
-eblit-include err_disabled_mach v1
-eblit-include err_only_one_mach_allowed v1
-eblit-include show_ip22_info v1
-eblit-include show_ip27_info v1
-eblit-include show_ip28_info v1
-eblit-include show_ip30_info v1
-eblit-include show_ip32_info v1
-eblit-include show_cobalt_info v1
-
-# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-eblit-pkg setup v1
-eblit-pkg postinst v1
+load_eblit_funcs() {
+    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+    # All are in ${FILESDIR}/eblits
+    # If a message for a given machine needs to change,
+    # then we create a new eblit and increment the
+    # version and reference it here.
+    eblit-include err_disabled_mach v1
+    eblit-include err_only_one_mach_allowed v1
+    eblit-include show_ip22_info v1
+    eblit-include show_ip27_info v1
+    eblit-include show_ip28_info v1
+    eblit-include show_ip30_info v1
+    eblit-include show_ip32_info v1
+    eblit-include show_cobalt_info v1
+
+    # This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+    # Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+    eblit-pkg setup v1
+    eblit-pkg postinst v1
+    MIPS_SOURCES_EBLITS_LOADED=1
+}
+
+pkg_setup() {
+    load_eblit_funcs
+    pkg_setup
+}
 
 src_unpack() { eblit-run src_unpack v1 ; }
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
index db2870c7c8ed..4d3ebfe6aa2e 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild,v 1.2 2009/04/13 01:06:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.29.1.ebuild,v 1.3 2010/01/10 09:48:34 scarabeus Exp $
 
 # INCLUDED:
 # 1) linux sources from kernel.org
@@ -137,24 +137,32 @@ eblit-pkg() {
 
 #//------------------------------------------------------------------------------
 
-# All are in ${FILESDIR}/eblits
-# If a message for a given machine needs to change,
-# then we create a new eblit and increment the
-# version and reference it here.
-eblit-include err_disabled_mach v1
-eblit-include err_only_one_mach_allowed v1
-eblit-include show_ip22_info v1
-eblit-include show_ip27_info v1
-eblit-include show_ip28_info v1
-eblit-include show_ip30_info v1
-eblit-include show_ip32_info v1
-eblit-include show_cobalt_info v1
-
-# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-eblit-pkg setup v1
-eblit-pkg postinst v1
+load_eblit_funcs() {
+    # All are in ${FILESDIR}/eblits
+    # If a message for a given machine needs to change,
+    # then we create a new eblit and increment the
+    # version and reference it here.
+    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+    eblit-include err_disabled_mach v1
+    eblit-include err_only_one_mach_allowed v1
+    eblit-include show_ip22_info v1
+    eblit-include show_ip27_info v1
+    eblit-include show_ip28_info v1
+    eblit-include show_ip30_info v1
+    eblit-include show_ip32_info v1
+    eblit-include show_cobalt_info v1
+
+    # This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+    # Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+    eblit-pkg setup v1
+    eblit-pkg postinst v1
+    MIPS_SOURCES_EBLITS_LOADED=1
+}
 
+pkg_setup() {
+    load_eblit_funcs
+    pkg_setup
+}
 src_unpack() { eblit-run src_unpack v2 ; }
 
 #//------------------------------------------------------------------------------