From 4aa11922894aa0a7021f13ff22ba030e8f1acd8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 16 Aug 2015 03:59:18 +0200
Subject: [PATCH] qmc2: fix download location

+ split flyers and snapshots into separate packages
---
 srcpkgs/qmc2-flyers             |  1 -
 srcpkgs/qmc2-flyers/template    | 17 +++++++++++++++++
 srcpkgs/qmc2-snapshots          |  1 -
 srcpkgs/qmc2-snapshots/template | 17 +++++++++++++++++
 srcpkgs/qmc2/template           | 30 ++++--------------------------
 5 files changed, 38 insertions(+), 28 deletions(-)
 delete mode 120000 srcpkgs/qmc2-flyers
 create mode 100644 srcpkgs/qmc2-flyers/template
 delete mode 120000 srcpkgs/qmc2-snapshots
 create mode 100644 srcpkgs/qmc2-snapshots/template

diff --git a/srcpkgs/qmc2-flyers b/srcpkgs/qmc2-flyers
deleted file mode 120000
index d1a18a5421..0000000000
--- a/srcpkgs/qmc2-flyers
+++ /dev/null
@@ -1 +0,0 @@
-qmc2
\ No newline at end of file
diff --git a/srcpkgs/qmc2-flyers/template b/srcpkgs/qmc2-flyers/template
new file mode 100644
index 0000000000..9f7bf9b319
--- /dev/null
+++ b/srcpkgs/qmc2-flyers/template
@@ -0,0 +1,17 @@
+# Template file for 'qmc2-flyers'
+pkgname=qmc2-flyers
+version=20150604
+revision=1
+create_wrksrc=yes
+short_desc="Qt M.A.M.E. Catalog/Launcher II - flyers"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="GPL-2"
+homepage="http://qmc2.arcadehits.net/wordpress/"
+distfiles="http://distfiles.voidlinux.de/distfiles/qmc2_flyers-${version}.tar.xz"
+checksum="e36ecd9eaef60f94207fad8cdc323b114fbd9581feeb03de437df8146dd6cf8e"
+noarch=yes
+
+do_install() {
+	mkdir -p ${DESTDIR}/usr/share/qmc2
+	mv -v fly ${DESTDIR}/usr/share/qmc2
+}
diff --git a/srcpkgs/qmc2-snapshots b/srcpkgs/qmc2-snapshots
deleted file mode 120000
index d1a18a5421..0000000000
--- a/srcpkgs/qmc2-snapshots
+++ /dev/null
@@ -1 +0,0 @@
-qmc2
\ No newline at end of file
diff --git a/srcpkgs/qmc2-snapshots/template b/srcpkgs/qmc2-snapshots/template
new file mode 100644
index 0000000000..e7a9a9bb1b
--- /dev/null
+++ b/srcpkgs/qmc2-snapshots/template
@@ -0,0 +1,17 @@
+# Template file for 'qmc2-snapshots'
+pkgname=qmc2-snapshots
+version=20150604
+revision=1
+create_wrksrc=yes
+short_desc="Qt M.A.M.E. Catalog/Launcher II - snapshots"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="GPL-2"
+homepage="http://qmc2.arcadehits.net/wordpress/"
+distfiles="http://distfiles.voidlinux.de/distfiles/qmc2_snapshots-${version}.tar.xz"
+checksum="421815fce90013ebd8c63f9a597bca6efa360058f0de7fc50eb7770c0367d962"
+noarch=yes
+
+do_install() {
+	mkdir -p ${DESTDIR}/usr/share/qmc2
+	mv -v prv ${DESTDIR}/usr/share/qmc2
+}
diff --git a/srcpkgs/qmc2/template b/srcpkgs/qmc2/template
index 9fb15612b4..d604efad60 100644
--- a/srcpkgs/qmc2/template
+++ b/srcpkgs/qmc2/template
@@ -1,7 +1,7 @@
 # Template file for 'qmc2'
 pkgname=qmc2
 version=0.54
-revision=1
+revision=2
 wrksrc=${pkgname}
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr DATADIR=/usr/share MAN_DIR=/usr/share/man TARGET=qmc2-mame"
@@ -9,18 +9,14 @@ make_install_args="${make_build_args}"
 hostmakedepends="rsync unzip"
 makedepends="SDL2-devel qt5-multimedia-devel qt5-script-devel qt5-svg-devel
  qt5-webkit-devel qt5-xmlpatterns-devel qt5-x11extras-devel"
-depends="rsync ${pkgname}-data mame"
+depends="rsync ${pkgname}-data mame qmc2-flyers qmc2-snapshots"
 conf_files="/etc/${pkgname}/${pkgname}.ini"
 short_desc="Qt M.A.M.E. Catalog/Launcher II"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"
 homepage="http://qmc2.arcadehits.net/wordpress/"
-distfiles="http://qmc2.arcadehits.net/sf.net/${pkgname}-${version}.tar.bz2
- http://distfiles.voidlinux.de/distfiles/qmc2_flyers-20150604.tar.xz
- http://distfiles.voidlinux.de/distfiles/qmc2_snapshots-20150604.tar.xz"
-checksum="daf46a7eca538209c1cbbce8d316754d7e82d10c8d34e7dfe0b8828946b5e5e7
- e36ecd9eaef60f94207fad8cdc323b114fbd9581feeb03de437df8146dd6cf8e
- 421815fce90013ebd8c63f9a597bca6efa360058f0de7fc50eb7770c0367d962"
+distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
+checksum="daf46a7eca538209c1cbbce8d316754d7e82d10c8d34e7dfe0b8828946b5e5e7"
 
 pre_build() {
 	# Replace sdl-config with sdl2-config
@@ -83,21 +79,3 @@ qmc2-data_package() {
 		done
 	}
 }
-qmc2-flyers_package() {
-	noarch=yes
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - machine flyers images"
-	pkg_install() {
-		mkdir -p ${PKGDESTDIR}/usr/share/qmc2
-		mv -v ${XBPS_BUILDDIR}/fly ${PKGDESTDIR}/usr/share/qmc2
-	}
-}
-qmc2-snapshots_package() {
-	noarch=yes
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - machine preview images (snapshots)"
-	pkg_install() {
-		mkdir -p ${PKGDESTDIR}/usr/share/qmc2
-		mv -v ${XBPS_BUILDDIR}/prv ${PKGDESTDIR}/usr/share/qmc2
-	}
-}