Adopted package, Published latest version

4 files changed, 45 insertions, 165 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4263438a7a1f..7a9ddf5558c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,25 @@
 pkgbase = adom-noteye
-	pkgdesc = roguelike game with a quest-centric, plot driven structure
-	pkgver = 1.15.2
-	pkgrel = 4
-	url = http://www.adom.de/home/index.html
-	arch = i686
+	pkgdesc = A roguelike game with a quest-centric, plot driven structure (+ GUI)
+	pkgver = 2.3.8
+	pkgrel = 1
+	epoch = 1
+	url = http://www.adom.de/
 	arch = x86_64
 	license = custom: "adom"
+	depends = ncurses
 	depends = mesa
+	depends = sdl_image
+	depends = sdl_net
+	depends = sdl_mixer
 	depends = lua51
 	depends = libtinfo
-	depends = ncurses5-compat-libs
-	depends = libcaca
-	depends = libmad
-	depends = fluidsynth
-	depends = sdl2_image
-	depends = sdl2_mixer
-	depends = sdl2_net
-	depends = sdl2_ttf
-	depends = zlib
-	source = LICENSE
-	source = adom-noteye.sh
-	sha1sums = 51d28fe3f0420cd354113fd7ceb2a1a7abf1b069
-	sha1sums = d1d1a279e6d4d296f09519381674b5ea99007599
-	source_i686 = http://ams2.dl.dbolical.com/2015/08/23/adom_noteye_linux_ubuntu_32_r60_pub.tar.gz
-	sha1sums_i686 = 72febc188d80daa01b3a34fa2d6449b4c45826f9
-	source_x86_64 = http://ams2.dl.dbolical.com/2015/08/23/adom_noteye_linux_ubuntu_64_r60_pub.tar.gz
-	sha1sums_x86_64 = ff7e022afa7c0ba364fc697e240c7236604235b5
+	depends = libbsd
+	provides = adom
+	conflicts = adom
+	conflicts = adom-restricted
+	conflicts = adom-noteye
+	source_x86_64 = https://repo.sshadm.in/archlinux/eldios/x86_64/adom_noteye_64_2.3.8.tar.gz
+	sha256sums_x86_64 = 3fc5d7cc0d40a796e6f38ddea9ae6eb7d0f88424be7fd8680364823e1e132751
 
 pkgname = adom-noteye
 
diff --git a/.gitignore b/.gitignore
index f5a385a0261b..a84db5216b35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,9 @@ src/
 *.txt
 *.xz
 *.zip
+pkg/
+src/
+*.tar.gz
+*.tar.xz
+*.tar
+tmp/
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 192c6826abbf..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,97 +0,0 @@
-I.A. Terms of use
-=================
-
-  You may use ADOM freely provided you acknowledge the following terms
-  and abide by them:
-
-        1. ADOM must only be distributed in the packages created by
-           Thomas Biskup, the maintainer of the game.  The packages
-           must remain complete and all components must not be altered
-           in any way.
-
-        2. You may not charge more than $3 for the distribution of
-           ADOM (values as of November, 2001).
-
-        3. You do not challenge ADOM's copyright in any way.
-
-        4. If you distribute ADOM with a magazine, a CD-ROM distribution
-           or a similar medium, you abide by the terms defined in section
-           I.B.
-
-        5. You follow all other licensing terms (as given by entering
-           'adom -b' and 'adom -g').
-
-        6. You acknowledge that the author of ADOM is in no way
-           responsible for damage done to your system due to ADOM usage.
-
-        7. If you play ADOM for a prolonged amount of time and enjoy
-           it, you agree to abide by the terms of section I.C.
-
-
-  Failure to honor these terms will be a severe violation of the license
-  and could result in legal measures being taken if you are deemed
-  important enough to deserve it.
-
-
-I.B. Distributing ADOM in magazines, on disks, etc.
-===================================================
-
-  You can freely distribute ADOM with magazines, in game compilations,
-  etc. provided you abide by the following terms:
-
-        1. You honor all terms listed in section I.A.
-
-        2. You agree to notify the author of ADOM, Thomas Biskup, either
-           by email at creator@ancientdomainsofmystery.com or by sending 
-           a written letter to the following address:
-
-                Thomas Biskup
-                Zu den Tannen 5
-                58456 Witten
-                Germany
-
-        3. You send two complimentary copies of your product (one for
-           actual examination and one for being stored in my safe) to the
-           address given under #2 (or, if it is an electronic publication,
-           to the email address given above).
-
-  Failure to do so will be a severe violation of this licensing agreement
-  and will incur legal measures.
-
-
-I.C. The Postcard Quest.
-========================
-
-  If you want to thank me (Thomas Biskup) for creating ADOM, maintaining it,
-  fixing all discovered bugs, providing support and generally spending a lot
-  of time on the game and if you are having fun with the game, please
-  consider rewarding my efforts by sending a postcard to the following
-  address from wherever you live:
-
-                 Thomas Biskup
-                 Zu den Tannen 5
-                 58456 Witten
-                 Germany
-
-  I *love* receiving postcards from all over the world.  Weigh the fun
-  ADOM gave you against the ten minutes you probably need to
-  write and send such a postcard -- and if you find that you like and
-  enjoy the game -- please do it.  I'm really not asking much... am I?
-
-
-I.D. Licensing ADOM and other commercial ventures.
-==================================================
-
-  ADOM is an immensely successful game and I'm proud of that.  Still, there
-  are things that still could be done.  If you are member of a game
-  company and would like to publish a game that could easily be able to
-  rival the success of Diablo by Blizzard software, two things are
-  necessary:
-
-        1. You need a competent team of programmers and artists.
-
-        2. You need to be willing to license ADOM from me.  If you are 
-           interested in such a commercial venture email me at
-           creator@ancientdomainsofmystery.com.
-
-  Consider it if you work for a game company. 
diff --git a/PKGBUILD b/PKGBUILD
index 2dd046bbf0cf..f2f5ce6c4a8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,34 @@
-# Contributor: Lex Black <autumn-wind at web dot de>
-# Contributor: Eugene Yunak <val-amart at mail dot ru>
-# Contributor: Perttu Luukko <"perttu.luukko" followed by "@iki.fi">
+# Maintainer: Emanuele 'Lele aka eldios' Calo' <xeldiosx[at]gmail[dot]com>
 
 pkgname=adom-noteye
-pkgver=1.15.2
-_release=r60
-_date=2015/08/23
-pkgrel=4
-pkgdesc="roguelike game with a quest-centric, plot driven structure"
-arch=('i686' 'x86_64')
-depends=('mesa' 'lua51' 'libtinfo' 'ncurses5-compat-libs' 'libcaca' 'libmad' 'fluidsynth'
-        'sdl2_image' 'sdl2_mixer' 'sdl2_net' 'sdl2_ttf' 'zlib') # 'libpng12' (adom sdl2 link against it)
-url="http://www.adom.de/home/index.html"
-license=('custom: "adom"')
-source=(LICENSE
-        adom-noteye.sh)
-source_i686+=(http://ams2.dl.dbolical.com/${_date}/adom_noteye_linux_ubuntu_32_${_release}_pub.tar.gz)
-source_x86_64+=(http://ams2.dl.dbolical.com/${_date}/adom_noteye_linux_ubuntu_64_${_release}_pub.tar.gz)
-sha1sums=('51d28fe3f0420cd354113fd7ceb2a1a7abf1b069'
-          'd1d1a279e6d4d296f09519381674b5ea99007599')
-sha1sums_i686=('72febc188d80daa01b3a34fa2d6449b4c45826f9')
-sha1sums_x86_64=('ff7e022afa7c0ba364fc697e240c7236604235b5')
+epoch=1
+pkgver=2.3.8
+pkgrel=1
+pkgdesc="A roguelike game with a quest-centric, plot driven structure (+ GUI)"
+arch=("x86_64")
+url="http://www.adom.de/"
+conflicts=('adom' 'adom-restricted' 'adom-noteye')
+provides=('adom')
+depends=('ncurses' 'mesa' 'sdl_image' 'sdl_net' 'sdl_mixer' 'lua51'
+         'libtinfo' 'libbsd')
+_source_url="https://repo.sshadm.in/archlinux/eldios/${arch}"
 
+license=('custom: "adom"')
+source_x86_64=(${_source_url}/adom_noteye_64_2.3.8.tar.gz)
 
-prepare() {
-  cd "adom/lib/"
-
-  # Remove some bundled libs for which we have perfectly good versions available
-  rm -f "libFLAC.so.8"
-  rm -f "libjpeg.so.8"
-  rm -f "liblua5.1.so.0"
-  ln -s ../../../usr/lib/liblua5.1.so liblua5.1.so.0
-  #rm -f "libmikmod.so.2"
-  # libnoteye.so we keep at this point
-  rm -f "libogg.so.0"
-  rm -f "libSDL2-2.0.so.0"
-  rm -f "libSDL2_image-2.0.so.0"
-  rm -f "libSDL2_mixer-2.0.so.0"
-  rm -f "libSDL2_net-2.0.so.0"
-  rm -f "libSDL2_ttf-2.0.so.0"
-  #rm -f "libtiff.so.4"
-  rm -f "libvorbisfile.so.3"
-  rm -f "libvorbis.so.0"
-  rm -f "libz.so.1"
-}
+# PACKAGES
+sha256sums_x86_64=('3fc5d7cc0d40a796e6f38ddea9ae6eb7d0f88424be7fd8680364823e1e132751')
 
 package() {
   # Copy entire contents of the archive to /opt
   install -d "${pkgdir}/opt"
-  cp -R "${srcdir}/adom" "${pkgdir}/opt/adom-noteye"
-
+  cp -R "${srcdir}/adom" "${pkgdir}/opt/"
   # Since the adom binary uses a relative RPATH, it's either
   # this or patching the binary
-  install -Dm755 "${srcdir}/adom-noteye.sh" "${pkgdir}/usr/bin/adom-noteye"
-  install -m644 -D ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/adom-noteye/LICENSE
+  install -d "${pkgdir}/usr/bin"
+  cat>"${pkgdir}/usr/bin/adom"<<EOF 
+#!/bin/sh
+cd /opt/adom && ./adom
+EOF
+  chmod 755 "${pkgdir}/usr/bin/adom"
 }