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

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 94 insertions, 63 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/Manifest b/sys-kernel/mips-sources/Manifest
index cc2e8ed74ea2..905535a02c85 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -22,8 +22,8 @@ DIST mipsgit-2.6.29-20090324.diff.bz2 17991 RMD160 fc94317086c27111c2e43cd6c7ff7
 DIST patch-2.6.27.21.bz2 314006 RMD160 9c5a732052d1231311395a1631e00cc253c10280 SHA1 b87855be728142d4cfaae9b25ec79f0aedb8f54f SHA256 ac48615ffab711edb64d88683aa50b839a2d12303abb6a9bfb21421112309c8c
 DIST patch-2.6.28.9.bz2 173005 RMD160 226641938d0e9bd137b7388a4a015ebfa5216c55 SHA1 80de4c8dba6122fc8dfa5987b617090acf6842e0 SHA256 2d9342ac09e2c69a98ab000ee1313596e2bb9692cbe52ae52c43f913a7a03682
 DIST patch-2.6.29.1.bz2 14395 RMD160 78b2817db8a001750648ee4609a94de26829a4bc SHA1 de0c8efa7927fca5c95dce0e1a47e354527a6c52 SHA256 0c44a41816082602f9d2bd45524d85f6e5fa8e4a6a9a15861048ca2aaf068d8f
-EBUILD mips-sources-2.6.27.21-r1.ebuild 4939 RMD160 c8933d950cb7fa1b18e98900a3ea82b50234b37e SHA1 a1b379ca32bacc82be4a34d61316cdc189622267 SHA256 dca523cb7410ca3975b8505d65ded01ba2bedcff25206d1b7dd3b6d7ae293c27
-EBUILD mips-sources-2.6.28.9-r1.ebuild 4938 RMD160 4b0416e6eca860ea632a978db94fe6a4c9590488 SHA1 5ef7443c91e6a81ba857fc6be49a5392ae17d037 SHA256 5ddbd075e7dc9497a167d778e562b37abe381b1d6434ca3b8e53ba5051dc7f56
-EBUILD mips-sources-2.6.29.1.ebuild 4947 RMD160 0e3cee88141b80ce45e7ef6143180b2557994801 SHA1 49285b11299b311aabaeab007a3efb8cc8ec8003 SHA256 a6563451005671dff8c1e761b57530f615f8e0af7bbbe0287b737529e60ef38b
-MISC ChangeLog 50948 RMD160 8e571f9c8da66fb9252b68159527966532c427ee SHA1 f91f5b7f78aa528be4e6030181747aed5ad3beee SHA256 2d05cef559470d5fc092b43322b49ab33d1bfe55f52cdcbe63523650fcb852df
+EBUILD mips-sources-2.6.27.21-r1.ebuild 5164 RMD160 3e74b8cb96733565bb54b56a0a209f900b96480e SHA1 1b64cc63acafef8db3f7f147b9b9ccdd0baa8b3d SHA256 e1bb25257ff91cb72b247a9cfef37d9507609ef274f354bf1fc25bcee1d25480
+EBUILD mips-sources-2.6.28.9-r1.ebuild 5163 RMD160 e9c7f5282aadfbc3c0613f7ed52698d2e2f0aa96 SHA1 ace9f1c96c432bd9a845a62d6ba21cbe48e66d67 SHA256 97ce94868597be3ffb0910eab096cee728c35ff90c1791700f0d38e80b465ac1
+EBUILD mips-sources-2.6.29.1.ebuild 5171 RMD160 6a0d2466109effb5eec2e0af7f83ff7044b37bea SHA1 028c84e8b470171fb20fa851d57beb6adbfeb57d SHA256 bc94a2d9feeb30997758219e6939ba9678bb8e050185803bd385caa1c8244108
+MISC ChangeLog 51189 RMD160 54b7ad821ed8314dc7456424f6646f7df867bbe8 SHA1 f1a0c98c98a7c487ccbf3552d497603339a609d9 SHA256 b221f22cb328e69ef41ba384e2134bd695b9284ed89fba376bf35bc1e227be90
 MISC metadata.xml 926 RMD160 ea43e72aa35d2607c34b4fc5dca1465dea9b34fa SHA1 d29050c199533d2ec2d78fb0959af2ff2b5a00e2 SHA256 0053299fd7a1ac41ab528558d7535603938440c058fdf41d102a7b1acece7f87
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 ; }
 
 #//------------------------------------------------------------------------------