Thu Apr 12 00:01:12 UTC 2012

3 files changed, 137 insertions, 26 deletions

diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index d8e5d8e4f..829871791 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -1,50 +1,40 @@
-# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $
+# $Id$
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor: kevin <kevin@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
+_pkgname=abuse
 pkgname=abuse-libre
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
 arch=('i686' 'x86_64')
 url='http://abuse.zoy.org/'
-license=('GPL' 'custom:PublicDomain')
+license=('GPL' 'custom')
 depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
 install='abuse.install'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz")
-
-# Remove the unfree 'claudio' addon
-# $ source PKGBUILD
-# $ mksource
-mksource() {
-    pushd /tmp >/dev/null
-
-    wget http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname%-libre}-${pkgver}.tar.gz \
-         -O - | tar xzf -
-
-    rm -rvf ./abuse-$pkgver/data/addon/claudio
-    tar czvf ${pkgname}-${pkgver}.tar.gz ./abuse-$pkgver
-
-    popd >/dev/null
-
-    mv -v /tmp/${pkgname}-${pkgver}.tar.gz .
-}
+source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz"
+        non-claudio.patch)
+md5sums=('ec678b8dc8d00e0382d8c805c6438489'
+         '4808c8be42f551bb3c611629a7833f09')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+# Remove the unfree 'claudio' addon
+  rm -rvf ./data/addon/claudio
+  patch -Np1 -i "$srcdir/non-claudio.patch"
 
   ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/usr/share/licenses/abuse"
   sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
 }
-
-md5sums=('10cac59308bff0dadb8437eff8b4d87e')
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install
index ca888f196..4d28ebacd 100644
--- a/libre/abuse-libre/abuse.install
+++ b/libre/abuse-libre/abuse.install
@@ -11,4 +11,3 @@ post_upgrade() {
 	post_install
 }
 
-
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch
new file mode 100644
index 000000000..2a29e53f0
--- /dev/null
+++ b/libre/abuse-libre/non-claudio.patch
@@ -0,0 +1,122 @@
+--- abuse-0.8/data/Makefile.in	2011-05-09 08:06:35.000000000 -0300
++++ abuse-0.8/data/Makefile.in	2012-04-11 15:03:02.854839102 -0300
+@@ -184,7 +184,6 @@
+ 	addon/aliens/objects.lsp addon/aliens/powerold.lsp \
+ 	addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
+ 	addon/aliens/tiles.lsp addon/bong/bong.lsp \
+-	addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+ 	addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+ 	addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+ 	addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -245,23 +244,6 @@
+ 	art/tints/guns/orange.spe art/tints/guns/redish.spe \
+ 	addon/aliens/aliens.spe addon/aliens/bactiles.spe \
+ 	addon/aliens/fortiles.spe addon/bong/bong.spe \
+-	addon/claudio/antship.spe addon/claudio/bigexp.spe \
+-	addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
+-	addon/claudio/droid.spe addon/claudio/extiles.spe \
+-	addon/claudio/fire.spe addon/claudio/lamp.spe \
+-	addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+-	addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
+-	addon/claudio/pal2.spe addon/claudio/pal5.spe \
+-	addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+-	addon/claudio/pal82f.spe addon/claudio/pal82.spe \
+-	addon/claudio/pal90.spe addon/claudio/rob2.spe \
+-	addon/claudio/skull.spe addon/claudio/spaced.spe \
+-	addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+-	addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+-	addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+-	addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+-	addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+-	addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+ 	addon/example/example.spe addon/leon/gray.spe \
+ 	addon/leon/level00.spe addon/leon/level01.spe \
+ 	addon/leon/level02.spe addon/leon/lmisc.spe \
+@@ -333,7 +315,6 @@
+ doc = \
+     addon/aliens/aliens.txt \
+     addon/aliens/readme.txt \
+-    addon/claudio/palettes.txt \
+     addon/leon/leon.txt \
+     addon/newart/tiledoc.txt \
+     addon/pong/pong.txt \
+@@ -414,17 +395,6 @@
+ @HAVE_NONFREE_TRUE@	addon/aliens/aslash01.wav \
+ @HAVE_NONFREE_TRUE@	addon/aliens/egghatch.wav \
+ @HAVE_NONFREE_TRUE@	addon/aliens/jarbreak.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/aship.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/drill.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/fire.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/glass1.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/sewers.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/skull.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/spaceo.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/trex1.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/trex2.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/unhealth.wav \
+-@HAVE_NONFREE_TRUE@	addon/claudio/wfall.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship1.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship2.wav \
+ @HAVE_NONFREE_TRUE@	addon/leon/sfx/gren5.wav \
+--- abuse-0.8/data/Makefile.am	2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/Makefile.am	2012-04-11 15:03:50.282407491 -0300
+@@ -35,7 +35,6 @@
+     \
+     addon/bong/bong.lsp \
+     \
+-    addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
+     addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
+     addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
+     addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
+@@ -113,21 +112,6 @@
+     \
+     addon/bong/bong.spe \
+     \
+-    addon/claudio/antship.spe addon/claudio/bigexp.spe \
+-    addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
+-    addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
+-    addon/claudio/lava2.spe addon/claudio/mypanels.spe \
+-    addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
+-    addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
+-    addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
+-    addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
+-    addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
+-    addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
+-    addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
+-    addon/claudio/t_skull.spe addon/claudio/t_space.spe \
+-    addon/claudio/t_trex.spe addon/claudio/t_water.spe \
+-    addon/claudio/umbrel3.spe addon/claudio/watem.spe \
+-    \
+     addon/example/example.spe \
+     \
+     addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
+@@ -214,7 +198,6 @@
+ doc = \
+     addon/aliens/aliens.txt \
+     addon/aliens/readme.txt \
+-    addon/claudio/palettes.txt \
+     addon/leon/leon.txt \
+     addon/newart/tiledoc.txt \
+     addon/pong/pong.txt \
+@@ -267,11 +250,6 @@
+     addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
+     addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
+     \
+-    addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
+-    addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
+-    addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
+-    addon/claudio/unhealth.wav addon/claudio/wfall.wav \
+-    \
+     addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
+     addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
+     addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
+--- abuse-0.8/data/abuse.lsp	2011-05-09 04:58:04.000000000 -0300
++++ abuse-0.8/data/abuse.lsp	2012-04-11 15:04:15.637788215 -0300
+@@ -42,7 +42,6 @@
+ (load "addon/twist/f2chars.lsp")
+ (load "addon/twist/f2ai.lsp")
+ (load "addon/aliens/astartup.lsp")
+-(load "addon/claudio/claudio.lsp")
+ (load "addon/twist/lisp/dray.lsp")
+ (load "addon/twist/lisp/mario.lsp")
+ (load "addon/leon/4frabs.lsp")