Normalize with stable package with new upstream arrangement

2 files changed, 25 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81ebbcdf322..46c2a820e82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,27 @@
+# Generated by mksrcinfo v8
+# Tue Jul 31 15:40:21 UTC 2018
 pkgbase = afdko-git
 	pkgdesc = Tools used by Adobe font developers for wrapping up PostScript fonts as OpenType/CFF font files
-	pkgver = 2.5.65322.r8.32a48ad
+	pkgver = 2.7.3a4.r0.ec914b7
 	pkgrel = 1
-	url = https://github.com/adobe-type-tools/afdko
-	arch = i686
+	url = http://www.adobe.com/devnet/opentype/afdko.html
 	arch = x86_64
 	license = custom
 	makedepends = git
 	depends = python2
-	depends = python2-fonttools
 	depends = python2-booleanoperations
 	depends = python2-defcon
 	depends = python2-fontmath
+	depends = python2-fonttools
 	depends = python2-mutatormath
 	depends = python2-robofab
-	depends = python2-ufonormalizer
+	depends = python2-wheel
+	depends = python2-ufonormalizer-git
 	provides = afdko
 	conflicts = afdko
 	source = git+https://github.com/adobe-type-tools/afdko.git
-	source = use-system-python.patch
-	source = profile.sh
-	source = profile.csh
 	sha256sums = SKIP
-	sha256sums = 044967786fefa26687f3e3aa92c379bfe128151d59ad699b22260a89eb453be0
-	sha256sums = af0a77eefbf707879d92fb3dfa1579d3e7002b80936633325b97b60d3833e4c2
-	sha256sums = fdc7e7945896963c10d6439828a47ddc1896a8b2cd7eb98dffa409c1a630b200
+	depends_x86_64 = lib32-glibc
 
 pkgname = afdko-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 20c7434a93c..5598e188679 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,85 +1,41 @@
 # Maintainer: William Turner <willtur.will@gmail.com> 
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+
 pkgname=afdko-git
-pkgver=2.5.65322.r8.32a48ad
+pkgver=2.7.3a4.r0.ec914b7
 pkgrel=1
 pkgdesc='Tools used by Adobe font developers for wrapping up PostScript fonts as OpenType/CFF font files'
-arch=('i686' 'x86_64')
-url='https://github.com/adobe-type-tools/afdko'
+arch=('x86_64')
+url="http://www.adobe.com/devnet/opentype/${pkgname%-git}.html"
 license=('custom')
 depends=('python2'
-         'python2-fonttools'
          'python2-booleanoperations'
          'python2-defcon'
          'python2-fontmath'
+         'python2-fonttools'
          'python2-mutatormath'
          'python2-robofab'
-         'python2-ufonormalizer')
+         'python2-wheel'
+         'python2-ufonormalizer-git')
+depends_x86_64=('lib32-glibc')
 makedepends=('git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("git+https://github.com/adobe-type-tools/afdko.git"
-        'use-system-python.patch'
-        'profile.sh'
-        'profile.csh')
-sha256sums=('SKIP'
-            '044967786fefa26687f3e3aa92c379bfe128151d59ad699b22260a89eb453be0'
-            'af0a77eefbf707879d92fb3dfa1579d3e7002b80936633325b97b60d3833e4c2'
-            'fdc7e7945896963c10d6439828a47ddc1896a8b2cd7eb98dffa409c1a630b200')
+source=("git+https://github.com/adobe-type-tools/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/afdko"
+  cd "${pkgname%-git}"
   git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "${srcdir}/afdko/FDK"
-
-  # remove things we won't need
-  rm -r \
-    FinishInstall{Linux,OSX,Windows.cmd} \
-    Tools/{osx,win} \
-    Tools/linux/AFDKOPython
-
-  # the bundled python install is a mess, use system
-  patch -p2 -i "${srcdir}/use-system-python.patch"
-
-  cd "${srcdir}/afdko/FDK/Tools/Programs"
-
-  # change the XFLAGS for x86_64
-  if [ "${CARCH}" = "x86_64" ]; then
-    sed -i 's/-m32/-m64/' $(find -type f -name '*.mak' | grep linux/gcc)
-    sed -i 's/-m32/-m64/' $(find -type f -name Makefile | grep linux/gcc)
-  fi
-}
-
 build() {
-  cd "${srcdir}/afdko/FDK/Tools/Programs"
-
-  # build all the release makefiles
-  for f in $(ls */build/linux/gcc/release/Makefile); do
-    cd "${srcdir}/afdko/FDK/Tools/Programs/$(dirname "$f")"
-    make clean
-    make
-  done
-
-  cd "${srcdir}/afdko/FDK"
-
-  # copy the built executables in the "bin" folder
-  cp Tools/Programs/*/exe/linux/release/* Tools/linux
+    cd "${pkgname%-git}"
+    python2 setup.py -q build
 }
 
 package() {
-  cd "${srcdir}/afdko"
-
-  install -d "${pkgdir}/opt"
-  cp -r FDK "${pkgdir}/opt/${pkgname%-git}"
-  rm -r "${pkgdir}/opt/${pkgname%-git}/Tools/Programs"
-  chown -R root:root "${pkgdir}/opt/${pkgname%-git}"
-
-  # bash/csh profile for paths
-  install -D -m755 "${srcdir}/profile.sh" "${pkgdir}/etc/profile.d/${pkgname%-git}.sh"
-  install -D -m755 "${srcdir}/profile.csh" "${pkgdir}/etc/profile.d/${pkgname%-git}.csh"
-
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    cd "${pkgname%-git}"
+    python2 setup.py -q install --root="$pkgdir" --optimize=1
+    install -D -m644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }