7kaa: Update to 2.14.5

 * Additional download of old data package could be dropped, as the encyc files are now there
 * Ported to sdl2
 * sdl_net replaced by enet

3 files changed, 19 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d4c5f1dc871..f0c8e8427e54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,26 @@
 pkgbase = 7kaa
 	pkgdesc = Seven Kingdoms: Ancient Adversaries is a real-time strategy (RTS) computer game developed by Trevor Chan
-	pkgver = 2.14.4
-	pkgrel = 4
+	pkgver = 2.14.5
+	pkgrel = 1
 	url = http://7kfans.com/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	depends = openal
-	depends = sdl_net
+	depends = enet
 	depends = gcc-libs
+	depends = sdl2
 	depends = 7kaa-music
 	provides = 7kaa-data
 	conflicts = 7kaa-data
-	source = http://downloads.sourceforge.net/project/skfans/7KAA%202.14.4/7kaa-source-2.14.4.tar.bz2
+	source = http://downloads.sourceforge.net/project/skfans/7KAA%202.14.5/7kaa-2.14.5.tar.xz
 	source = 7kaa.sh
 	source = 7kaa.desktop
 	source = 7kaa.ico
-	source = http://downloads.sourceforge.net/project/skfans/Seven%20Kingdoms%20AA%20Data%20Files/7kaa-data-2.13.tar.bz2
-	md5sums = 777124571564bf46990ef2d2d96afbbb
+	md5sums = 83152b21973c1b3df8de525bda434be4
 	md5sums = 8d0634b0962ad621a7608378d7172e02
 	md5sums = 3fd08eeb86036fa9b18b91a91c62cb99
 	md5sums = 996b0cdc8e4448ee456603c6640bb19b
-	md5sums = d7580a683fabcea98b5898dff252dcf2
 
 pkgname = 7kaa
 
diff --git a/.gitignore b/.gitignore
index 3a3642b6f6ff..d7d3a2892ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*/src
-*/pkg
+src/
+pkg/
 *.gz
 *.xz
 *.bz2
@@ -10,5 +10,5 @@
 *.txt
 *.log
 *.scm
-*/*.pkg
-*/*.asc
+*.pkg
+*.asc
diff --git a/PKGBUILD b/PKGBUILD
index 4994736af8ad..87018c7a3b0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,24 @@
 # Contributor: Anton Larionov <diffident dot cat at gmail dot com>
 
 pkgname=7kaa
-pkgver=2.14.4
-pkgrel=4
+pkgver=2.14.5
+pkgrel=1
 pkgdesc='Seven Kingdoms: Ancient Adversaries is a real-time strategy (RTS) computer game developed by Trevor Chan'
 url='http://7kfans.com/'
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('openal' 'sdl_net' 'gcc-libs' '7kaa-music')
+depends=('openal' 'enet' 'gcc-libs' 'sdl2' '7kaa-music')
 conflicts=('7kaa-data')
 provides=('7kaa-data')
-source=("http://downloads.sourceforge.net/project/skfans/7KAA%20${pkgver}/${pkgname}-source-${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/project/skfans/7KAA%20${pkgver}/${pkgname}-${pkgver}.tar.xz"
         "${pkgname}.sh"
         "${pkgname}.desktop"
-        "${pkgname}.ico"
-	"http://downloads.sourceforge.net/project/skfans/Seven%20Kingdoms%20AA%20Data%20Files/$pkgname-data-2.13.tar.bz2")
-md5sums=('777124571564bf46990ef2d2d96afbbb'
+        "${pkgname}.ico")
+md5sums=('83152b21973c1b3df8de525bda434be4'
          '8d0634b0962ad621a7608378d7172e02'
          '3fd08eeb86036fa9b18b91a91c62cb99'
-         '996b0cdc8e4448ee456603c6640bb19b'
-	 'd7580a683fabcea98b5898dff252dcf2')
+         '996b0cdc8e4448ee456603c6640bb19b')
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -33,12 +32,7 @@ package() {
   # install data files
   install -dm755 "${pkgdir}/opt/7kaa/"
   cd "${srcdir}/$pkgname-$pkgver/data/"
-  #cp -r {encyc,encyc2,image,resource,scenari2,scenario,sound,sprite,tutorial} "${pkgdir}/opt/7kaa/"
-  cp -r {image,resource,scenari2,scenario,sound,sprite,tutorial} "${pkgdir}/opt/7kaa/"
-  
-  # install encyc files from the data package
-  cd "${srcdir}/7kaa/"
-  cp -r {encyc,encyc2} "${pkgdir}/opt/7kaa/"
+  cp -r {encyc,encyc2,image,resource,scenari2,scenario,sound,sprite,tutorial} "${pkgdir}/opt/7kaa/"
 
   # fix permissions
   cd "${pkgdir}/opt/7kaa/"