Fix multilib gre config file bug #325889

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 6a8e6787472a911eaf8aa51c16bdaeff30b9b668..9496b1a6efe939506c0435e5ee83312ec271a496 100644 (file)
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.325 2010/07/11 12:30:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.326 2010/07/18 15:07:38 anarchy Exp $
+
+  18 Jul 2010; Jory A. Pratt <anarchy@gentoo.org> xulrunner-1.9.2.6.ebuild:
+  Fix multilib gre config file bug #325889
 
   11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
   xulrunner-1.9.2.4.ebuild, xulrunner-1.9.2.6.ebuild,

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 7d3415d28ee7319aecd962d0b517e2e233588b55..81ee952474db3d07cecf1511bcd7535f1605623c 100644 (file)
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -31,6 +31,6 @@ EBUILD xulrunner-1.9.1.6.ebuild 7948 RMD160 b3bca093dcb0ae36a7d493cb2990d7fe519a
 EBUILD xulrunner-1.9.1.8.ebuild 7951 RMD160 235df30f6c383961147c5114ab2bbc39e12aad05 SHA1 5fb4b96ba83ef678ac01faa354d4b67b53149dbd SHA256 d2d1768a7ecf76e310cfec673961605fe9c36c836dc50242541b3a46e3fc2938
 EBUILD xulrunner-1.9.2.3-r1.ebuild 7113 RMD160 a76436aea74663f110fe5a2ae60903ac09eab46e SHA1 cf7da8c677dc6e7707532c91461f0985d5185a05 SHA256 6c10a44ce7b04a689411e3eaca4c1d6e9260d29088df1b31af4999143e0efdce
 EBUILD xulrunner-1.9.2.4.ebuild 7257 RMD160 07c7f7949b1a788e8a307b5c5f98d3816d37c932 SHA1 5487c5e2452270dd28e4aa30a689ba8e95b1c450 SHA256 34d16a5f94d8d60a3075229f3e36bac3990a8632027792e770a4afa1f845144b
-EBUILD xulrunner-1.9.2.6.ebuild 7266 RMD160 fe128ef1ca1ca9535c58f4eddf75b7f47376976b SHA1 44743771fe9f5e3d1bf3cbbc5acbcbbcbd1a42c3 SHA256 ee2a72670bb87becab90a1fa4eed50522242de313179fc256704e8c385c8cf50
-MISC ChangeLog 44002 RMD160 6714076465ba199a1802432b790e2548f5c216bc SHA1 b7d1bd3100a0eebf0cf0f5bccd839fcb3b55c0e4 SHA256 ddc9fe7e0778c072e582f35bd261b113f21d617a46a41d521a7f178642e1c350
+EBUILD xulrunner-1.9.2.6.ebuild 7425 RMD160 01435f4e94444fa6e2f9ceda52ae667c5c977e07 SHA1 80b9f8157c7cabc6edaf4775c0b1ea69f549e0a1 SHA256 d78a9e4a3ebb4f4751d1b982d2d1b1a7dd73dc8c0853a1e17514d02d5ab74827
+MISC ChangeLog 44121 RMD160 243d86bb1c6937315014815e94679bd1b65f0ab6 SHA1 6bd3f3e0762db1fbce36c52b5c01732a164761fc SHA256 6ca34845d5fc377826a6497395bbab5c3c1335100b7366fd003562d844daacf0
 MISC metadata.xml 534 RMD160 6f9915565c51559c0e4726fed4e43cffce894306 SHA1 7ababd8846ab59b3ea43ac0153750584aa792055 SHA256 60f561d9e9846e96bfa0d6a9161058986c65dba93879073e7138477b6ce61978

diff --git a/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
index 8f6589a93bd46337fab12b8e44600f0e1be279f0..b2cc0d6feaefcf03be18908e31b5bfae76416065 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild,v 1.2 2010/07/11 12:30:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild,v 1.3 2010/07/18 15:07:38 anarchy Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -198,6 +198,13 @@ src_install() {
        MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
        SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
 
+       if has_multilib_profile; then
+               local config
+               for config in "${D}"/etc/gre.d/*.system.conf ; do
+                       mv "${config}" "${config%.conf}.${CHOST}.conf"
+               done
+       fi
+
        dodir /usr/bin
        dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die