first working(?) build

4 files changed, 63 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d192e9d06dbd..194ad6f62dd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,34 @@
 # Generated by mksrcinfo v8
-# Mon Nov 21 06:22:23 UTC 2016
+# Sat Dec 31 01:39:37 UTC 2016
 pkgbase = bdisk
 	pkgdesc = An easy liveCD creator built in python. Supports hybrid ISOs/USB, iPXE, and UEFI (undergoing rewrite)
-	pkgver = 2.70
-	pkgrel = 2
+	pkgver = 3.00
+	pkgrel = 1
 	url = https://bdisk.square-r00t.net
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = python
-	depends = python
 	depends = dosfstools
 	depends = gcc-multilib
 	depends = gcc-libs-multilib
 	depends = git
 	depends = libisoburn
-	depends = mtools
-	depends = rsync
+	depends = dosfstools
 	depends = squashfs-tools
-	depends = syslinux
-	source = https://git.square-r00t.net/BDisk/snapshot/BDisk-2.70.tar.bz2
-	source = BDisk-2.70.tar.bz2.sig
-	sha512sums = 1c310438c95ec2dc5daa3b8af37fa64a2e88bd06fd7478009bb3b13d506a06eeb7399a3069744e5875565b4ad0fe57a95213f24c910bd63583ad23dda257e13d
+	depends = python
+	depends = python-validators
+	depends = python-jinja
+	depends = python-psutil
+	depends = python-humanize
+	optdepends = rsync: for rsync syncing
+	optdepends = syslinux: for ipxe support
+	optdepends = python-gitpython: for ipxe and git sync support
+	optdepends = python-pygpgme: for GPG support
+	optdepends = python-patch: for ipxe support
+	optdepends = python-pyopenssl: for iPXE support
+	source = https://git.square-r00t.net/BDisk/snapshot/BDisk-3.00-BETA.tar.bz2
+	source = BDisk-3.00-BETA.tar.bz2.sig
+	sha512sums = ffdfc612891a13b9a82835e4fda6ea5d734bc0bdfa310c81c9ef428c0868f96f77a9ea37b99b55d7bc14b5826e3a80ef1bf6c04704c602a154ed23688667e25c
 	sha512sums = SKIP
 
 pkgname = bdisk
diff --git a/BDisk-2.70.tar.bz2.sig b/BDisk-2.70.tar.bz2.sig
deleted file mode 100644
index 7f2d253412f7..000000000000
--- a/BDisk-2.70.tar.bz2.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJYMpH3AAoJEIwATC+TSB9rQTEQALOF6UGInPfY8OVNlLcJREq2
-eeeH3cqpoBCY2r0BxK5WpRXzI6Y8MayZbqI45ahxMrTodqVnsZtLt+197QGwfApe
-Greg/M805ZusT2vhuq7LY5wVYv0qVQHH7+a8yEOf1rUykPhoVzr2c9X2+fUsc/JT
-KqL6uLiN5wj25boRcveLcCgHc6aQjVh1vTxEM/fQ2L9ZQuUxYf1NfCxlxLrtF02Y
-uCbEncsxWsQZaVdi4vR5NQ4zNnX7CtVTb7L7wlD8UFii+Ysp+PUmXiq1/rDODy8f
-bWkHHRKg+d5ZIBp5Hq4h+EO8Vy5g14Q7iH2AmnOuKh1N5OeQTF+8I4wVwNpH6P4i
-Z8wnS9YQIosEpH6N1jyAimAAM2T29QleHMkjJiJUI76EIlbmqoTB/CXKFVtHq7KW
-PiCUaJ5PDXjbX6Via6z9dtwBICjjLQmvgaXiftOtt2106EZH7wujql7/ZaYdeaOI
-OtGEBBrVoRxAoF4FzQBAZ5AxyCUydHuCRgHSw4iWoxJ+cfbOQ2/D/89Ag+VksBOV
-5pJBf1/GR1hL07Jr16rUdSAjDELmseB/9UcKJEy3wjX1rucxq+a1XslZua0v4QwM
-c//J00WunGc4vEqpNgrKiKsoGndmS3xKXqrHTZ3xw1jii8KYlB5h0RzjCJW1WKdq
-JUYwoOfy/mkPZ8ZJrmnC
-=a2rz
------END PGP SIGNATURE-----
diff --git a/BDisk-3.00-BETA.tar.bz2.sig b/BDisk-3.00-BETA.tar.bz2.sig
new file mode 100644
index 000000000000..71a543b5a019
--- /dev/null
+++ b/BDisk-3.00-BETA.tar.bz2.sig
diff --git a/PKGBUILD b/PKGBUILD
index 2ca12fb9a0f7..4880a0863101 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,58 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
 # News updates for packages can be followed at https://devblog.square-r00t.net
 pkgname=bdisk
-pkgver=2.70
-pkgrel=2
+pkgver=3.00
+pkgrel=1
+#_pkgver=${pkgver}
+_pkgver=${pkgver}-BETA
 pkgdesc="An easy liveCD creator built in python. Supports hybrid ISOs/USB, iPXE, and UEFI (undergoing rewrite)"
 arch=( 'i686' 'x86_64' )
 url="https://bdisk.square-r00t.net"
 license=( 'GPL3' )
-depends=( 'python' 'dosfstools' 'gcc-multilib' 'gcc-libs-multilib' 'git' 'libisoburn' 'mtools' 'rsync' 'squashfs-tools' 'syslinux' )
-makedepends=( 'python' )
-_pkgname=bdisk
+depends=('dosfstools'
+	'gcc-multilib'
+	'gcc-libs-multilib'
+	'git'
+	'libisoburn'
+	'dosfstools'
+	'squashfs-tools'
+	'python'
+	'python-validators'
+	'python-jinja'
+	'python-psutil'
+	'python-humanize')
+#makedepends=( 'python' )
+makedepends=()
+_pkgname=BDisk
 install=
 changelog=
 noextract=()
-source=("https://git.square-r00t.net/BDisk/snapshot/BDisk-2.70.tar.bz2"
-        "BDisk-2.70.tar.bz2.sig")
-sha512sums=('1c310438c95ec2dc5daa3b8af37fa64a2e88bd06fd7478009bb3b13d506a06eeb7399a3069744e5875565b4ad0fe57a95213f24c910bd63583ad23dda257e13d'
+optdepends=('rsync: for rsync syncing'
+	'syslinux: for ipxe support'
+	'python-gitpython: for ipxe and git sync support'
+	'python-pygpgme: for GPG support'
+	'python-patch: for ipxe support'
+	'python-pyopenssl: for iPXE support')
+source=("https://git.square-r00t.net/${_pkgname}/snapshot/${_pkgname}-${_pkgver}.tar.bz2"
+        "${_pkgname}-${_pkgver}.tar.bz2.sig")
+sha512sums=('ffdfc612891a13b9a82835e4fda6ea5d734bc0bdfa310c81c9ef428c0868f96f77a9ea37b99b55d7bc14b5826e3a80ef1bf6c04704c602a154ed23688667e25c'
             'SKIP')
-build() {
-	echo "TODO: This package doesn't install in a meaningful way. However, it will soon be a python package and CLI utility."
-}
 package() {
-	echo "TODO: This package doesn't install in a meaningful way. However, it will soon be a python package and CLI utility."
+
+	install -d -m0750 ${pkgdir}/etc/${pkgname}
+	install -d -m0755 ${pkgdir}/usr/share/${pkgname}
+	install -d -m0755 ${pkgdir}/usr/share/doc/${pkgname}
+	install -d -m0755 ${pkgdir}/var/lib/${pkgname}
+	install -d -m0755 ${pkgdir}/usr/bin
+
+	cp -af ${srcdir}/${_pkgname}-${_pkgver}/docs/* ${pkgdir}/usr/share/doc/${pkgname}/.
+	cp -af ${srcdir}/${_pkgname}-${_pkgver}/examples ${pkgdir}/usr/share/doc/${pkgname}/.
+	curl -s -o ${pkgdir}/usr/share/doc/README.html https://bdisk.square-r00t.net/
+	cp -af ${srcdir}/${_pkgname}-${_pkgver}/overlay ${pkgdir}/var/lib/${pkgname}/.
+	cp -af ${srcdir}/${_pkgname}-${_pkgver}/extra ${pkgdir}/var/lib/${pkgname}/.
+	cp -af ${srcdir}/${_pkgname}-${_pkgver}/${pkgname}/* ${pkgdir}/usr/share/${pkgname}/.
+	mv -f ${pkgdir}/var/lib/${pkgname}/extra/pkg.build.ini ${pkgdir}/etc/${pkgname}/dist.build.ini
+	rm -f ${pkgdir}/var/lib/${pkgname}/extra/dist.build.ini
+	ln -sf /usr/share/bdisk/bdisk.py ${pkgdir}/usr/bin/bdisk
+
 }