3 files changed, 50 insertions, 26 deletions
diff --git a/development/eagle/README b/development/eagle/README
index c093a1c7d1..21a490f7b4 100644
--- a/development/eagle/README
+++ b/development/eagle/README
@@ -18,6 +18,6 @@ This script installs the English documentation. With version 5.10.0
 German and (some) Chinese documentation is included as well. To select
 them, run this script as:
 
-  # LANG=<xx> ./eagle.SlackBuild
+  # DOC_LANG=<xx> ./eagle.SlackBuild
 
-where <xx> = "de" for German and "zh" for Chinese.
+where <xx> = "de" for German, "zh" for Chinese, or "all".
diff --git a/development/eagle/eagle.SlackBuild b/development/eagle/eagle.SlackBuild
index 74ae617eee..2cff859db2 100644
--- a/development/eagle/eagle.SlackBuild
+++ b/development/eagle/eagle.SlackBuild
@@ -24,33 +24,33 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eagle
-VERSION=${VERSION:-7.2.0}
+VERSION=${VERSION:-7.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=i486
+
+ARCH=${ARCH:-$(uname -m)}
+case $ARCH in
+  i?86)   PLATFORM=lin32; ARCH=i686 ;;
+  x86_64) PLATFORM=lin64 ;;
+  *)      echo "$ARCH is unsupported."; exit 1 ;;
+esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Documentation is distributed for English, German and Chinese.  Due to the size
-# of the documentation, only include one language.
-LANG=${LANG:-"en"}
-if [ "$LANG" = "de" ]; then
-  DOCS="README_de UPDATE_de library_de.txt license_de.txt manual_de.pdf tutorial_de.pdf eagle.dtd connect-device-split-symbol-de.pdf generate-3d-idf-data_de.pdf make-symbol-device-package-bsdl-2011-de.pdf elektro-tutorial.pdf"
-elif [ "$LANG" = "zh" ]; then
-  DOCS="README_en UPDATE_en library_en.txt license_en.txt manual_zh.pdf tutorial_zh.pdf eagle.dtd"
-else
-  DOCS="README_en UPDATE_en library_en.txt license_en.txt manual_en.pdf tutorial_en.pdf eagle.dtd connect-device-split-symbol-en.pdf generate-3d-idf-data_en.pdf make-symbol-device-package-bsdl-2011-en.pdf EagleIDFExporterInstructions.pdf layer-setup_designrules.pdf"
-fi
+# Documentation is distributed for English, German and Chinese.
+# Due to the size of the documentation, only include one language.
+DOC_LANG=${DOC_LANG:-en}  # one of "all", "de", "en", or "zh"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-sh $CWD/$PRGNAM-lin-$VERSION.run $PKG/opt
+sh $CWD/$PRGNAM-$PLATFORM-$VERSION.run $PKG/opt
 chown -R root:root $PKG
+chmod -R u+w,go-w,a+rX-st $PKG
 
 # Create the license key file.  EAGLE will write to this the first time it is
 # run.  After that, you can change the permissions to 0644 if you wish.
@@ -73,14 +73,38 @@ mkdir -p $PKG/usr/man/man1
 mv $PKG/opt/$PRGNAM-$VERSION/doc/*.1 $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} +
 
+if [ ${DOC_LANG} != "all" ]; then
+  # Move each language-specific file to its own subdir.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc
+  for lang in de en zh; do mkdir -p ${lang}/ulp; done
+  for lang in de en;    do mv README_${lang} ${lang}/README; done
+  for lang in de en;    do mv UPDATE_${lang} ${lang}/UPDATE; done
+  for lang in de en;    do mv library_${lang}.txt ${lang}/library.txt; done
+  for lang in de en;    do mv license_${lang}.txt ${lang}/license.txt; done
+  for lang in de en zh; do mv manual_${lang}.pdf ${lang}/manual.pdf; done
+  for lang in de en zh; do mv tutorial_${lang}.pdf ${lang}/tutorial.pdf; done
+  for lang in de en;    do mv ulp/connect-device-split-symbol-${lang}.pdf ${lang}/ulp/connect-device-split-symbol.pdf; done
+  for lang in de en;    do mv ulp/generate-3d-idf-data_${lang}.pdf ${lang}/ulp/generate-3d-idf-data.pdf; done
+  for lang in de en;    do mv ulp/make-symbol-device-package-bsdl-2011-${lang}.pdf ${lang}/ulp/make-symbol-device-package-bsdl-2011.pdf; done
+
+  # Prefer the English docs as a base set.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc/en
+  find . -type f -exec mv {} ../{} \;
+
+  # Replace the base set with other languages.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc/${DOC_LANG}
+  find . -type f -exec mv {} ../{} \;
+
+  # Delete all alternate language files.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc
+  for lang in de en zh; do rm -rf ${lang}; done
+fi
+
 # Move the documentation to the proper location
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc
+mv $PKG/opt/$PRGNAM-$VERSION/doc $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s /usr/doc/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cd $PKG/opt/$PRGNAM-$VERSION
-for d in $DOCS; do mv doc/$d $PKG/usr/doc/$PRGNAM-$VERSION/; done
-  rm -rf doc
-  ln -s /usr/doc/$PRGNAM-$VERSION doc
-cd -
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/eagle/eagle.info b/development/eagle/eagle.info
index 10bd04ad62..e0e803b43e 100644
--- a/development/eagle/eagle.info
+++ b/development/eagle/eagle.info
@@ -1,10 +1,10 @@
 PRGNAM="eagle"
-VERSION="7.2.0"
+VERSION="7.4.0"
 HOMEPAGE="http://www.cadsoft.de/"
-DOWNLOAD="http://web.cadsoft.de/ftp/eagle/program/7.2/eagle-lin-7.2.0.run"
-MD5SUM="31abdc995fe39946cb4624716966f1c7"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64="UNSUPPORTED"
+DOWNLOAD="http://web.cadsoft.de/ftp/eagle/program/7.4/eagle-lin32-7.4.0.run"
+MD5SUM="d22c972a77e43ffde527695a61aaf68c"
+DOWNLOAD_x86_64="http://web.cadsoft.de/ftp/eagle/program/7.4/eagle-lin64-7.4.0.run"
+MD5SUM_x86_64="52b527c9fb0c91652f0cd2d721749958"
 REQUIRES=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"