angband-4.0.0-1.parabola1: updating version

2 files changed, 127 insertions, 80 deletions

diff --git a/libre/angband/PKGBUILD b/libre/angband/PKGBUILD
index 47287a72e..2547d0e63 100644
--- a/libre/angband/PKGBUILD
+++ b/libre/angband/PKGBUILD
@@ -11,25 +11,32 @@
 
 pkgname=angband
 _pkgname=$pkgname-libre
-pkgver=3.5.1
+pkgver=4.0.0
 pkgrel=1.parabola1
 pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://rephial.org/"
 license=('GPL2' 'custom')
 replaces=($_pkgname)
 conflicts=($_pkgname)
 depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses')
-mksource=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-v${pkgver}.tar.gz" 'libre.patch')
-source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-v${pkgver}.tar.gz")
+makedepends=('python-docutils')
+mksource=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-${pkgver}.tar.gz")
+source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" 'libre.patch')
 
 mksource() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # remove nonfree parts from source code
-  patch -Np1 -i ../libre.patch  
-  rm -v lib/xtra/sound/*.mp3
-  rm -v lib/xtra/graf/64x64.png
+  # remove nonfree stuff from source
+  rm -v lib/sounds/*.mp3
+  rm -v lib/tiles/shockbolt/64x64.png
+}
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # remove nonfree references
+  patch -Np1 -i ../libre.patch
 }
 
 build() {
@@ -57,6 +64,6 @@ package() {
   install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-mkmd5sums=('3b9a324551cfd48b101f197a8441f135'
-           '3ac39f377bea2e208308d01f4213310f')
-md5sums=('b323f993d1279e560a480c669caa3710')
+mkmd5sums=('3813f95f46166ff383923eaba462b194')
+md5sums=('38c7d0427471d8fd23c66aeea0ed735f'
+         '06d123697d06a8a08f5367fae3c38137')
diff --git a/libre/angband/libre.patch b/libre/angband/libre.patch
index a044bc6fe..1a41cb6ab 100644
--- a/libre/angband/libre.patch
+++ b/libre/angband/libre.patch
@@ -1,8 +1,7 @@
-diff --git a/copying.txt b/copying.txt
-index fe1f289..82263b1 100644
---- a/copying.txt
-+++ b/copying.txt
-@@ -23,14 +23,6 @@ exceptions:
+diff -Nur angband-4.0.0.orig/copying.txt angband-4.0.0/copying.txt
+--- angband-4.0.0.orig/copying.txt	2015-06-29 17:19:11.000000000 -0300
++++ angband-4.0.0/copying.txt	2015-07-02 01:06:01.229487678 -0300
+@@ -23,14 +23,6 @@
     only under the terms of the Creative Commons Attribution 3.0 licence:
     http://creativecommons.org/licenses/by/3.0/
  
@@ -17,7 +16,7 @@ index fe1f289..82263b1 100644
   * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
     McConnell, all of whom have agreed to their Angband work being released
     under the GPL.
-@@ -393,25 +385,3 @@ proprietary programs.  If your program is a subroutine library, you may
+@@ -393,25 +385,3 @@
  consider it more useful to permit linking proprietary applications with the
  library.  If this is what you want to do, use the GNU Lesser General
  Public License instead of this License.
@@ -25,7 +24,7 @@ index fe1f289..82263b1 100644
 -------------------------------------------------------------------------------
 -
 -The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes
--2012.  It can be found in the file lib/xtra/graf/128x128.png.
+-2012.  It can be found in the file lib/tiles/shockbolt/64x64.png.
 -
 -Permission is granted to:
 -* use the tileset with in-development and released versions of Angband
@@ -43,37 +42,56 @@ index fe1f289..82263b1 100644
 -  be granted permission to use them, and if so, use will be allowed as long
 -  as the game or project remains non-commercial.  To use them in commercial
 -  games, a non-exclusive licence must be acquired from the author.
-diff --git a/lib/xtra/graf/Makefile b/lib/xtra/graf/Makefile
-index e1e9111..ec54051 100644
---- a/lib/xtra/graf/Makefile
-+++ b/lib/xtra/graf/Makefile
-@@ -1,6 +1,6 @@
- MKPATH=../../../mk/
- include $(MKPATH)buildsys.mk
+diff -Nur angband-4.0.0.orig/lib/help/copying.txt angband-4.0.0/lib/help/copying.txt
+--- angband-4.0.0.orig/lib/help/copying.txt	2015-06-29 17:19:11.000000000 -0300
++++ angband-4.0.0/lib/help/copying.txt	2015-07-02 01:08:29.648689443 -0300
+@@ -23,14 +23,6 @@
+    only under the terms of the Creative Commons Attribution 3.0 licence:
+    http://creativecommons.org/licenses/by/3.0/
  
--DATA = 8x8.png 8x16.png 16x16.png 32x32.png 64x64.png mr_att.png graphics.txt
-+DATA = 8x8.png 8x16.png 16x16.png 32x32.png mr_att.png graphics.txt
- PACKAGE = xtra/graf
- 
-diff --git a/lib/xtra/graf/graphics.txt b/lib/xtra/graf/graphics.txt
-index 28078fc..02f32ab 100644
---- a/lib/xtra/graf/graphics.txt
-+++ b/lib/xtra/graf/graphics.txt
-@@ -47,8 +47,3 @@ N:4:Nomad's tiles
- I:16:16:8x16.png
- P:nomad
- X:0:0:0
+- * Shockbolt's (64x64) graphics are distributed under the licence at the end
+-   of this file.  Currently some of the tiles in the 64x64.png tilesheet were
+-   resized from tiles made by David Gervais for the 32x32 set.
 -
--N:5:Shockbolt's tiles
--I:64:64:64x64.png
--P:shock
--X:1:29:31
-diff --git a/lib/xtra/sound/Makefile b/lib/xtra/sound/Makefile
-index 0fb522b..a4337fd 100644
---- a/lib/xtra/sound/Makefile
-+++ b/lib/xtra/sound/Makefile
-@@ -1,78 +1,7 @@
- MKPATH=../../../mk/
+- * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
+-   Sharealike licence.  They were created by Dubtrain <angband@dubtrain.com>.
+-   You can find them in Wave format at http://www.dubtrain.com/angband/.
+-
+  * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
+    McConnell, all of whom have agreed to their Angband work being released
+    under the GPL.
+@@ -394,26 +386,3 @@
+ consider it more useful to permit linking proprietary applications with the
+ library.  If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
+-
+-------------------------------------------------------------------------------
+-
+-The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes
+-2012.  It can be found in the file lib/tiles/shockbolt/64x64.png.
+-
+-Permission is granted to:
+-  * use the tileset with in-development and released versions of Angband
+-  * distribute and make copies of the tileset with in-development and released
+-    versions of Angband, as long as no fee is charged for it
+-  * incorporate tiles designed by the author for variants of Angband and use and
+-    distribute them with Angband under the terms above
+-
+-Permission is not granted to:
+-  * modify the tileset without the author's permission.
+-  * incorporate tiles designed for ToME that do not appear in the Angband
+-    tileset.
+-  * use or distribute the tileset with other games or projects.  If you want to
+-    use and distribute the tileset with other games or projects, you must obtain
+-    explicit permission from the author.  Non-commercial games or projects may
+-    be granted permission to use them, and if so, use will be allowed as long
+-    as the game or project remains non-commercial.  To use them in commercial
+-    games, a non-exclusive licence must be acquired from the author.
+diff -Nur angband-4.0.0.orig/lib/sounds/Makefile angband-4.0.0/lib/sounds/Makefile
+--- angband-4.0.0.orig/lib/sounds/Makefile	2015-06-29 17:19:11.000000000 -0300
++++ angband-4.0.0/lib/sounds/Makefile	2015-07-02 01:05:17.934999613 -0300
+@@ -1,78 +1,5 @@
+ MKPATH=../../mk/
  include $(MKPATH)buildsys.mk
  
 -DATA = sound.cfg \
@@ -148,14 +166,12 @@ index 0fb522b..a4337fd 100644
 -	mco_man_mumble.mp3		plm_door_slam.mp3		sum_laugh_evil2.mp3 \
 -	mco_mouse_squeaks.mp3		plm_door_squeaky.mp3		sum_lion_growl.mp3  \
 -	mco_rubber_thud.mp3		plm_door_wooden.mp3		sum_piano_scrape.mp3
-+DATA = sound.cfg
- 
- PACKAGE = xtra/sound
+-
+ PACKAGE = sounds
  
-diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg
-index a3f483f..41de805 100644
---- a/lib/xtra/sound/sound.cfg
-+++ b/lib/xtra/sound/sound.cfg
+diff -Nur angband-4.0.0.orig/lib/sounds/sound.cfg angband-4.0.0/lib/sounds/sound.cfg
+--- angband-4.0.0.orig/lib/sounds/sound.cfg	2015-06-29 17:19:11.000000000 -0300
++++ angband-4.0.0/lib/sounds/sound.cfg	2015-07-02 01:25:08.074947841 -0300
 @@ -9,21 +9,6 @@
  # hit = hit.mp3 hit1.mp3
  #
@@ -278,7 +294,7 @@ index a3f483f..41de805 100644
 +miss =
  
  # You fire a missile.
--shoot = plc_miss_swish.mp3 plc_miss_arrow.mp3
+-shoot = plc_miss_arrow.mp3
 +shoot =
  
  # You hit something with a missile.
@@ -520,16 +536,20 @@ index a3f483f..41de805 100644
 -wield = plm_metal_sharpen.mp3
 +wield =
  
+ # You take something in or out of your quiver.
+-quiver = plc_miss_swish.mp3
++quiver =
+ 
  # You wield a cursed item.
 -cursed = pls_man_oooh.mp3
 +cursed =
  
  # You notice something (generic notice)
--notice = id_bad_hmm.mp3 
+-notice = id_bad_hmm.mp3
 +notice =
  
  # You notice something about your equipment or inventory.
--pseudo_id = id_good_hmm.mp3 
+-pseudo_id = id_good_hmm.mp3
 +pseudo_id =
  
  # You successfully cast a spell.
@@ -581,7 +601,7 @@ index a3f483f..41de805 100644
 +mon_claw =
  
  # Attack - bite
--mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3  mco_bite_munch.mp3  mco_bite_long.mp3  mco_bite_short.mp3  mco_bite_gnash.mp3  mco_bite_chomp.mp3  mco_bite_regular.mp3  mco_bite_small.mp3  mco_bite_dainty.mp3  mco_bite_hard.mp3  mco_bite_chew.mp3
+-mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3 mco_bite_munch.mp3 mco_bite_long.mp3 mco_bite_short.mp3 mco_bite_gnash.mp3 mco_bite_chomp.mp3 mco_bite_regular.mp3 mco_bite_small.mp3 mco_bite_dainty.mp3 mco_bite_hard.mp3 mco_bite_chew.mp3
 +mon_bite =
  
  # Attack - sting
@@ -721,79 +741,75 @@ index a3f483f..41de805 100644
 +breathe_frost =
  
  # Breathe electricity.
--breathe_elec = mco_attack_breath.mp3 
+-breathe_elec = mco_attack_breath.mp3
 +breathe_elec =
  
  # Breathe acid.
--breathe_acid = mco_attack_breath.mp3  
+-breathe_acid = mco_attack_breath.mp3
 +breathe_acid =
  
  # Breathe gas.
--breathe_gas = mco_attack_breath.mp3  
+-breathe_gas = mco_attack_breath.mp3
 +breathe_gas =
  
  # Breathe fire.
--breathe_fire = mco_attack_breath.mp3  
+-breathe_fire = mco_attack_breath.mp3
 +breathe_fire =
  
- # Breathe confusion.
--breathe_confusion = mco_attack_breath.mp3  
-+breathe_confusion =
- 
  # Breathe disenchantment.
--breathe_disenchant = mco_attack_breath.mp3  
+-breathe_disenchant = mco_attack_breath.mp3
 +breathe_disenchant =
  
  # Breathe chaos.
--breathe_chaos = mco_attack_breath.mp3  
+-breathe_chaos = mco_attack_breath.mp3
 +breathe_chaos =
  
  # Breathe shards.
--breathe_shards = mco_attack_breath.mp3  
+-breathe_shards = mco_attack_breath.mp3
 +breathe_shards =
  
  # Breathe sound.
--breathe_sound = mco_attack_breath.mp3  
+-breathe_sound = mco_attack_breath.mp3
 +breathe_sound =
  
  # Breathe light.
--breathe_light = mco_attack_breath.mp3  
+-breathe_light = mco_attack_breath.mp3
 +breathe_light =
  
  # Breathe darkness.
--breathe_dark = mco_attack_breath.mp3  
+-breathe_dark = mco_attack_breath.mp3
 +breathe_dark =
  
  # Breathe nether.
--breathe_nether = mco_attack_breath.mp3  
+-breathe_nether = mco_attack_breath.mp3
 +breathe_nether =
  
  # Breathe nexus.
--breathe_nexus = mco_attack_breath.mp3  
+-breathe_nexus = mco_attack_breath.mp3
 +breathe_nexus =
  
  # Breathe time.
--breathe_time = mco_attack_breath.mp3  
+-breathe_time = mco_attack_breath.mp3
 +breathe_time =
  
  # Breathe inertia.
--breathe_inertia = mco_attack_breath.mp3  
+-breathe_inertia = mco_attack_breath.mp3
 +breathe_inertia =
  
  # Breathe gravity.
--breathe_gravity = mco_attack_breath.mp3  
+-breathe_gravity = mco_attack_breath.mp3
 +breathe_gravity =
  
  # Breathe plasma.
--breathe_plasma = mco_attack_breath.mp3  
+-breathe_plasma = mco_attack_breath.mp3
 +breathe_plasma =
  
  # Breathe force.
--breathe_force = mco_attack_breath.mp3  
+-breathe_force = mco_attack_breath.mp3
 +breathe_force =
  
  # Breathe the elements (power dragon scale mail).
--breathe_elements = mco_attack_breath.mp3  
+-breathe_elements = mco_attack_breath.mp3
 +breathe_elements =
  
  #
@@ -812,3 +828,27 @@ index a3f483f..41de805 100644
 -identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3
 +identify_art =
  
+diff -Nur angband-4.0.0.orig/lib/tiles/list.txt angband-4.0.0/lib/tiles/list.txt
+--- angband-4.0.0.orig/lib/tiles/list.txt	2015-06-29 17:19:11.000000000 -0300
++++ angband-4.0.0/lib/tiles/list.txt	2015-07-02 01:09:38.781880858 -0300
+@@ -54,9 +54,3 @@
+ size:16:16:8x16.png
+ pref:graf-nmd.prf
+ extra:0:0:0
+-
+-name:5:Shockbolt's tiles
+-directory:shockbolt
+-size:64:64:64x64.png
+-pref:graf-shb.prf
+-extra:1:29:31
+diff -Nur angband-4.0.0.orig/lib/tiles/shockbolt/Makefile angband-4.0.0/lib/tiles/shockbolt/Makefile
+--- angband-4.0.0.orig/lib/tiles/shockbolt/Makefile	2015-06-29 17:19:11.000000000 -0300
++++ angband-4.0.0/lib/tiles/shockbolt/Makefile	2015-07-02 01:09:29.938991983 -0300
+@@ -1,6 +1,6 @@
+ MKPATH=../../../mk/
+ include $(MKPATH)buildsys.mk
+ 
+-DATA = 64x64.png  flvr-shb.prf  graf-shb.prf  xtra-shb.prf
++DATA = flvr-shb.prf  xtra-shb.prf
+ 
+ PACKAGE = tiles/shockbolt