Sorry for the breakage!

3 files changed, 9 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a02bc5b43cf2..d9d494abd75f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Mar 23 05:09:59 UTC 2016
+# Thu Mar 24 16:04:07 UTC 2016
 pkgbase = makepkg-optimize
 	pkgdesc = Additional package optimization routines for makepkg
 	pkgver = 1
@@ -31,7 +31,7 @@ pkgbase = makepkg-optimize
 	sha512sums = 67fb9359cd5dc52413ad2ca7e91b445826d7cf6b7ad3db0d2b3845310ab0bdfc41c2e70cec564e26269521ac313f7202c44996a24266380e48e88927bd1012e2
 	sha512sums = b4896082fd7fc4a69abc5fc98bf22c92a94cef9ccae5d3e5d1825cd3f04dcff1bce622a3f7fdc00bd43b5e1d091825d119b3a91d354f1ab58e6a8fe3af72b0e2
 	sha512sums = bbd4bf3ddbda97008764c1a619aee4f2e3d3476c8affaac75ffee328db452f587454f16158942ec666e2357474a052019e5641ce6d432c43593b3612bdc40af2
-	sha512sums = 5a8083ea14a6a414051602740d1cabf80e77119570b8555194bd921c46a4fce5a7e6611d04a778bfe688e30b0de5ccd6c458299d279476e4ffcc01577959d949
+	sha512sums = 3f1f897e5567b8fcfde0bad44ab9f7646aad248bee655114ad1ac2d64da23aba6a78ca7d82e2a2083909ba7bb8fd788eda05572816c8be3e3772f470a994f51c
 	sha512sums = 3520817c16ea83a4bed28f153138608456267eac0caed250f8d951c54cf6a07d07e5b13768c5165a8e31a56e76919b3c9b84ad3b2905489ce65e625fa067f9b0
 	sha512sums = c2f74ab15214ccac6ae570fa4a4ebfdf35690be60851be9eb8ab65c1ce4ebed0f0d3cb98947fd4a586d19cb399d312390ebbc68f4de86f607adef2a2d590798e
 	sha512sums = 0cbcc6590b901ac33dc78b755300da02070c5abb68153a55eb7b1bf5426dd37286f5831185c53eff189fc689796a234bad84fddc8e8f43edf6b19f13667291c7
diff --git a/03.pgo.patch b/03.pgo.patch
index 50e51153986c..30413fe07297 100644
--- a/03.pgo.patch
+++ b/03.pgo.patch
@@ -30,11 +30,15 @@
  [[ -n ${SRCPKGDEST} ]] && _SRCPKGDEST=$(canonicalize_path ${SRCPKGDEST})
  [[ -n ${LOGDEST} ]] && _LOGDEST=$(canonicalize_path ${LOGDEST})
  [[ -n ${BUILDDIR} ]] && _BUILDDIR=$(canonicalize_path ${BUILDDIR})
-@@ -2109,6 +2125,14 @@ if (( SOURCEONLY )); then
+@@ -2109,6 +2125,18 @@ if (( SOURCEONLY )); then
  	IGNOREARCH=1
  fi
  
-+PROFDEST=${_PROFDEST:-$PROFDEST}
++if [[ "${0##*/}" = "mkchrootpkg" ]]; then
++  PROFDEST=$PWD #default to $PWD for mkchrootpkg; which should only build one package at a time.
++else
++  PROFDEST=${PROFDEST:-$startdir} #default to $startdir if undefined
++fi
 +PROFDEST=${PROFDEST:-$startdir} #default to $startdir if undefined
 +if [[ ! -w $PROFDEST ]] ; then
 +	error "$(gettext "You do not have write permission to store profiles in %s.")" "$PROFDEST"
diff --git a/PKGBUILD b/PKGBUILD
index 1a14333beb9c..5f4730ec6e71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ source=({00.optipng,01.upx,02.lto,03.pgo,04.graphite,05.svgo}.patch
 sha512sums=('67fb9359cd5dc52413ad2ca7e91b445826d7cf6b7ad3db0d2b3845310ab0bdfc41c2e70cec564e26269521ac313f7202c44996a24266380e48e88927bd1012e2'
             'b4896082fd7fc4a69abc5fc98bf22c92a94cef9ccae5d3e5d1825cd3f04dcff1bce622a3f7fdc00bd43b5e1d091825d119b3a91d354f1ab58e6a8fe3af72b0e2'
             'bbd4bf3ddbda97008764c1a619aee4f2e3d3476c8affaac75ffee328db452f587454f16158942ec666e2357474a052019e5641ce6d432c43593b3612bdc40af2'
-            '5a8083ea14a6a414051602740d1cabf80e77119570b8555194bd921c46a4fce5a7e6611d04a778bfe688e30b0de5ccd6c458299d279476e4ffcc01577959d949'
+            '3f1f897e5567b8fcfde0bad44ab9f7646aad248bee655114ad1ac2d64da23aba6a78ca7d82e2a2083909ba7bb8fd788eda05572816c8be3e3772f470a994f51c'
             '3520817c16ea83a4bed28f153138608456267eac0caed250f8d951c54cf6a07d07e5b13768c5165a8e31a56e76919b3c9b84ad3b2905489ce65e625fa067f9b0'
             'c2f74ab15214ccac6ae570fa4a4ebfdf35690be60851be9eb8ab65c1ce4ebed0f0d3cb98947fd4a586d19cb399d312390ebbc68f4de86f607adef2a2d590798e'
             '0cbcc6590b901ac33dc78b755300da02070c5abb68153a55eb7b1bf5426dd37286f5831185c53eff189fc689796a234bad84fddc8e8f43edf6b19f13667291c7'
@@ -64,7 +64,6 @@ prepare() {
 
 package() {
   #makepkg-optimize
-  cd $pkgname
   mkdir -p $pkgdir/usr/{bin,share/makepkg/tidy}/
   install -m755 makepkg-optimize $pkgdir/usr/bin/