Closing #52311.

diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog
index 7d59f1bc01d3d1ed8bc407831099ee444ffee5d1..49040ff7a04e31e85391bfffcc67d37a12394a3a 100644 (file)
--- a/app-arch/arj/ChangeLog
+++ b/app-arch/arj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/arj
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.13 2005/01/01 11:41:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.14 2005/01/01 22:12:53 aliz Exp $
+
+  01 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> arj-3.10.21.ebuild:
+  Borrowed some gcc checking code from openoffice to automatically use gcc-3.3
+  when compiling arj, should close #52311.
 
   15 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> arj-3.10g.ebuild:
   Stable on sparc

diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 5597fc26ab26a3f21b4edad6b6d984ca9bf9d24d..11efbcf2c47c7ca780249217935e2c08f869451b 100644 (file)
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -1,12 +1,12 @@
-MD5 7992e948eb56d97d766b8a14bd6daf4d ChangeLog 1750
-MD5 bf872d7977d0c5f4ad8a1b5ede6eb655 arj-3.10.18.ebuild 894
 MD5 c56ba07e37dec37c343269e23b35f156 arj-3.10.20.ebuild 757
 MD5 9b4b57af43fbbee01697da5fb90d0b0e arj-3.10g.ebuild 780
-MD5 127a4f8ea14aa070b53aa8e193dd235f arj-3.10.21.ebuild 756
+MD5 bf872d7977d0c5f4ad8a1b5ede6eb655 arj-3.10.18.ebuild 894
+MD5 f3cda8f7641624e2c03b20e5340bdfe4 arj-3.10.21.ebuild 2316
+MD5 d5f33984bd87f729c0e40f0174ce5f6e ChangeLog 1935
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 5e2195c695615ccdb1ecbefe4bcad796 files/arj-3.10.18-2.6.headers.patch 402
-MD5 0187cf8866c2daa752565918b94e7ea0 files/arj-3.10.18-fPIC.patch 342
 MD5 7c4c01b5654eb39a7be1799abaad4c2f files/digest-arj-3.10.18 63
 MD5 6c06d74438839e6880711dddb5efd036 files/digest-arj-3.10.20 63
-MD5 47ce44cd0bdc2037f4bfa8dc8e81dfbd files/digest-arj-3.10g 61
 MD5 f51bf31b56b6e0f9191beb570b38502c files/digest-arj-3.10.21 63
+MD5 5e2195c695615ccdb1ecbefe4bcad796 files/arj-3.10.18-2.6.headers.patch 402
+MD5 47ce44cd0bdc2037f4bfa8dc8e81dfbd files/digest-arj-3.10g 61
+MD5 0187cf8866c2daa752565918b94e7ea0 files/arj-3.10.18-fPIC.patch 342

diff --git a/app-arch/arj/arj-3.10.21.ebuild b/app-arch/arj/arj-3.10.21.ebuild
index 4f0d2bda3d162a28778dcd02c63d80620a0cd064..fca1d6b4f7814f10149e6a2eed81086fb5980d10 100644 (file)
--- a/app-arch/arj/arj-3.10.21.ebuild
+++ b/app-arch/arj/arj-3.10.21.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.21.ebuild,v 1.3 2005/01/01 11:41:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.21.ebuild,v 1.4 2005/01/01 22:12:53 aliz Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils gcc
 
 DESCRIPTION="Utility for opening arj archives"
 HOMEPAGE="http://arj.sourceforge.net/"
@@ -17,6 +17,35 @@ RESTRICT="nostrip"
 DEPEND="virtual/libc"
 
 src_compile() {
+        if [ -x /usr/sbin/gcc-config ]
+        then
+                # Do we have a gcc that use the new layout and gcc-config ?
+                if /usr/sbin/gcc-config --get-current-profile &> /dev/null
+                then
+                        export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
+
+                        # Just recheck gcc version ...
+                        if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
+                        then
+                                # See if we can get a gcc profile we know is proper ...
+                                if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4 &> /dev/null
+                                then
+                                        export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4):${PATH}"
+                                        export GCC_PROFILE="${CHOST}-3.3.4"
+                                else
+                                        eerror "This build needs gcc-3.2 or gcc-3.3!"
+                                        eerror
+                                        eerror "Use gcc-config to change your gcc profile:"
+                                        eerror
+                                        eerror "  # gcc-config $CHOST-3.3.4"
+                                        eerror
+                                        eerror "or whatever gcc version is relevant."
+                                        die
+                                fi
+                        fi
+                fi
+        fi
+
        gnuconfig_update
 
        cd ${S}/gnu