upgpkg: servo-git 43157.858bb432988-2

Cleanup coding style (no build fixes yet)

2 files changed, 81 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4255a3996c5..ab2c3f0864cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,39 +4,38 @@ pkgbase = servo-git
 	pkgrel = 2
 	url = https://github.com/servo/servo
 	install = servo-git.install
-	arch = i686
 	arch = x86_64
+	arch = i686
 	license = MPL
-	makedepends = git
+	makedepends = autoconf2.13
+	makedepends = clang
+	makedepends = cmake
 	makedepends = curl
-	makedepends = python2
-	makedepends = python2-virtualenv
-	makedepends = gperf
 	makedepends = depot-tools-git
-	makedepends = cmake
-	makedepends = rustup
-	makedepends = clang
-	makedepends = autoconf2.13
+	makedepends = git
+	makedepends = gperf
 	makedepends = llvm
+	makedepends = python2
 	makedepends = python2-distlib
+	makedepends = python2-virtualenv
+	makedepends = rustup
+	depends = bzip2
+	depends = fontconfig
 	depends = freetype2
-	depends = mesa
-	depends = libxrandr
-	depends = libxi
-	depends = libgl
 	depends = glu
-	depends = fontconfig
-	depends = ttf-font
-	depends = bzip2
+	depends = gst-plugins-bad
+	depends = libgl
 	depends = libxcursor
+	depends = libxi
 	depends = libxmu
-	depends = xcb-util
+	depends = libxrandr
+	depends = mesa
 	depends = python-dbus
-	depends = gst-plugins-bad
+	depends = ttf-font
+	depends = xcb-util
 	provides = servo
 	conflicts = servo
-	source = git+https://github.com/servo/servo.git
-	md5sums = SKIP
+	source = servo-git::git+https://github.com/servo/servo.git
+	sha256sums = SKIP
 
 pkgname = servo-git
-
diff --git a/PKGBUILD b/PKGBUILD
index d5a681dd2c35..a7437332f34e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Maintainer: Jiachen YANG <farseerfc@gmail.com>
 # Contributor: Vlad M. <vlad@archlinux.net>
 # Contributor: beatgammit
@@ -5,61 +6,75 @@
 _install_libs=false
 
 pkgname=servo-git
-_pkgname=servo
 pkgver=43157.858bb432988
 pkgrel=2
-pkgdesc="Parallel Browser Project: web browser written in Rust"
-arch=('i686' 'x86_64')
-url="https://github.com/servo/servo"
-license=('MPL')
-depends=('freetype2' 'mesa' 'libxrandr' 'libxi' 'libgl' 'glu' 'fontconfig' 'ttf-font' 'bzip2' 'libxcursor' 'libxmu' 'xcb-util' 'python-dbus' 'gst-plugins-bad')
+pkgdesc='Parallel Browser Project: web browser written in Rust'
+arch=(x86_64 i686)
+url=https://github.com/servo/servo
+license=(MPL)
+depends=(bzip2
+         fontconfig
+         freetype2
+         glu
+         gst-plugins-bad
+         libgl
+         libxcursor
+         libxi
+         libxmu
+         libxrandr
+         mesa
+         python-dbus
+         ttf-font
+         xcb-util)
 install="$pkgname.install"
-makedepends=('git' 'curl' 'python2' 'python2-virtualenv' 'gperf' 'depot-tools-git' 'cmake' 'rustup' 'clang' 'autoconf2.13' 'llvm' 'python2-distlib')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-_branch=servo
-source=(
-'git+https://github.com/servo/servo.git'
-)
-md5sums=('SKIP')
+makedepends=(autoconf2.13
+             clang
+             cmake
+             curl
+             depot-tools-git
+             git
+             gperf
+             llvm
+             python2
+             python2-distlib
+             python2-virtualenv
+             rustup)
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("$pkgname::git+$url.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$_branch"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+	cd "$pkgname"
+	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 build() {
-  cd "$_branch"
-  
-  # fixes build error
-  # possibly _FORTIFY_SOURCE? https://bugs.archlinux.org/task/34759
-  #unset CPPFLAGS
-
-  ./mach build --release
+	cd "$pkgname"
+	# fixes build error
+	# possibly _FORTIFY_SOURCE? https://bugs.archlinux.org/task/34759
+	#unset CPPFLAGS
+	./mach build --release
 }
 
 package() {
-  servopath=$_branch/target/release
-  install -Dm755 "$servopath/servo" "$pkgdir/opt/servo/servo"
-
-  if [ "$_install_libs" = true ] ; then
-      mkdir -p "$pkgdir/usr/lib"
-
-      find "$servopath/deps" -name "*-*.so" -exec basename {} \; | sort | uniq | while read _f; do
-          _file=$(find "$servopath/deps" -name "$_f" -print | head -n 1)
-          if [ -z "$_file" ]; then
-       	      echo "Skipping: $_f"
-              continue
-          fi
-          install -Dm644 "$_file" "$pkgdir/usr/lib"
-      done
-  fi
-
-  mkdir -p "$pkgdir/opt/servo/resources"
-  cp -r $_branch/resources/* "$pkgdir/opt/servo/resources"
-
-  mkdir -p "$pkgdir/etc/profile.d" 
-  echo 'export PATH=$PATH:/opt/servo' > "$pkgdir/etc/profile.d/${_pkgname}.sh"
-  echo 'setenv PATH ${PATH}:/opt/servo' > "$pkgdir/etc/profile.d/${_pkgname}.csh"
-  chmod 755 "$pkgdir/etc/profile.d/${_pkgname}".{csh,sh}
+	servopath=$pkgname/target/release
+	install -Dm755 "$servopath/servo" "$pkgdir/opt/servo/servo"
+	if [ "$_install_libs" = true ] ; then
+		mkdir -p "$pkgdir/usr/lib"
+		find "$servopath/deps" -name "*-*.so" -exec basename {} \; | sort | uniq | while read _f; do
+			_file=$(find "$servopath/deps" -name "$_f" -print | head -n 1)
+			if [ -z "$_file" ]; then
+				echo "Skipping: $_f"
+				continue
+			fi
+			install -Dm644 "$_file" "$pkgdir/usr/lib"
+		done
+	fi
+	mkdir -p "$pkgdir/opt/servo/resources"
+	cp -r $pkgname/resources/* "$pkgdir/opt/servo/resources"
+	mkdir -p "$pkgdir/etc/profile.d"
+	echo 'export PATH=$PATH:/opt/servo' > "$pkgdir/etc/profile.d/${pkgname%-git}.sh"
+	echo 'setenv PATH ${PATH}:/opt/servo' > "$pkgdir/etc/profile.d/${pkgname%-git}.csh"
+	chmod 755 "$pkgdir/etc/profile.d/${pkgname%-git}".{csh,sh}
 }