formatting change in PKGBUILD

2 files changed, 105 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 961152d3a4cf..60eb8f069d45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,46 +6,45 @@ pkgbase = scipion-git
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	depends = gcc
 	depends = cmake
+	depends = fftw
+	depends = freeglut
+	depends = gawk
+	depends = gcc
+	depends = gnuplot
+	depends = gsl
 	depends = jdk8-openjdk
+	depends = lapack
+	depends = lib32-gcc-libs
+	depends = libjpeg6-turbo
 	depends = libxft
 	depends = libxml++
 	depends = libxslt
-	depends = openmpi
-	depends = gsl
 	depends = make
-	depends = libjpeg6-turbo
-	depends = tk
-	depends = python2
-	depends = lib32-gcc-libs
 	depends = openjpeg2
-	depends = gnuplot
-	depends = gawk
-	depends = lapack
-	depends = freeglut
-	depends = fftw
-	optdepends = relion
-	optdepends = simple2
-	optdepends = gctf
+	depends = openmpi
+	depends = python2
+	depends = tk
 	optdepends = ctffind3-ctftilt
-	optdepends = motioncor2
 	optdepends = ctffind4
-	optdepends = ucsf-chimera
+	optdepends = eman2
+	optdepends = gctf
+	optdepends = motioncor2
+	optdepends = relion
 	optdepends = resmap
+	optdepends = simple2
 	optdepends = spiderweb
 	optdepends = summovie
-	optdepends = eman2
+	optdepends = ucsf-chimera
 	optdepends = unblur
-	provides = scipion-git
-	conflicts = scipion-git
+	provides = scipion
+	conflicts = scipion
 	options = !strip
 	source = git+https://github.com/I2PC/scipion.git
-	source = scipion.sh
 	source = scipion.csh
+	source = scipion.sh
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = scipion-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c90355174110..717a1b9b1bfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,99 @@
-# Maintainer: Joshua Hardy <joshinsilico@gmail.com>
-pkgname=scipion-git
+# Contributr Joshua Hardy <joshinsilico@gmail.com>
+
+pkgname='scipion-git'
 pkgver=v1.0.1.r12.1dfd3db7fa
 pkgrel=1
 pkgdesc="An integrative software platform used to obtain 3D models of macromolecular complexes using Electron Microscopy (3DEM)"
-arch=(x86_64)
+arch=('x86_64')
 url="https://github.com/I2PC/scipion"
 license=('GPL')
-groups=()
-depends=('gcc' 'cmake' 'jdk8-openjdk' 'libxft' 'libxml++' 'libxslt' 'openmpi' 'gsl' 'make' 'libjpeg6-turbo' 'tk' 'python2' 'lib32-gcc-libs' 'openjpeg2' 'gnuplot' 'gawk' 'lapack' 'freeglut' 'fftw')
-makedepends=('git') # 'bzr', 'git', 'mercurial' or 'subversion'
-provides=("${pkgname%-VCS}")
-conflicts=("${pkgname%-VCS}")
-optdepends=('relion' 'simple2' 'gctf' 'ctffind3-ctftilt' 'motioncor2' 'ctffind4' 'ucsf-chimera' 'resmap' 'spiderweb' 'summovie' 'eman2' 'unblur')
-replaces=()
-backup=()
-options=(!strip)
-install=
-source=('git+https://github.com/I2PC/scipion.git' 'scipion.sh' 'scipion.csh')
-noextract=()
-md5sums=('SKIP' 'SKIP' 'SKIP')
+depends=(
+  'cmake'
+  'fftw'
+  'freeglut'
+  'gawk'
+  'gcc'
+  'gnuplot'
+  'gsl'
+  'jdk8-openjdk'
+  'lapack'
+  'lib32-gcc-libs'
+  'libjpeg6-turbo'
+  'libxft'
+  'libxml++'
+  'libxslt'
+  'make'
+  'openjpeg2'
+  'openmpi'
+  'python2'
+  'tk'
+)
+makedepends=('git')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+optdepends=(
+  'ctffind3-ctftilt'
+  'ctffind4'
+  'eman2'
+  'gctf'
+  'motioncor2'
+  'relion'
+  'resmap'
+  'simple2'
+  'spiderweb'
+  'summovie'
+  'ucsf-chimera'
+  'unblur'
+)
+options=('!strip')
+source=(
+  'git+https://github.com/I2PC/scipion.git'
+  'scipion.csh'
+  'scipion.sh'
+)
+md5sums=(
+  'SKIP'
+  'SKIP'
+  'SKIP'
+)
 
 pkgver() {
-	cd "$srcdir/scipion"
-	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+  cd "$srcdir/scipion"
+  printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 
 build() {
-	cd "$srcdir/scipion"
-	_NPROC=$(nproc --all)
-	
-	sed -i -e s:"MPI_LIBDIR = /usr/lib64/mpi/gcc/openmpi/lib":"MPI_LIBDIR = /usr/lib/openmpi":g config/templates/scipion.template
-	sed -i -e s:"MPI_INCLUDE = /usr/lib64/mpi/gcc/openmpi/include":"MPI_INCLUDE = /usr/include":g config/templates/scipion.template
-	sed -i -e s:"MPI_BINDIR = /usr/lib64/mpi/gcc/openmpi/bin":"MPI_BINDIR = /usr/bin":g config/templates/scipion.template
-	sed -i -e s:"JAVA_HOME = /usr/lib/jvm/java-7-openjdk":"JAVA_HOME = /usr/lib/jvm/default":g config/templates/scipion.template
-	./scipion config --overwrite
-	#read -p "Press [Enter] key to start installation..."
-	./scipion install -j $_NPROC --no-opencv --no-scipy
-	ln -s  /opt/ucsf-chimera software/em/chimera
-	mkdir software/em/ctffind4
-	ln -s /usr/bin/ctffind software/em/ctffind4/ctffind
-	ln -s /opt/eman2 software/em/eman2.12
-	ln -s /opt/relion software/em/relion-1.4
-	ln -s /opt/resmap software/em/resmap
-	ln -s /opt/simple2 software/em/simple
-	ln -s /opt/spider software/em/spider
-	mkdir -p software/em/summovie/bin
-	ln -s /usr/bin/summovie software/em/summovie/bin/sum_movie_openmp_7_17_15.exe
-	mkdir software/em/unblur
-	ln -s /usr/bin/unblur* software/em/.
+  cd "$srcdir/scipion"
+  _NPROC=$(nproc --all)
+  
+  sed -i -e s:"MPI_LIBDIR = /usr/lib64/mpi/gcc/openmpi/lib":"MPI_LIBDIR = /usr/lib/openmpi":g config/templates/scipion.template
+  sed -i -e s:"MPI_INCLUDE = /usr/lib64/mpi/gcc/openmpi/include":"MPI_INCLUDE = /usr/include":g config/templates/scipion.template
+  sed -i -e s:"MPI_BINDIR = /usr/lib64/mpi/gcc/openmpi/bin":"MPI_BINDIR = /usr/bin":g config/templates/scipion.template
+  sed -i -e s:"JAVA_HOME = /usr/lib/jvm/java-7-openjdk":"JAVA_HOME = /usr/lib/jvm/default":g config/templates/scipion.template
+
+  ./scipion config --overwrite
+
+  ./scipion install -j $_NPROC --no-opencv --no-scipy
+
+  ln -s  /opt/ucsf-chimera software/em/chimera
+  mkdir software/em/ctffind4
+  ln -s /usr/bin/ctffind software/em/ctffind4/ctffind
+  ln -s /opt/eman2 software/em/eman2.12
+  ln -s /opt/relion software/em/relion-1.4
+  ln -s /opt/resmap software/em/resmap
+  ln -s /opt/simple2 software/em/simple
+  ln -s /opt/spider software/em/spider
+  mkdir -p software/em/summovie/bin
+  ln -s /usr/bin/summovie software/em/summovie/bin/sum_movie_openmp_7_17_15.exe
+  mkdir software/em/unblur
+  ln -s /usr/bin/unblur* software/em/.
 }
 
 package() {
-	cd "${srcdir}"/scipion
-	install -d "${pkgdir}"/opt "${pkgdir}"/etc/profile.d
-	cp -r "${srcdir}"/scipion "${pkgdir}"/opt/.
-	install -D -m755 "${srcdir}"/scipion.sh "${pkgdir}"/etc/profile.d/.
-	install -D -m755 "${srcdir}"/scipion.csh "${pkgdir}"/etc/profile.d/.
+  cd "${srcdir}"/scipion
+  install -d "${pkgdir}"/opt "${pkgdir}"/etc/profile.d
+  cp -r "${srcdir}"/scipion "${pkgdir}"/opt/.
+  install -D -m755 "${srcdir}"/scipion.sh "${pkgdir}"/etc/profile.d/.
+  install -D -m755 "${srcdir}"/scipion.csh "${pkgdir}"/etc/profile.d/.
 }