ada: now part of unified gcc spell, this is now a transitional package so that spells can be moved over to the sub depends stuff

7 files changed, 16 insertions, 131 deletions

diff --git a/gnu/ada/BUILD b/gnu/ada/BUILD
index f632968314..27ba77ddaf 100755
--- a/gnu/ada/BUILD
+++ b/gnu/ada/BUILD
@@ -1,44 +1 @@
-# take multilib option from GCC
-# ignore return value as it is only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-# setup bootstrap ada compiler
-ADA_PATH=${SOURCE3/.tar.bz2/}                   &&
-PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH  &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-export          CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gnatgcc"                      &&
-export INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.2/include"  &&
-export     LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.2/"         &&
-export     LDFLAGS="-L${LIB_DIR}"
-
-export    LIBRARY_PATH="$LIB_DIR"                             &&
-export LD_LIBRARY_PATH="$LIB_DIR"                             &&
-export   COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin"  &&
-
-export ADA_OBJECTS_PATH="$LIB_DIR/adalib"      &&
-export ADA_INCLUDE_PATH="$LIB_DIR/adainclude"  &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --program-prefix=gnat                         \
-             --enable-libada                               \
-             --enable-languages="c,ada"                    \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"  \
-     bootstrap
+true
diff --git a/gnu/ada/DEPENDS b/gnu/ada/DEPENDS
index a1d2c84bff..4251501913 100755
--- a/gnu/ada/DEPENDS
+++ b/gnu/ada/DEPENDS
@@ -1,9 +1 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc  &&
-if  [[  $VERSION != $(installed_version gcc) ]]; then
-  force_depends  gcc
-fi &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends -sub ADA gcc
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index b9359611d0..e4130fd508 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,41 +1,12 @@
            SPELL=ada
          VERSION=4.3.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-         SOURCE2=gcc-$SPELL-$VERSION.tar.gz
-     SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-if    [[  "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
-         SOURCE3=gnat-4.3.3-i686-pc-linux-gnu.tar.bz2
-elif  [[  "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
-then
-         SOURCE3=gnat-4.3.0-x86_64-pc-linux-gnu.tar.bz2
-else
-         SOURCE3=gnat-4.3.3-i686-pc-linux-gnu.tar.bz2
-fi
-  SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3
-     SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:VERIFIED_UPSTREAM_KEY"
-         SOURCE4=$SOURCE3.sig
-  SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
-  SOURCE4_IGNORE=signature
-#upstream signatures
-         SOURCE5=$SOURCE.sig
-  SOURCE5_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE5_IGNORE=signature
-         SOURCE6=$SOURCE2.sig
-  SOURCE6_URL[0]=${SOURCE2_URL[0]}.sig
-  SOURCE6_IGNORE=signature
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
-         ENTERED=20050213
+         ENTERED=20040704
             DOCS="$DOCS INSTALL"
         KEYWORDS="compiler"
-           SHORT="the GNU Ada Translator"
+           SHORT="the GNU c++ compiler"
 cat << EOF
-The GNU Ada Translator and Ada95 runtime library.
+The GNU C++ compiler and runtime library.
 EOF
+
diff --git a/gnu/ada/FINAL b/gnu/ada/FINAL
deleted file mode 100755
index 907a1a0f9f..0000000000
--- a/gnu/ada/FINAL
+++ /dev/null
@@ -1 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index a343d4acb4..558e94dcf5 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,3 +1,11 @@
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* BUILD: do nothing
+	* DEPENDS: sub depend on gcc with ada
+	* DETAILS: no more sources
+	* INSTALL: do nothing
+	* PRE_BUILD: do nothing
+	* FINAL: removed
+
 2009-03-30 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated Ada i686 bootstrap to 4.3.3
 
diff --git a/gnu/ada/INSTALL b/gnu/ada/INSTALL
index 32b9891fa7..27ba77ddaf 100755
--- a/gnu/ada/INSTALL
+++ b/gnu/ada/INSTALL
@@ -1,7 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make -C gcc install lang.install-common lang.install-man  &&
-install -c gcc/gnat1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/
+true
diff --git a/gnu/ada/PRE_BUILD b/gnu/ada/PRE_BUILD
index 55467be3ab..27ba77ddaf 100755
--- a/gnu/ada/PRE_BUILD
+++ b/gnu/ada/PRE_BUILD
@@ -1,37 +1 @@
-if [ "$(installed_version gcc)" != "$VERSION" ]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi
-
-default_pre_build                     &&
-cd $BUILD_DIRECTORY                   &&
-unpack_file 2                         &&
-cd $SOURCE_DIRECTORY                  &&
-mkdir ${SOURCE3/.tar.bz2/}            &&
-cd  ${SOURCE3/.tar.bz2/}              &&
-unpack_file 3                         &&
-mk_source_dir  $SOURCE_DIRECTORY.bld  &&
-
-#
-# This section is used to build a gnat bootstrap cache
-#
-touch  $SOURCE_DIRECTORY/gcc/cstamp-h.in       &&
-touch  $SOURCE_DIRECTORY/gcc/ada/[es]info.h    &&
-touch  $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs]  &&
-
-#
-# Set the compiler name to gnatgcc
-#
-for file in `find $SOURCE_DIRECTORY/gcc/ada/ -name '*.ad[sb]'`
-do
-  sedit "s:\"gcc\":\"gnatgcc\":g" $file
-done  &&
-
-sedit 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):'    \
-       $SOURCE_DIRECTORY/gcc/ada/makegpr.adb      &&
-sedit 's:and Nam is "gnatgcc":and Nam is "gcc":'  \
-       $SOURCE_DIRECTORY/gcc/ada/osint.ads
-#
-# End Ada bootstrap cache code
-#
+true