academic/gcompris: Updated for version 12.05.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 14 insertions, 330 deletions

diff --git a/academic/gcompris/gcompris.SlackBuild b/academic/gcompris/gcompris.SlackBuild
index 9201ebcdcc44..0aa6211e04f8 100644
--- a/academic/gcompris/gcompris.SlackBuild
+++ b/academic/gcompris/gcompris.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
-# A slackbuild script to build gCompris-8.4.12
 
-# Copyright (c) 2009, Paul Liconti
+# Slackware build script for gcompris
 
+# Copyright (c) 2009, Paul Liconti
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without modification,
@@ -16,24 +16,20 @@
 # 
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR
-# CONTRIBUTORS 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
+# OWNER OR CONTRIBUTORS 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.
-#
+
 # Modified by SlackBuilds.org
 
 PRGNAM=gcompris
-VERSION=8.4.12
+VERSION=${VERSION:-12.05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -81,8 +77,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p0 < $CWD/python-sqlite3.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -101,16 +95,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-  cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL README TODO docs \
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO docs \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/gcompris/gcompris.info b/academic/gcompris/gcompris.info
index 5f79c44c845f..3f8da12340fd 100644
--- a/academic/gcompris/gcompris.info
+++ b/academic/gcompris/gcompris.info
@@ -1,8 +1,8 @@
 PRGNAM="gcompris"
-VERSION="8.4.12"
+VERSION="12.05"
 HOMEPAGE="http://gcompris.net/"
-DOWNLOAD="http://downloads.sourceforge.net/gcompris/gcompris-8.4.12.tar.gz"
-MD5SUM="8a1519e71caa0924d5df73faa311eea3"
+DOWNLOAD="http://downloads.sourceforge.net/gcompris/gcompris-12.05.tar.bz2"
+MD5SUM="a05c9263120b4de16bf146e8750d57e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnet"
diff --git a/academic/gcompris/python-sqlite3.patch b/academic/gcompris/python-sqlite3.patch
deleted file mode 100644
index 4d727cc08845..000000000000
--- a/academic/gcompris/python-sqlite3.patch
+++ /dev/null
@@ -1,302 +0,0 @@
---- configure	2009-03-29 06:39:51.000000000 -0400
-+++ configure	2009-04-19 17:38:50.000000000 -0400
-@@ -19578,7 +19578,7 @@
- prog="
- import sys
- try:
--        import pysqlite2
-+        import sqlite3 as sqlite
- except ImportError:
-         sys.exit(1)
- except:
---- src/boards/python/admin/module_users.py
-+++ src/boards/python/admin/module_users.py
-@@ -26,7 +26,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import module
- import class_list
---- src/boards/python/admin/class_edit.py
-+++ src/boards/python/admin/class_edit.py
-@@ -23,7 +23,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import user_list
- 
---- src/boards/python/admin/class_list.py
-+++ src/boards/python/admin/class_list.py
-@@ -26,7 +26,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import constants
- 
---- src/boards/python/admin/module_boards.py
-+++ src/boards/python/admin/module_boards.py
-@@ -27,7 +27,13 @@
- import sys;
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import module
- import board_list
---- src/boards/python/admin/user_edit.py
-+++ src/boards/python/admin/user_edit.py
-@@ -23,7 +23,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import user_list
- 
---- src/boards/python/admin/group_list.py
-+++ src/boards/python/admin/group_list.py
-@@ -26,7 +26,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import group_user_list
- import group_edit
---- src/boards/python/admin/profile_list.py
-+++ src/boards/python/admin/profile_list.py
-@@ -26,7 +26,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import profile_group_list
- import profile_edit
---- src/boards/python/admin/log_list.py
-+++ src/boards/python/admin/log_list.py
-@@ -27,7 +27,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import constants
- 
---- src/boards/python/admin/profile_group_list.py
-+++ src/boards/python/admin/profile_group_list.py
-@@ -28,7 +28,13 @@
- import constants
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- #import group_edit
- 
---- src/boards/python/admin/profile_edit.py
-+++ src/boards/python/admin/profile_edit.py
-@@ -27,7 +27,13 @@
- import constants
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- # Group Management
- (
---- src/boards/python/admin/group_edit.py
-+++ src/boards/python/admin/group_edit.py
-@@ -27,7 +27,13 @@
- import constants
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- # User List Management
- (
---- src/boards/python/admin/module_groups.py
-+++ src/boards/python/admin/module_groups.py
-@@ -25,7 +25,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import module
- import group_list
---- src/boards/python/admin/module_reports.py
-+++ src/boards/python/admin/module_reports.py
-@@ -26,8 +26,14 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
--
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
-+  
- import module
- import log_list
- 
---- src/boards/python/admin/module_profiles.py
-+++ src/boards/python/admin/module_profiles.py
-@@ -28,7 +28,13 @@
- import profile_list
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- class Profiles(module.Module):
-   """Administrating GCompris Profiles"""
---- src/boards/python/admin/group_user_list.py
-+++ src/boards/python/admin/group_user_list.py
-@@ -28,7 +28,13 @@
- import constants
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- #import group_edit
- 
---- src/boards/python/admin/board_list.py
-+++ src/boards/python/admin/board_list.py
-@@ -27,7 +27,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--#from pysqlite2 import dbapi2 as sqlite
-+#try:
-+#  import sqlite3 as sqlite
-+#except ImportError:
-+#  try:
-+#    from pysqlite2 import dbapi2 as sqlite
-+#  except ImportError:
-+#    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- # Board Management
- (
---- src/boards/python/admin/user_list.py
-+++ src/boards/python/admin/user_list.py
-@@ -25,7 +25,13 @@
- from gcompris import gcompris_gettext as _
- 
- # Database
--from pysqlite2 import dbapi2 as sqlite
-+try:
-+  import sqlite3 as sqlite
-+except ImportError:
-+  try:
-+    from pysqlite2 import dbapi2 as sqlite
-+  except ImportError:
-+    raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2"
- 
- import constants
- import user_edit