[mediagoblin]: wip

1 files changed, 54 insertions, 58 deletions

diff --git a/pcr/mediagoblin/PKGBUILD b/pcr/mediagoblin/PKGBUILD
index 12dbac169..267b5c1e3 100644
--- a/pcr/mediagoblin/PKGBUILD
+++ b/pcr/mediagoblin/PKGBUILD
@@ -1,12 +1,9 @@
 # Maintainer (AUR): Immae <ismael.bouya@normalesup.org>
 # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
-_GIT_BUILD=true
 
 pkgname=mediagoblin
-# HACK: bump parabola$n to avoid downgrades during _GIT to non-_GIT transitions
-_pkgver=0.9.0+parabola1
-pkgver=0.9.0+parabola1+r12+g4752aa9f # automatic, use _pkgver or pkgver()
+pkgver=0.11.0
 pkgrel=1
 pkgdesc='A free software media publishing platform (Git version)'
 url='https://mediagoblin.org'
@@ -29,75 +26,74 @@ optdepends=('postgresql: to use the postgresql database backend'
 backup=('etc/webapps/mediagoblin/paste_local.ini'
         'etc/webapps/mediagoblin/mediagoblin_local.ini')
 install=mediagoblin.install
-makedepends=('git' 'automake')
-if [ $_GIT_BUILD = true ]; then
-  source=("$pkgname-${_pkgver%%+parabola*}::git://git.savannah.gnu.org/$pkgname.git#branch=stable")
-  sha256sums=('SKIP')
-else
-  source=("https://git.savannah.gnu.org/cgit/$pkgname.git/snapshot/${pkgname}-${_pkgver%%+parabola*}.tar.gz")
-  sha256sums=('a23490ed4d9dfa107ca4cd8483a063f0338e02a4783a176915d5521b7a55fb21')
-fi
-source+=('mediagoblin-paster.service'
-         'mediagoblin-celeryd.service'
-         'paste_local.ini'
-         'mediagoblin_local.ini'
-         'mediagoblin-tmpfiles.conf')
-sha256sums+=('2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409'
-             'f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a'
-             'ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884'
-             '9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1'
-             'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47')
+makedepends=('autoconf2.13' 'automake')
+source=(${pkgname}-${pkgver}::https://git.savannah.gnu.org/cgit/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.gz
+        'mediagoblin-paster.service'
+        'mediagoblin-celeryd.service'
+        'paste_local.ini'
+        'mediagoblin_local.ini'
+        'mediagoblin-tmpfiles.conf'
+        'ac.patch')
+sha256sums=('b6ffaf09e7e0cab675127a445b8f5bf60977e0abcf5dc9cce0bb2ed44db3fbc7'
+            '2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409'
+            'f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a'
+            'ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884'
+            '9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1'
+            'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47'
+            '1c8dd28eeffee322c354b211170d690dbdd32b5007274b76e5c4da62efac272f')
 
-pkgver() {
-  printf -- "%s" "$_pkgver"
-  [ $_GIT_BUILD != true ] && return
-  cd "$srcdir/$pkgname-${_pkgver%%+parabola*}"
-  git describe --long |
-      sed "s/^v${_pkgver%%+parabola*}// ; s/\([^-]*-g\)/r\1/ ; s/-/+/g"
-}
 
-prepare() {
-  cd "$srcdir/$pkgname-${_pkgver%%+parabola*}"
-  if [ $_GIT_BUILD = true ]; then
-    git submodule init
-    git submodule update
-  else
-    sed -i /^git/d bootstrap.sh
-  fi
+prepare()
+{
+  cd "${srcdir}"/${pkgname}-${pkgver}
+#   sed -i 's/aclocal /aclocal-1.16 /' bootstrap.sh
+#   sed -i 's/autoreconf -fvi/autoreconf-2.13 -i --force/' bootstrap.sh
+  sed -i '/^git/d' bootstrap.sh
+
+  sed -i '/dnl AC_CONFIG_MACRO_DIR([m4])/d' configure.ac
+
+  echo "applying ac.patch"
+  autoconf
+  patch -Np1 < "${srcdir}"/ac.patch
 }
 
-build() {
-  cd "$srcdir/$pkgname-${_pkgver%%+parabola*}"
+build()
+{
+  cd "${srcdir}"/${pkgname}-${pkgver}
+# autoupdate
+#   ./bootstrap.sh
+# autoreconf -fvi
 
-  ./bootstrap.sh
-  ./configure --with-python3
-  make || make
+#   ./configure
+  ./configure --without-virtualenv
+  make
   ./bin/easy_install flup
 }
 
-package() {
-  cd "$srcdir/$pkgname-${_pkgver%%+parabola*}"
+package()
+{
+  cd "${srcdir}"/${pkgname}-${pkgver}
   rm -rf .git .gitignore
 
-  install -dm755 "$pkgdir"/usr/share/webapps/mediagoblin/
-  cp -a . "$pkgdir"/usr/share/webapps/mediagoblin
+  install -dm755 "${pkgdir}"/usr/share/webapps/mediagoblin/
+  cp -a . "${pkgdir}"/usr/share/webapps/mediagoblin
 
-  cd "$pkgdir"/usr/share/webapps/mediagoblin
+  cd "${pkgdir}"/usr/share/webapps/mediagoblin
   find . -name '*.pyc' -delete
   find . -type f -exec sed -Ei \
-       "s|$srcdir/$pkgname(-${_pkgver%%+parabola*})?|/usr/share/webapps/$pkgname|g" {} \;
+       "s|${srcdir}/${pkgname}(-${pkgver})?|/usr/share/webapps/${pkgname}|g" {} \;
 
-  install -dm755 "$pkgdir"/var/lib/mediagoblin
-  install -dm755 "$pkgdir"/etc/webapps/mediagoblin
+  install -dm755 "${pkgdir}"/var/lib/mediagoblin
+  install -dm755 "${pkgdir}"/etc/webapps/mediagoblin
 
-  install -Dm644 "$srcdir"/paste_local.ini "$pkgdir"/etc/webapps/mediagoblin/paste_local.ini
-  ln -s /etc/webapps/mediagoblin/paste_local.ini "$pkgdir"/usr/share/webapps/mediagoblin/paste_local.ini
-  install -Dm644 "$srcdir"/mediagoblin_local.ini "$pkgdir"/etc/webapps/mediagoblin/mediagoblin_local.ini
-  ln -s /etc/webapps/mediagoblin/mediagoblin_local.ini "$pkgdir"/usr/share/webapps/mediagoblin/mediagoblin_local.ini
+  install -Dm644 "$srcdir"/paste_local.ini "${pkgdir}"/etc/webapps/mediagoblin/paste_local.ini
+  ln -s /etc/webapps/mediagoblin/paste_local.ini "${pkgdir}"/usr/share/webapps/mediagoblin/paste_local.ini
+  install -Dm644 "$srcdir"/mediagoblin_local.ini "${pkgdir}"/etc/webapps/mediagoblin/mediagoblin_local.ini
+  ln -s /etc/webapps/mediagoblin/mediagoblin_local.ini "${pkgdir}"/usr/share/webapps/mediagoblin/mediagoblin_local.ini
 
-  ln -s /var/lib/mediagoblin/ "$pkgdir"/usr/share/webapps/mediagoblin/user_dev
+  ln -s /var/lib/mediagoblin/ "${pkgdir}"/usr/share/webapps/mediagoblin/user_dev
 
-  install -Dm644 "$srcdir"/mediagoblin-paster.service "$pkgdir"/usr/lib/systemd/system/mediagoblin-paster.service
-  install -Dm644 "$srcdir"/mediagoblin-celeryd.service "$pkgdir"/usr/lib/systemd/system/mediagoblin-celeryd.service
-  install -Dm644 "$srcdir"/mediagoblin-tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/mediagoblin.conf
+  install -Dm644 "$srcdir"/mediagoblin-paster.service "${pkgdir}"/usr/lib/systemd/system/mediagoblin-paster.service
+  install -Dm644 "$srcdir"/mediagoblin-celeryd.service "${pkgdir}"/usr/lib/systemd/system/mediagoblin-celeryd.service
+  install -Dm644 "$srcdir"/mediagoblin-tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mediagoblin.conf
 }