--- a/components/gcc45/gcc-45-runtime.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/gcc45/gcc-45-runtime.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,12 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/system/library/gcc-45-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GCC - 4.5 Runtime"
+#
+# search our private runtime directory for dependencies first
+set name=pkg.depend.runpath value=/usr/gcc/4.5/lib/$(MACH64):/lib:/usr/lib
 set name=com.oracle.info.description value="the GNU Compiler Collection"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value=org.opensolaris.category.2008:Development/C \
@@ -36,9 +39,6 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2011/256
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-# search our private runtime directory for dependencies first
-set name=pkg.depend.runpath value=/usr/gcc/4.5/lib/$(MACH64):/lib:/usr/lib
-#
 link path=usr/gcc/4.5/lib/$(MACH64)/libgcc_s.so target=libgcc_s.so.1
 file path=usr/gcc/4.5/lib/$(MACH64)/libgcc_s.so.1
 link path=usr/gcc/4.5/lib/$(MACH64)/libgfortran.so target=libgfortran.so.3.0.0
@@ -75,12 +75,8 @@
 file path=usr/gcc/4.5/lib/libstdc++.so.6.0.14
 #
 license gcc45.license license="GPLv3 with Runtime Exception"
-#
-# In order to satisfy any dependencies that may be embedded in existing
-# packages, we require an unversioned runtime package.  All of the
-# unversioned runtime packages are newer than we are, so any will suffice.
-#
-depend type=require fmri=system/library/gcc/gcc-runtime
+depend type=optional \
+    fmri=system/library/gcc/[email protected],5.11-0.175.2.0.0.36.0
 #
 # force these to upgrade if they are installed to avoid conflict since the paths
 # in /usr/lib change from mediated links to files from here on.
@@ -88,8 +84,12 @@
 depend type=optional \
     fmri=system/library/gcc/[email protected],5.11-0.175.2.0.0.36.0
 depend type=optional \
-    fmri=system/library/gcc/[email protected],5.11-0.175.2.0.0.36.0
-depend type=optional \
     fmri=system/library/gcc/[email protected],5.11-0.175.2.0.0.36.0
 depend type=optional \
     fmri=system/library/gcc/[email protected],5.11-0.175.2.0.0.36.0
+#
+# In order to satisfy any dependencies that may be embedded in existing
+# packages, we require an unversioned runtime package.  All of the
+# unversioned runtime packages are newer than we are, so any will suffice.
+#
+depend type=require fmri=system/library/gcc/gcc-runtime