add dagmc, nuclear data, and cad_to_openmc as dependencies

2 files changed, 74 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 341d7011e9bc..dd8ebd337eb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,34 @@
 pkgbase = openmc-git
-	pkgdesc = Community-developed Monte Carlo neutron and photon transport simulation code
-	pkgver = r11702.e91a6aac1
+	pkgdesc = The OpenMC project aims to provide a fully-featured Monte Carlo particle transport code based on modern methods.
+	pkgver = v0.13.2.r497.g6218becb1
 	pkgrel = 1
 	url = https://github.com/openmc-dev/openmc
-	arch = any
+	arch = x86_64
 	license = MIT
 	makedepends = cmake
 	makedepends = git
+	makedepends = python
+	makedepends = python-numpy
 	makedepends = python-setuptools
-	depends = hdf5
-	depends = python-numpy
-	depends = python-matplotlib
+	depends = python-lxml
 	depends = python-scipy
 	depends = python-pandas
-	depends = python-h5py
+	depends = python-matplotlib
 	depends = python-uncertainties
-	depends = python-lxml
-	depends = pugixml
-	depends = fmt
-	provides = openmc
-	provides = libopenmc.so
+	depends = embree
+	depends = libxrender
+	depends = libxcursor
+	depends = libxft
+	depends = libxinerama
+	depends = freecad
+	depends = glu
+	depends = openssh
+	depends = dagmc-git
+	depends = nuclear-data
+	depends = python-cad_to_openmc
+	provides = openmc-git
+	conflicts = openmc-git
 	source = openmc-git::git+https://github.com/openmc-dev/openmc.git
-	sha1sums = SKIP
+	md5sums = b1d793bbb7d0568c8d2e86b867dd12df
 
 pkgname = openmc-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 95ff98f163d5..36e123e6f508 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,65 @@
-# Maintainer: Gavin Ridley <gavin.keith.ridley@gmail.com>
+# Maintainer: Gavin Ridley <gavin dot keith dot ridley at gmail dot com>
+# Maintainer: Luke Labrie-Cleary <luke dot cleary at copenhagenatomics dot com>
 pkgname=openmc-git
-pkgver=r11702.e91a6aac1
+pkgver=v0.13.2.r497.g6218becb1
 pkgrel=1
-pkgdesc="Community-developed Monte Carlo neutron and photon transport simulation code"
-arch=('any')
+pkgdesc="The OpenMC project aims to provide a fully-featured Monte Carlo particle 
+		 transport code based on modern methods."
+arch=('x86_64')
 url="https://github.com/openmc-dev/openmc"
 license=('MIT')
-makedepends=('cmake' 'git' 'python-setuptools')
-depends=('hdf5' 'python-numpy' 'python-matplotlib' 'python-scipy'
-    'python-pandas' 'python-h5py' 'python-uncertainties' 'python-lxml' 'pugixml' 'fmt')
-provides=("${pkgname%-git}" "libopenmc.so")
+
 source=("${pkgname}::git+${url}.git")
-noextract=()
-sha1sums=('SKIP')
 pkgver() {
-	cd "${srcdir}/${pkgname}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
+md5sums=('b1d793bbb7d0568c8d2e86b867dd12df')
+
+depends=(
+	python-lxml
+	python-scipy
+	python-pandas
+	python-matplotlib
+	python-uncertainties
+	embree
+	libxrender 
+	libxcursor 
+	libxft 
+	libxinerama 
+	freecad 
+	glu
+	openssh
+	dagmc-git
+	nuclear-data
+	python-cad_to_openmc
+)
+makedepends=(
+    cmake
+    git
+    python
+    python-numpy
+    python-setuptools
+)
+
+provides=("${pkgname%-pkgver}")
+conflicts=(
+	openmc-git
+	)
+
 build() {
-    printf "build"
-    printf "%s" "${pkgname}"
-    printf "%s" "${pkgname%-git}"
-	cd "${srcdir}/${pkgname}"
-    python setup.py build
-    mkdir -p build
-    cd build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+    cd $srcdir/${pkgname}
+    mkdir build && cd build
+    cmake .. -DOPENMC_USE_DAGMC=ON \
+             -DDAGMC_ROOT=/opt/DAGMC \
+             -DOPENMC_USE_MPI=ON \
+             -DHDF5_PREFER_PARALLEL=ON \
+	     -DCMAKE_INSTALL_PREFIX=${pkgdir}/opt/openmc
     make
 }
+
 package() {
-	cd "${srcdir}/${pkgname}/build"
-	make DESTDIR="${pkgdir}" install
-    cd ..
-    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	cd $srcdir/${pkgname}/build 
+	make install
+	pip install ../
 }