Fix downloads

3 files changed, 68 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96612a84fbd5..b6b8cac1a474 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,41 @@
 pkgbase = hydrogen-drumkits
 	pkgdesc = Hydrogen drum kits
 	pkgver = 20191129
-	pkgrel = 1
+	pkgrel = 2
 	url = https://sourceforge.net/projects/hydrogen/
 	changelog = ChangeLog
 	arch = any
 	license = GPL2
 	depends = hydrogen
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/3355606kit.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/BJA_Pacific.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Boss_DR-110.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Classic-626.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Classic-808.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/ColomboAcousticDrumkit.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/DeathMetal.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/EasternHop-1.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/ElectricEmpireKit.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/ErnysPercussion.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/ForzeeStereo.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/HardElectro1.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/HipHop-1.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/HipHop-2.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/K-27_Trash_Kit.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Lightning1024.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Millo-Drums_v.1.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Millo_MultiLayered2.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Millo_MultiLayered3.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/SF3007-2011-Set-03.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Synthie-1.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/TD-7kit.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/TR808909.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/Techno-1.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/The Black Pearl 1.0.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/VariBreaks.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/YamahaVintageKit.h2drumkit
-	source = https://netcologne.dl.sourceforge.net/project/hydrogen/Sound Libraries/Main sound libraries/circAfrique v4.h2drumkit
+	source = 3355606kit.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/3355606kit.h2drumkit
+	source = BJA_Pacific.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/BJA_Pacific.h2drumkit
+	source = Boss_DR-110.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Boss_DR-110.h2drumkit
+	source = Classic-626.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Classic-626.h2drumkit
+	source = Classic-808.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Classic-808.h2drumkit
+	source = ColomboAcousticDrumkit.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/ColomboAcousticDrumkit.h2drumkit
+	source = DeathMetal.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/DeathMetal.h2drumkit
+	source = EasternHop-1.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/EasternHop-1.h2drumkit
+	source = ElectricEmpireKit.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/ElectricEmpireKit.h2drumkit
+	source = ErnysPercussion.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/ErnysPercussion.h2drumkit
+	source = ForzeeStereo.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/ForzeeStereo.h2drumkit
+	source = Gimme A Hand 1.0.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Gimme%20A%20Hand%201.0.h2drumkit
+	source = HardElectro1.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/HardElectro1.h2drumkit
+	source = HipHop-1.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/HipHop-1.h2drumkit
+	source = HipHop-2.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/HipHop-2.h2drumkit
+	source = K-27_Trash_Kit.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/K-27_Trash_Kit.h2drumkit
+	source = Lightning1024.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Lightning1024.h2drumkit
+	source = Millo-Drums_v.1.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Millo-Drums_v.1.h2drumkit
+	source = Millo_MultiLayered2.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Millo_MultiLayered2.h2drumkit
+	source = Millo_MultiLayered3.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Millo_MultiLayered3.h2drumkit
+	source = SF3007-2011-Set-03.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/SF3007-2011-Set-03.h2drumkit
+	source = Synthie-1.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Synthie-1.h2drumkit
+	source = TD-7kit.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/TD-7kit.h2drumkit
+	source = TR808909.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/TR808909.h2drumkit
+	source = Techno-1.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/Techno-1.h2drumkit
+	source = The Black Pearl 1.0.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/The%20Black%20Pearl%201.0.h2drumkit
+	source = VariBreaks.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/VariBreaks.h2drumkit
+	source = YamahaVintageKit.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/YamahaVintageKit.h2drumkit
+	source = circAfrique v4.h2drumkit::https://deac-ams.dl.sourceforge.net/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries/circAfrique%20v4.h2drumkit
 	sha256sums = 96b1d325fd52e97d7b99ca9191cb376e430ecea1f83d12281f314e30f20fa121
 	sha256sums = a485753a2a60a1ce30e782784c0f26a84bbbee6bdb324b40c04a1f09f3668305
 	sha256sums = 5debdfb050f639478725af134d315649f242142f84691ce1409cd9f56f6943be
@@ -46,6 +47,7 @@ pkgbase = hydrogen-drumkits
 	sha256sums = 7229f52268483119c3a8b1e62dc85f801e37b6c34834e8c603d8aaec0445c5f9
 	sha256sums = daccb09332bf6aac09b83f9605a084120a9decff1447d02cc68d16b00f101546
 	sha256sums = 37b9f1d6d8fdf2a65aef5fcde5ac305c89983e1e23ce5b8194922640cce9146d
+	sha256sums = f0cd2e52f0dbc8d6a001f203ee47cd691d8d028d30501ce332a52659aa62a07a
 	sha256sums = cfde7e4c7a25f0d72d0674b4d849471b9d309e28372709b509e743aad8c30d5c
 	sha256sums = d194d2d47cd33d09842ecb6db74783aaa89368e69a964868c7fd2feb3e1b7613
 	sha256sums = e2c586017bc4952976b8af5447435e7fa5109308861b5f5be3213d86346bd972
@@ -65,4 +67,3 @@ pkgbase = hydrogen-drumkits
 	sha256sums = f09ff7e46310409b8ec7f180193cda6bb69e2a67d5e7f78f8c1c1954bb9a3a2c
 
 pkgname = hydrogen-drumkits
-
diff --git a/.gitignore b/.gitignore
index bee00342d03c..05c5f666b260 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /*.h2drumkit
+/*.pkg.*
 /pkg/
 /src/
-/hydrogen-drumkits-*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index e54e5feeaaea..9156fa53f2d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: Peter Sutton <foxxy(at)foxdogstudios(dot)com>
+# Maintainer: Peter Sutton <peter(at)foxdogstudios(dot)com>
 # Contributor: Daniele Paolella <danielepaolella(at)email(dot)it>
 # Contributor: Artem Borisovskiy
 
 pkgname=hydrogen-drumkits
 pkgver=20191129
-pkgrel=1
+pkgrel=2
 pkgdesc='Hydrogen drum kits'
 arch=(any)
 url='https://sourceforge.net/projects/hydrogen/'
@@ -12,6 +12,7 @@ license=('GPL2')
 depends=(hydrogen)
 changelog=ChangeLog
 
+
 _drumkits=(
     '3355606kit'
     'BJA_Pacific'
@@ -24,7 +25,7 @@ _drumkits=(
     'ElectricEmpireKit'
     'ErnysPercussion'
     'ForzeeStereo'
-    # 'Gimme A Hand 1.0'
+    'Gimme A Hand 1.0'
     'HardElectro1'
     'HipHop-1'
     'HipHop-2'
@@ -44,46 +45,44 @@ _drumkits=(
     'circAfrique v4'
 )
 
-_subhost='netcologne'
+_subhost='deac-ams'
 _host="https://$_subhost.dl.sourceforge.net"
-_path='/project/hydrogen/Sound Libraries/Main sound libraries'
+_path='/project/hydrogen/Sound%20Libraries/Main%20sound%20libraries'
 _base=$_host$_path
 
 for _drumkit in "${_drumkits[@]}"; do
-    source+=( "$_base/$_drumkit.h2drumkit" )
+    source+=( "$_drumkit.h2drumkit::$_base/${_drumkit// /%20}.h2drumkit" )
 done
 
-sha256sums=(
-    '96b1d325fd52e97d7b99ca9191cb376e430ecea1f83d12281f314e30f20fa121'
-    'a485753a2a60a1ce30e782784c0f26a84bbbee6bdb324b40c04a1f09f3668305'
-    '5debdfb050f639478725af134d315649f242142f84691ce1409cd9f56f6943be'
-    '3e95845d821129b119dea47fd56eadbb17da74b3a95a2154cac31a037b8a6f66'
-    '6be9d2dba736bfcbc85e31ecf744c74b6620143e4fdc198309c4786951077391'
-    '30d30e6c9aeb25597454034cee58495b410a8f95b3d689c9a0c4e2915af7871f'
-    '7ae4f8e7bf52b84637100b6f781e94752ad738626cff912c7704522ea692fbe7'
-    '14ed0cd45097471e3f9775958f40441c1c2886d5594e0111e2b0b7e63b5da00f'
-    '7229f52268483119c3a8b1e62dc85f801e37b6c34834e8c603d8aaec0445c5f9'
-    'daccb09332bf6aac09b83f9605a084120a9decff1447d02cc68d16b00f101546'
-    '37b9f1d6d8fdf2a65aef5fcde5ac305c89983e1e23ce5b8194922640cce9146d'
-    # '77285a6bf6b12684a8b38ea7d2850e7be9f0c8102101f4eb74b92cc08a5f023d'
-    'cfde7e4c7a25f0d72d0674b4d849471b9d309e28372709b509e743aad8c30d5c'
-    'd194d2d47cd33d09842ecb6db74783aaa89368e69a964868c7fd2feb3e1b7613'
-    'e2c586017bc4952976b8af5447435e7fa5109308861b5f5be3213d86346bd972'
-    'ad88e46d6e07a046cb5443e5bea4cc7645be992fc85e24853372cf5562c5ee24'
-    'f41377b32b154c809984e11ebaf0b7cfd9bac2ecc26b78c8de7c9bbd243f9310'
-    'c43d5b25938e95bcce4a204892e668b289f419b993e006bdf3f28c9c374b10c9'
-    'c81cebee6a4d0df70fee7456c13bbdfe2c50b39b62888cb03c0768f885eb74dd'
-    '5927572af24f9a2737f94c7c8e816e22d6b28f00e19d575495c1a97351a79096'
-    'cffa12c5a176d9c9532bafacba773c0a0f7e2fe71ea5a14dae402d2de0726ccb'
-    'adcc4a3023708fab46108acfc99dfc04e2b2b62bb21aa87ed8a027ccbb46b576'
-    '4e9400c2bb7d06f0271bcbf2e052235fe8500095d6e6dfcd8fcb0593571f110b'
-    '4637f0c39b488074943030d6cb0274f3e35d1da221eb6d078c15ea118f4e496d'
-    '83e072ef8e8783d861ce500a8082161392e49853a54335823e1cd7f7874c8504'
-    '4fb52d1bbdda886db4b742c6de33d7475ef5088076c18533bd705c588f69a87b'
-    'ed7bfa21abc05712ea89860b7e680808d14d567d49377fbc65914a9dd518e14d'
-    '17005f5c79d92af3caef52ea313b1ac5bc49f1eefa4462b22980dec2b031bf27'
-    'f09ff7e46310409b8ec7f180193cda6bb69e2a67d5e7f78f8c1c1954bb9a3a2c'
-)
+sha256sums=('96b1d325fd52e97d7b99ca9191cb376e430ecea1f83d12281f314e30f20fa121'
+            'a485753a2a60a1ce30e782784c0f26a84bbbee6bdb324b40c04a1f09f3668305'
+            '5debdfb050f639478725af134d315649f242142f84691ce1409cd9f56f6943be'
+            '3e95845d821129b119dea47fd56eadbb17da74b3a95a2154cac31a037b8a6f66'
+            '6be9d2dba736bfcbc85e31ecf744c74b6620143e4fdc198309c4786951077391'
+            '30d30e6c9aeb25597454034cee58495b410a8f95b3d689c9a0c4e2915af7871f'
+            '7ae4f8e7bf52b84637100b6f781e94752ad738626cff912c7704522ea692fbe7'
+            '14ed0cd45097471e3f9775958f40441c1c2886d5594e0111e2b0b7e63b5da00f'
+            '7229f52268483119c3a8b1e62dc85f801e37b6c34834e8c603d8aaec0445c5f9'
+            'daccb09332bf6aac09b83f9605a084120a9decff1447d02cc68d16b00f101546'
+            '37b9f1d6d8fdf2a65aef5fcde5ac305c89983e1e23ce5b8194922640cce9146d'
+            'f0cd2e52f0dbc8d6a001f203ee47cd691d8d028d30501ce332a52659aa62a07a'
+            'cfde7e4c7a25f0d72d0674b4d849471b9d309e28372709b509e743aad8c30d5c'
+            'd194d2d47cd33d09842ecb6db74783aaa89368e69a964868c7fd2feb3e1b7613'
+            'e2c586017bc4952976b8af5447435e7fa5109308861b5f5be3213d86346bd972'
+            'ad88e46d6e07a046cb5443e5bea4cc7645be992fc85e24853372cf5562c5ee24'
+            'f41377b32b154c809984e11ebaf0b7cfd9bac2ecc26b78c8de7c9bbd243f9310'
+            'c43d5b25938e95bcce4a204892e668b289f419b993e006bdf3f28c9c374b10c9'
+            'c81cebee6a4d0df70fee7456c13bbdfe2c50b39b62888cb03c0768f885eb74dd'
+            '5927572af24f9a2737f94c7c8e816e22d6b28f00e19d575495c1a97351a79096'
+            'cffa12c5a176d9c9532bafacba773c0a0f7e2fe71ea5a14dae402d2de0726ccb'
+            'adcc4a3023708fab46108acfc99dfc04e2b2b62bb21aa87ed8a027ccbb46b576'
+            '4e9400c2bb7d06f0271bcbf2e052235fe8500095d6e6dfcd8fcb0593571f110b'
+            '4637f0c39b488074943030d6cb0274f3e35d1da221eb6d078c15ea118f4e496d'
+            '83e072ef8e8783d861ce500a8082161392e49853a54335823e1cd7f7874c8504'
+            '4fb52d1bbdda886db4b742c6de33d7475ef5088076c18533bd705c588f69a87b'
+            'ed7bfa21abc05712ea89860b7e680808d14d567d49377fbc65914a9dd518e14d'
+            '17005f5c79d92af3caef52ea313b1ac5bc49f1eefa4462b22980dec2b031bf27'
+            'f09ff7e46310409b8ec7f180193cda6bb69e2a67d5e7f78f8c1c1954bb9a3a2c')
 
 package() {
     local _drumkitsdir="$pkgdir/usr/share/hydrogen/data/drumkits"