Fix up ccc patches, clear libcpml ebuild some

git-svn-id: svn://mattst88.com/svn/compaq-c-overlay@2 8c41e67f-757b-4206-be13-12d8f16ad5be

4 files changed, 44 insertions, 43 deletions

diff --git a/dev-lang/ccc/Manifest b/dev-lang/ccc/Manifest
index 68d4984..be59414 100644
--- a/dev-lang/ccc/Manifest
+++ b/dev-lang/ccc/Manifest
@@ -1,3 +1,4 @@
-AUX update-config.patch 2672 RMD160 69246210a1e0b61854fc42de2572597c1ca5d213 SHA1 d8e6646453653c4bd29a3bd56799a318cd559d00 SHA256 ca3419bbf7a93176cb2c97dc66a5f57d261735b484ec4299e47a1a332ac85b98
+AUX create-comp-config.patch 1778 RMD160 d7db830813d2f5cf3df8fbda3329ab0addac54be SHA1 c655f7bb3395a21547ab224fc758118fce623cc7 SHA256 c387e155312f08e82b8c5a75e79cf252d170512d28e07a4cae30a5b2e096d2cb
+AUX probe_linux.patch 1074 RMD160 682b84d3d177a2f9af90ed87e834763a97392de9 SHA1 cade04ece40991bf0698daac857f5e70e2edae33 SHA256 346e16ad5f3819cb810e3ee58c5e075e7ca885ce1feb30d59bcf8267ed9a9560
 DIST ccc-6.5.9.001-6.alpha.rpm 7160915 RMD160 3a03914049ca21f4dc030661eafa28aa6015aa34 SHA1 e8a80726d50477e028a382360311e6f0ac8b4e25 SHA256 019aa8d24cf1d70a63851847824cd6afe7aabfaf8f00daba7ee7eb8645fa6ace
-EBUILD ccc-6.5.9.001.ebuild 4141 RMD160 b80846b29854b8f1674ff7327ebf074c9a0bc0e5 SHA1 e64ecc53e42ec10f2d54c904c89e255b7e824102 SHA256 6c4c5f9c2a797090547332f95644c27e82333b248024962ce73be0629b9b9a00
+EBUILD ccc-6.5.9.001.ebuild 4183 RMD160 6c1ca4a1fc59bf869d5387377d069b744ed5a922 SHA1 aa98e7dd71e18afa95ad6b76a70c4310655bcc40 SHA256 514d90469918c8dde4f77fe2ff26a76424af810a20795234f07066fa75e7c807
diff --git a/dev-lang/ccc/ccc-6.5.9.001.ebuild b/dev-lang/ccc/ccc-6.5.9.001.ebuild
index 5a5a8cf..902d162 100644
--- a/dev-lang/ccc/ccc-6.5.9.001.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001.ebuild
@@ -48,8 +48,8 @@ src_unpack() {
 
 	# patch up config script to sort gcc-lib paths last.  Thanks to
 	# Marc Giger for sorting this out
-	epatch ${FILESDIR}/update-config.patch
-
+	epatch ${FILESDIR}/create-comp-config.patch
+	epatch ${FILESDIR}/probe_linux.patch
 	# remove unwanted documentation
 	if ! use doc; then
 		einfo "Removing unwanted documentation (USE=\"-doc\")..."
diff --git a/dev-lang/ccc/files/update-config.patch b/dev-lang/ccc/files/create-comp-config.patch
index 6733307..9da9ace 100644
--- a/dev-lang/ccc/files/update-config.patch
+++ b/dev-lang/ccc/files/create-comp-config.patch
@@ -1,6 +1,6 @@
 diff -u old/create-comp-config.sh new/create-comp-config.sh
---- old/create-comp-config.sh	2008-04-13 16:27:32.000000000 -0400
-+++ new/create-comp-config.sh	2008-04-13 16:24:57.000000000 -0400
+--- usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/create-comp-config.sh.old	2008-04-13 16:27:32.000000000 -0400
+--- usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/create-comp-config.sh	2008-04-13 16:24:57.000000000 -0400
 @@ -342,10 +342,10 @@
    fi
  fi
@@ -44,40 +44,3 @@ diff -u old/create-comp-config.sh new/create-comp-config.sh
  
  # Get the name of the linker command (ld or collect2), and library directories
  # by examining the way gcc invoked the linker
-diff -u old/probe_linux.sh new/probe_linux.sh
---- old/probe_linux.sh	2008-04-13 16:27:32.000000000 -0400
-+++ new/probe_linux.sh	2008-04-13 16:24:18.000000000 -0400
-@@ -203,6 +203,8 @@
-      DIST_OS="Linux"
-      if [ -r /etc/kondara-release ]; then
-        DIST_VENDOR="kondara"
-+     elif [ -r /etc/gentoo-release ]; then
-+       DIST_VENDOR="gentoo"
-      elif [ -r /etc/redhat-release ]; then
-        DIST_VENDOR="rh"
-      elif [ -r /etc/SuSE-release ]; then
-@@ -249,13 +251,7 @@
- 
- probe_gcc()
- {
--    specs=`gcc -v 2>&1 | sed -n -e 's|^[^/]*\(/[^ ]*/specs\).*$|\1|p'`
--
--    if [ ! -r $specs ]; then
--      GCC_PATH="Unknown GCC"
--    else
--      GCC_PATH=`dirname $specs`
--    fi
-+    GCC_PATH=`gcc-config --get-lib-path`
- }
- 
- probe_libc()
-@@ -326,7 +322,8 @@
- # TASO will return "YES", "NO", or "an error string"
- #
-   TASO="YES"
--
-+TASO="NO"
-+return
-   if [ "$DIST_OS" = "Linux" ]; then
-     # Does ld claim to support taso?
-     if [ "`ld --help | grep taso`" = "" ]; then
diff --git a/dev-lang/ccc/files/probe_linux.patch b/dev-lang/ccc/files/probe_linux.patch
new file mode 100644
index 0000000..8b08912
--- /dev/null
+++ b/dev-lang/ccc/files/probe_linux.patch
@@ -0,0 +1,37 @@
+diff -u old/probe_linux.sh new/probe_linux.sh
+--- usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/probe_linux.sh.old	2008-04-13 16:27:32.000000000 -0400
++++ usr/lib/compaq/ccc-6.5.9.001-6/alpha-linux/bin/probe_linux.sh	2008-04-13 16:24:18.000000000 -0400
+@@ -203,6 +203,8 @@
+      DIST_OS="Linux"
+      if [ -r /etc/kondara-release ]; then
+        DIST_VENDOR="kondara"
++     elif [ -r /etc/gentoo-release ]; then
++       DIST_VENDOR="gentoo"
+      elif [ -r /etc/redhat-release ]; then
+        DIST_VENDOR="rh"
+      elif [ -r /etc/SuSE-release ]; then
+@@ -249,13 +251,7 @@
+ 
+ probe_gcc()
+ {
+-    specs=`gcc -v 2>&1 | sed -n -e 's|^[^/]*\(/[^ ]*/specs\).*$|\1|p'`
+-
+-    if [ ! -r $specs ]; then
+-      GCC_PATH="Unknown GCC"
+-    else
+-      GCC_PATH=`dirname $specs`
+-    fi
++    GCC_PATH=`gcc-config --get-lib-path`
+ }
+ 
+ probe_libc()
+@@ -326,7 +322,8 @@
+ # TASO will return "YES", "NO", or "an error string"
+ #
+   TASO="YES"
+-
++TASO="NO"
++return
+   if [ "$DIST_OS" = "Linux" ]; then
+     # Does ld claim to support taso?
+     if [ "`ld --help | grep taso`" = "" ]; then