Migrate makepkg-optimize2 into makepkg-optimize; this is the best way to deal with my out-of-date troll and pacman-build_env-ext

1 files changed, 28 insertions, 40 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e67e279d6a1d..e0f291eaba53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,28 @@
-# Maintainer: Que Quotion ( quequotion at g mail dot com )
+# Maintainer: Que Quotion ( quequotion@bugmenot.com )
+# Contributor: bartus ( aur\at\bartus.33mail.com )
 
 pkgname=makepkg-optimize
-pkgver=1
-pkgrel=9
-pkgdesc='Additional package optimization routines for makepkg'
-arch=('i686' 'x86_64')
+pkgver=2
+pkgrel=1
+pkgdesc='Supplemental build and packaging optimizations for makepkg'
+arch=('any')
 license=('GPL')
-url='https://projects.archlinux.org/pacman.git/'
-depends=('pacman')
+url='https://bbs.archlinux.org/viewtopic.php?id=210350'
+conflicts=(makepkg-optimize{,2})
+replaces=('makepkg-optimize2')
+depends=('pacman-buildenv_ext-git')
 optdepends=('upx' 'optipng' 'nodejs-svgo' 'graphite')
 backup=(etc/makepkg-optimize.conf)
-source=({00.optipng,01.upx,02.lto,03.pgo,04.graphite,05.svgo}.patch
-        {upx,optipng,svgo}.sh.in
-        {buildenv,destdirs,pkgopts{,-param}}_ext.conf
-        'opticonf.patch' 'compress-param_max.conf')
-sha512sums=('67fb9359cd5dc52413ad2ca7e91b445826d7cf6b7ad3db0d2b3845310ab0bdfc41c2e70cec564e26269521ac313f7202c44996a24266380e48e88927bd1012e2'
-            'b4896082fd7fc4a69abc5fc98bf22c92a94cef9ccae5d3e5d1825cd3f04dcff1bce622a3f7fdc00bd43b5e1d091825d119b3a91d354f1ab58e6a8fe3af72b0e2'
-            'bbd4bf3ddbda97008764c1a619aee4f2e3d3476c8affaac75ffee328db452f587454f16158942ec666e2357474a052019e5641ce6d432c43593b3612bdc40af2'
-            '0004f7d96366b47df5f4be1de9648038a4c9a400084d37dcd13d91ae805abb634051c88bb7bd35ff90f3e563508ce65686a321ed0c64cd63f5dc344d4022d9b8'
-            '3520817c16ea83a4bed28f153138608456267eac0caed250f8d951c54cf6a07d07e5b13768c5165a8e31a56e76919b3c9b84ad3b2905489ce65e625fa067f9b0'
-            'c2f74ab15214ccac6ae570fa4a4ebfdf35690be60851be9eb8ab65c1ce4ebed0f0d3cb98947fd4a586d19cb399d312390ebbc68f4de86f607adef2a2d590798e'
+_buildenv_ext=({pgo,lto,graphite}.sh.in)
+_tidy=({upx,optipng,svgo}.sh.in)
+_conf=({buildenv,destdirs,pkgopts{,-param}}_ext.conf 'compress-param_max.conf')
+source=(${_buildenv_ext[@]}
+        ${_tidy[@]}
+        ${_conf[@]}
+        )
+sha512sums=('cc885a45311f60f3512d562ca6502ec7a38440383bae4df82c6cb34f5fe4ff8f7fe9c627bea0aadd32c34ea531ab4acc50a04271d1dc0b807a3e3f34b3f29289'
+            '566681dfc0a84f6b3f654250bb0967bfe13563ad6dcae13d9cc6e30b359f34544c5f473e3b23973e0406e405c7047d866d6459bf999c0579ff43b36d1615bfe0'
+            '4cda8968bf9e2a1cd7f20987183b91be8becec190c7a56a5d47fecb1da373077190af0c7be627338160c371d4b3c68cb12b76783e9118de29df30a285f9e5bd9'
             '0cbcc6590b901ac33dc78b755300da02070c5abb68153a55eb7b1bf5426dd37286f5831185c53eff189fc689796a234bad84fddc8e8f43edf6b19f13667291c7'
             'c2b109f3f167f61fb0cbe3580a190189f0aac9b5886cf9aba447e2e074179cd1a506d54cbc0ae4df59ff3e3d537e8d3176786a805cfcba7f90525d135824fd6b'
             '917fd21b7dcb7ccb1d82bae4e31e65fd7610c4ca0b01db2ee1a379828240c59a6eeae176e1221b04421ace5ad89a871669def4730120741173e48b05c117aadb'
@@ -27,16 +30,15 @@ sha512sums=('67fb9359cd5dc52413ad2ca7e91b445826d7cf6b7ad3db0d2b3845310ab0bdfc41c
             'e3b61fa175c7c086b5e40413e280afa59efae64f6a29ec03f395b48d6a4ee7086603c9a8295a36cb0d091ef28bf3444d02e78b288db2225d29336aac23eda317'
             'abe0b14869417dfe978beeb57b9527bc3c3651ddd5a88e9a5293438e3d1ebcde41a58f60bc0d0e68b6d8b4ede228904b520a3e10ac26c8572110a312a38e15b6'
             '16ad444485cdee165f00a2e1a24ff9f74fad43c8da959feaa196be1719e67e3153daac6661b116e2351a55091504056cb7bc785943092f9f9fdaa46bd5f0d3d9'
-            '16c2b0e666234f1a493e7456f4c387fbabd24b10514c93fa4338520e8f537e9a12de0d833a6148fe871452d87f6e1b3454b2bde332b9ba4c4e7680616b7eeede'
             'bbc69d237a4be0b91d3e8197d40ddb3a587c4f4c4a1fb233d3249689543ad66d56b3aef02d886f6f7d9e5a52c64a45f2d44772156bb01a50ac8e769fdc30dbe7')
 
 prepare() {
-  # Use the user's currently installed versions as a base
-  cp /usr/bin/makepkg ./makepkg-optimize
+  # Use the current makepkg config as a base
   cp /etc/makepkg.conf ./makepkg-optimize.conf
 
   # How to check for the unlikely possiblity that the directory was changed?
-  sed -i "s|@libmakepkgdir@|/usr/share/makepkg|g" *.sh.in
+  sed -i "s|@libmakepkgdir@|/usr/share/makepkg|g"  *.sh.in
+  for file in *.sh.in; do mv $file ${file%.in}; done
 
   #Comment on additional BUIDENV options
   sed -i "/#-- sign/r buildenv_ext.conf" makepkg-optimize.conf
@@ -52,29 +54,15 @@ prepare() {
 
   #Comment on maximum COMPRESS~~ parameters
   sed -i "/COMPRESSZ=/r compress-param_max.conf" makepkg-optimize.conf
-
-  # Add features in series
-  patch -Np0 < ../opticonf.patch
-  patch -Np0 < ../00.optipng.patch
-  patch -Np0 < ../01.upx.patch
-  patch -Np0 < ../02.lto.patch
-  patch -Np0 < ../03.pgo.patch
-  patch -Np0 < ../04.graphite.patch
-  patch -Np0 < ../05.svgo.patch
 }
 
 package() {
-  #makepkg-optimize
-  mkdir -p $pkgdir/usr/{bin,share/makepkg/tidy}/
-  install -m755 makepkg-optimize $pkgdir/usr/bin/
+  # BUILDENV extension scripts
+  install -m755 -D -t ${pkgdir}/usr/share/makepkg/buildenv_ext/ ${_buildenv_ext[@]%.in}
 
-  # Tidy scripts
-  #Uncomment once dropped from pacman.
-  #install -m755 ../optipng.sh.in $pkgdir/usr/share/makepkg/tidy/optipng.sh
-  #install -m755 ../upx.sh.in $pkgdir/usr/share/makepkg/tidy/upx.sh
-  install -m755 ../svgo.sh.in $pkgdir/usr/share/makepkg/tidy/svgo.sh
+  # Supplemental Tidy scripts
+  install -m755 -D -t ${pkgdir}/usr/share/makepkg/tidy/ ${_tidy[@]%.in}
 
   # Separate config file
-  mkdir -p $pkgdir/etc/
-  install -m644 makepkg-optimize.conf $pkgdir/etc/
+  install -m644 -D -t ${pkgdir}/etc/ makepkg-optimize.conf
 }