[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Stefan Wold]

commit 10623b3e64481bbe6e03d272d95f44d111baf067
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 02 Feb 2013 10:40:45 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/10623b3e64481bbe6e03d272d95f44d111baf067

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  games/oolite/BUILD       | +15/-19   
  games/oolite/DETAILS     | +3/-3     
  virtual/virtinst/DEPENDS | +0/-1     
  3 files changed, 18 insertions(+), 23 deletions(-)

--- a/games/oolite/BUILD
+++ b/games/oolite/BUILD
@@ -1,25 +1,21 @@
-(
+if in_depends $MODULE espeak; then
+ sedit "s:ESPEAK *=.*$:ESPEAK = yes:" config.make
+else
+ sedit "s:ESPEAK *=.*$:ESPEAK = no:" config.make
+fi &&
 
-  if in_depends $MODULE espeak; then
-     sedit "s:ESPEAK *=.*$:ESPEAK = yes:" config.make
-  else
-     sedit "s:ESPEAK *=.*$:ESPEAK = no:" config.make
-  fi &&
+. /usr/share/GNUstep/Makefiles/GNUstep.sh &&
 
-  . /usr/share/GNUstep/Makefiles/GNUstep.sh &&
+make -f Makefile release &&
 
-  make -f Makefile release &&
+prepare_install &&
 
-  prepare_install &&
+mkdir -p /usr/lib/GNUstep/Applications/ &&
+cp -rv oolite.app /usr/lib/GNUstep/Applications/oolite.app &&
 
-  mkdir -p /usr/lib/GNUstep/Applications/ &&
-  cp -rv oolite.app /usr/lib/GNUstep/Applications/oolite.app &&
+install -Dm0755 debian/extra/games/oolite /usr/games/oolite &&
+install -Dm0644 installers/FreeDesktop/oolite.desktop /usr/share/applications/oolite.desktop &&
+install -Dm0644 installers/FreeDesktop/oolite-icon.png /usr/share/pixmaps/oolite-icon.png &&
+install -Dm0644 debian/oolite.6 /usr/share/man/man6/oolite.6 &&
 
-  install -Dm0755 debian/extra/games/oolite /usr/games/oolite &&
-  install -Dm0644 installers/FreeDesktop/oolite.desktop /usr/share/applications/oolite.desktop &&
-  install -Dm0644 installers/FreeDesktop/oolite-icon.png /usr/share/pixmaps/oolite-icon.png &&
-  install -Dm0644 debian/oolite.6 /usr/share/man/man6/oolite.6 &&
-
-  gather_docs Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf Doc/OoliteRS.pdf Doc/CHANGELOG.TXT
-
-) > $C_FIFO 2>&1
+gather_docs Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf Doc/OoliteRS.pdf Doc/CHANGELOG.TXT
--- a/games/oolite/DETAILS
+++ b/games/oolite/DETAILS
@@ -1,13 +1,13 @@
           MODULE=oolite
-         VERSION=1.76.1
+         VERSION=1.77
           SOURCE=$MODULE-source-$VERSION.tar.bz2
 	 SOURCE2=firefox-4.0.source.js-only.tbz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-source-$VERSION
       SOURCE_URL=$SFORGE_URL/oolite.mirror/
      SOURCE2_URL=http://jens.ayton.se/oolite/deps/
-      SOURCE_VFY=sha1:e50d3413454f2bc0df6ff22e75b880327bc632e1
+      SOURCE_VFY=sha1:a42f1bd65609a197866d441bca2854823ac6c628
      SOURCE2_VFY=sha1:351d141c3a3893abac1933148551e00384008e5e
-        WEB_SITE=http://http://www.oolite.org
+        WEB_SITE=http://www.oolite.org
          ENTERED=20120714
          UPDATED=20120714
            SHORT="space simulator game"
--- a/virtual/virtinst/DEPENDS
+++ b/virtual/virtinst/DEPENDS
@@ -1,3 +1,2 @@
-depends Python
 depends libvirt
 depends urlgrabber