9 files changed, 152 insertions, 173 deletions
diff --git a/multimedia/GoogleEarth/GoogleEarth.SlackBuild b/multimedia/GoogleEarth/GoogleEarth.SlackBuild
deleted file mode 100644
index fe74a330825c1..0000000000000
--- a/multimedia/GoogleEarth/GoogleEarth.SlackBuild
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for google-earth
-
-# Copyright 2007-2011  Michiel van Wessem, Manchester, United Kingdom
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Thanks to rworkman for the additional code and script cleanups
-# and to Daniel de Kok and Alan_Hicks for their comments.
-
-PRGNAM=GoogleEarth
-VERSION=${VERSION:-6.0.3.2197}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# No flags/configure needed as it is just a binary repackaging.
-ARCH=i486
-
-set -e # Exit on most errors.
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-sh $CWD/${PRGNAM}Linux.bin --noexec --target $PKG/opt/$PRGNAM ; sync
-cd $PKG/opt/$PRGNAM
-  tar xf googleearth-data.tar
-  tar xf googleearth-linux-x86.tar
-  rm googleearth-data.tar googleearth-linux-x86.tar
-cd -
-
-# Set the ownership and permissions correctly
-cd $PKG
-chown -R root:root . 
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-# Sadly, Google has some inconsistent permissions for normal files;
-# this should deal with them rather nicely.
-find . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) \
-  -exec chmod 0644 {} \;
-
-mv $PKG/opt/$PRGNAM/bin/googleearth $PKG/opt/$PRGNAM
-rmdir $PKG/opt/$PRGNAM/bin
-
-#find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-#  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Let's use the information from the included postinstall.sh
-# script to create menu entry and mime stuff
-DESKTOPFILE=$PKG/usr/share/applications/GoogleEarth.desktop
-MIMEFILE=$PKG/usr/share/mime/googleearth-mimetypes.xml
-mkdir -p $PKG/usr/share/{applications,mime,pixmaps} $PKG/usr/bin
-
-cat > $DESKTOPFILE << EOF
-[Desktop Entry]
-Name=Google Earth
-GenericName=3D planet viewer
-Comment=Explore, search, and discover the planet
-Exec=googleearth %f
-Terminal=false
-MultipleArgs=false
-Type=Application
-Icon=googleearth-icon
-Categories=Network;
-MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole;
-
-EOF
-cat > $MIMEFILE << EOF
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="application/vnd.google-earth.kml+xml">
-    <comment>Keyhole Markup Language data</comment>
-    <glob pattern="*.kml"/>
-  </mime-type>
-
-  <mime-type type="application/vnd.google-earth.kmz">
-    <comment>Keyhole Markup Language archive</comment>
-    <glob pattern="*.kmz"/>
-  </mime-type>
-
-  <mime-type type="application/keyhole">
-    <comment>Keyhole Markup Language data</comment>
-  </mime-type>
-
-  <mime-type type="application/earthviewer">
-    <comment>Keyhole Markup Language data</comment>
-  </mime-type>
-</mime-info>
-
-EOF
-
-# Let's take care of documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/opt/$PRGNAM/{README.linux,gpl.txt} $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# Make some needed symlinks in the package
-cd $PKG/usr/share/pixmaps
-  ln -s /opt/$PRGNAM/googleearth-icon.png .
-  ln -s /opt/$PRGNAM/googleearth.xpm .
-  cd $PKG/usr/bin 
-  ln -s /opt/$PRGNAM/googleearth .
-cd -
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-# Clean up files that we no longer need.
-rm $PKG/opt/$PRGNAM/{preuninstall,setup,postinstall}.sh
-rm -rf $PKG/opt/$PRGNAM/setup.data
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/GoogleEarth/GoogleEarth.info b/multimedia/GoogleEarth/GoogleEarth.info
deleted file mode 100644
index 1a10daac93b96..0000000000000
--- a/multimedia/GoogleEarth/GoogleEarth.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="GoogleEarth"
-VERSION="6.0.3.2197"
-HOMEPAGE="http://earth.google.com"
-DOWNLOAD="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin"
-MD5SUM="6808153226b99f21a66f5f615fcf7051"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
diff --git a/multimedia/GoogleEarth/slack-desc b/multimedia/GoogleEarth/slack-desc
deleted file mode 100644
index 839beddfae016..0000000000000
--- a/multimedia/GoogleEarth/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-GoogleEarth: GoogleEarth (Google's famous virtual globe)
-GoogleEarth:
-GoogleEarth: Google Earth is a virtual globe program. It maps a version of the
-GoogleEarth: Earth by the superimposition of images obtained from satellite 
-GoogleEarth: imagery, aerial photography and GIS over a 3D globe. You point 
-GoogleEarth: and zoom to any place on the planet that you want to explore.
-GoogleEarth: Satellite images and local facts zoom into view. 
-GoogleEarth:
-GoogleEarth: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-GoogleEarth: If GoogleEarth fails to run, first consult the NOTES in the README.
-GoogleEarth: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/multimedia/GoogleEarth/README b/multimedia/google-earth/README
index b87f14f6383d1..da8ba961955b8 100644
--- a/multimedia/GoogleEarth/README
+++ b/multimedia/google-earth/README
@@ -1,4 +1,4 @@
-GoogleEarth (Google's famous virtual globe)
+google-earth (Google's famous virtual globe)
 
 Google Earth is a virtual globe program. It maps a version of the
 Earth by the superimposition of images obtained from satellite 
@@ -18,7 +18,7 @@ message stating that it is unable to find the Bitstream Vera fonts.
 This should be safe to ignore - it will use other fonts (and the
 DejaVu fonts included with Slackware are based on the Bitstream fonts).
 
-NOTEs:
+NOTES:
 1) Google updates the GoogleEarth bin-file without changing the download
    link location and they don't use version numbering in the filename 
    (the version is more an internal numbering).  
@@ -28,18 +28,27 @@ NOTEs:
    of GoogleEarth than what the script is designed to use. Please notify 
    the maintainer if this is the case.
 
-2) Google Earth 6 is "LSB compliant" meaning it was built on a LSB system. 
+2) Google Earth 7 is "LSB compliant" meaning it was built on a LSB system. 
    Slackware however does not have that symlink which is part of the LSB 3.0 
    specification. You'll need to create the symlink manually after installing 
    the package:
     
             ln -sf /lib/ld-linux.so.2 /lib/ld-lsb.so.3
 
-3) GoogleEarth is a 32bit application only. You need to have the 32bit
+3) Google Earth tends to crash when the 65-fonts-persion.conf is available on 
+   the system. aPlease remove /etc/fonts/conf.d/65-fonts-persian.conf prior 
+   launching this application. The easiest way to do this is:
+
+            mv /etc/fonts/conf.d/65-fonts-persian.conf \
+               /etc/fonts/conf.d/65-fonts-persian.conf.old
+
+4) GoogleEarth is a 32bit application only. You need to have the 32bit
    compatibility packages installed to have this work on a 64bit system. 
-   Otherwise you'll just see "no such file or directory" errors.
+   Otherwise you'll just see "no such file or directory" errors. I am aware 
+   that Google puts a 64bits debian package out, but this is a 32bits package
+   with a 64bit wrapper for debian that installs multilib
 
-4) GoogleEarth now requires that you have OpenGL drivers installed on your 
+5) GoogleEarth now requires that you have OpenGL drivers installed on your 
    system (and Xorg configured to use them). Not doing so will cause X 
    to crash.
 
diff --git a/multimedia/GoogleEarth/doinst.sh b/multimedia/google-earth/doinst.sh
index acbb07fe3d1aa..acbb07fe3d1aa 100644
--- a/multimedia/GoogleEarth/doinst.sh
+++ b/multimedia/google-earth/doinst.sh
diff --git a/multimedia/google-earth/google-earth-mimetypes.xml b/multimedia/google-earth/google-earth-mimetypes.xml
new file mode 100644
index 0000000000000..8850ee973e799
--- /dev/null
+++ b/multimedia/google-earth/google-earth-mimetypes.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/vnd.google-earth.kml+xml">
+    <comment>Keyhole Markup Language data</comment>
+    <glob pattern="*.kml"/>
+  </mime-type>
+
+  <mime-type type="application/vnd.google-earth.kmz">
+    <comment>Keyhole Markup Language archive</comment>
+    <glob pattern="*.kmz"/>
+  </mime-type>
+
+  <mime-type type="application/keyhole">
+    <comment>Keyhole Markup Language data</comment>
+  </mime-type>
+
+  <mime-type type="application/earthviewer">
+    <comment>Keyhole Markup Language data</comment>
+  </mime-type>
+</mime-info>
diff --git a/multimedia/google-earth/google-earth.SlackBuild b/multimedia/google-earth/google-earth.SlackBuild
new file mode 100644
index 0000000000000..7d48e3eb5920e
--- /dev/null
+++ b/multimedia/google-earth/google-earth.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for google-earth
+
+# Copyright 2007-2013  Michiel van Wessem, Manchester, United Kingdom
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 2013 - A lot of thanks to Willy Sudiarto Raharjo for his input and help 
+# with converting the script to work with googles .deb packages.
+
+# Thanks to rworkman for the additional code and script cleanups
+# and to Daniel de Kok and Alan_Hicks for their comments.
+
+PRGNAM=google-earth
+VERSION="7.0.3.8542"
+ARCH=i386			# Since this is the arch google dictates
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# No flags/configure needed as it is just a binary repackaging.
+set -e # Exit on most errors.
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/google-earth-stable_current_i386.deb data.tar.lzma | lzma -d | tar xv
+cd $PKG
+chown -R root:root . 
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Sadly (by lack of politer word), Google has some inconsistent permissions 
+# for normal files; this should deal with them rather nicely.
+find . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) -exec chmod 0644 {} \;
+
+# Install a .desktop launcher:
+mv $PKG/opt/google/earth/free/google-earth.desktop $PKG/usr/share/applications/google-earth.desktop
+
+# Copy icons to /usr/share/icons
+for icon in 16 22 24 32 48 64 128 256; do
+  install -D $PKG/opt/google/earth/free/product_logo_${icon}.png \
+    $PKG/usr/share/icons/hicolor/${icon}x${icon}/apps/googleearth.png
+done
+
+# Install mimetypes
+mkdir -p $PKG/usr/share/mime/packages/
+cat $CWD/google-earth-mimetypes.xml > $PKG/usr/share/mime/packages/$PKGNAM-mimetypes.xml
+
+# Let's take care of documentation
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/google/earth/free/gpl.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Clean up cruft/unneeded directories.The cron job in /etc is for Debian/Ubuntu only:
+rm -rf $PKG/etc			
+rm -rf $PKG/usr/share/{man,menu,gnome-control-center}
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/google-earth/google-earth.info b/multimedia/google-earth/google-earth.info
new file mode 100644
index 0000000000000..a79982ea24e24
--- /dev/null
+++ b/multimedia/google-earth/google-earth.info
@@ -0,0 +1,10 @@
+PRGNAM="google-earth"
+VERSION="7.0.3.8542"
+HOMEPAGE="http://www.google.com/earth/index.html"
+DOWNLOAD="http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb"
+MD5SUM="5c0925682acfd90ff93ca91c5fd37254"
+DOWNLOAD_x86_64="UNSUPPORTED"
+MD5SUM_x86_64=""
+MAINTAINER="Michiel van Wessem"
+EMAIL="michiel@slackbuilds.org"
+REQUIRES=""
diff --git a/multimedia/google-earth/slack-desc b/multimedia/google-earth/slack-desc
new file mode 100644
index 0000000000000..8e8c389ee21ef
--- /dev/null
+++ b/multimedia/google-earth/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+google-earth: google-earth (Google's famous virtual globe)
+google-earth:
+google-earth: Google Earth is a virtual globe program. It maps a version of the
+google-earth: Earth by the superimposition of images obtained from satellite 
+google-earth: imagery, aerial photography and GIS over a 3D globe. You point 
+google-earth: and zoom to any place on the planet that you want to explore.
+google-earth: Satellite images and local facts zoom into view. 
+google-earth:
+google-earth: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+google-earth: If google-earth fails to run, first consult the NOTES in the README.
+google-earth: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!