development/eric: Updated for version 4.5.4.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

7 files changed, 25 insertions, 27 deletions

diff --git a/development/eric/README b/development/eric/README
index 8ba5401f94..c7f1329639 100644
--- a/development/eric/README
+++ b/development/eric/README
@@ -1,11 +1,7 @@
-Eric is a full featured Python and Ruby editor and IDE, written in python. It 
-is based on the cross platform Qt gui toolkit, integrating the highly flexible 
-Scintilla editor control. It is designed to be usable as everdays' quick and 
-dirty editor as well as being usable as a professional project management tool 
-integrating many advanced features Python offers the professional coder. eric4 
-includes a plugin system, which allows easy extension of the IDE functionality 
+Eric is a full featured Python and Ruby editor and IDE, written in python. It
+is based on the cross platform Qt gui toolkit, integrating the highly flexible
+Scintilla editor control. It is designed to be usable as everdays' quick and
+dirty editor as well as being usable as a professional project management tool
+integrating many advanced features Python offers the professional coder. eric4
+includes a plugin system, which allows easy extension of the IDE functionality
 with plugins downloadable from the net.
-
-homepage:
-http://eric-ide.python-projects.org/
-
diff --git a/development/eric/doinst.sh b/development/eric/doinst.sh
index 392c12adb9..5fb28930db 100644
--- a/development/eric/doinst.sh
+++ b/development/eric/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/development/eric/eric.SlackBuild b/development/eric/eric.SlackBuild
index 662e60fbd7..ce4f5778c5 100644
--- a/development/eric/eric.SlackBuild
+++ b/development/eric/eric.SlackBuild
@@ -20,20 +20,18 @@
 # 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.
-#
-# Modified by the SlackBuilds.org project.
 
 PRGNAM=eric
-VERSION=4.4.8
+VERSION=${VERSION:-4.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
+LANGUAGE=${LANGUAGE:-en}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -63,7 +61,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}4-$VERSION
-tar -xzvf $CWD/${PRGNAM}4-$VERSION.tar.gz
+tar -xvf $CWD/${PRGNAM}4-$VERSION.tar.gz
+tar -xvf $CWD/${PRGNAM}4-i18n-${LANGUAGE}-$VERSION.tar.gz
 cd ${PRGNAM}4-$VERSION
 
 chown -R root:root .
@@ -83,6 +82,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/usr/share/applications
 sed s/lib/lib${LIBDIRSUFFIX}/ $CWD/eric4.desktop \
   > $PKG/usr/share/applications/eric4.desktop
+cp $CWD/eric4.png /$PKG/usr/lib$LIBDIRSUFFIX/python2.6/site-packages/eric4/pixmaps/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -90,3 +90,4 @@ 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/development/eric/eric.info b/development/eric/eric.info
index 0d449652b4..61ad1061d4 100644
--- a/development/eric/eric.info
+++ b/development/eric/eric.info
@@ -1,10 +1,12 @@
 PRGNAM="eric"
-VERSION="4.4.8"
+VERSION="4.5.4"
 HOMEPAGE="http://eric-ide.python-projects.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/eric-ide/eric4/stable/4.4.8/eric4-4.4.8.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/eric-ide/eric4/stable/4.5.4/eric4-4.5.4.tar.gz \
+          http://downloads.sourceforge.net/project/eric-ide/eric4/stable/4.5.4/eric4-i18n-en-4.5.4.tar.gz"
 DOWNLOAD_x86_64=""
-MD5SUM="8cf8d2811e5635eaf9520d92be4806cb"
+MD5SUM="7c9f1555cc58e7fb128a5c7b11889dc6 \
+        e4f07b90426f6404956cd87b7462da91"
 MD5SUM_x86_64=""
 MAINTAINER="Rudson Alves"
 EMAIL="alves@rra.etc.br"
-APPROVED="michiel"
+APPROVED="dsomero"
diff --git a/development/eric/eric4.desktop b/development/eric/eric4.desktop
index c15bfd18b6..6b27433197 100644
--- a/development/eric/eric4.desktop
+++ b/development/eric/eric4.desktop
@@ -2,8 +2,8 @@
 Type=Application
 Exec=eric4 %u
 MimeType=application/py;
-Icon=/usr/lib/python2.6/site-packages/eric4/pixmaps/eric.ico
+Icon=/usr/lib/python2.6/site-packages/eric4/pixmaps/eric4.png
 Terminal=false
 Categories=Qt;KDE;Development;IDE;
-Name=Eric4 IDE for Python
+Name=Eric4
 Comment=Eric4 IDE for Python
diff --git a/development/eric/eric4.png b/development/eric/eric4.png
new file mode 100644
index 0000000000..42ba58b085
--- /dev/null
+++ b/development/eric/eric4.png
diff --git a/development/eric/slack-desc b/development/eric/slack-desc
index 8ca0656f72..3584738093 100644
--- a/development/eric/slack-desc
+++ b/development/eric/slack-desc
@@ -7,14 +7,14 @@
 
     |-----handy-ruler------------------------------------------------------|
 eric: Eric (Eric is a full featured Python and Ruby editor and IDE)
-eric: 
+eric:
 eric: Eric is a full featured Python and Ruby editor and IDE, written in
 eric: python. It is based on the cross platform Qt gui toolkit, integrating
 eric: the highly flexible Scintilla editor control. It is designed to be
 eric: usable as everdays' quick and dirty editor as well as being usable as
 eric: a professional project management tool integrating many advanced
-eric: features Python offers the professional coder. 
+eric: features Python offers the professional coder.
 eric:
-eric: Homepage: http://eric-ide.python-projects.org/
+eric: http://eric-ide.python-projects.org/
 eric: