[testing] -> [extra] 'postgresql-old-upgrade-13.6-1.1' move

x86_64/extra/PKGBUILD

@@ -2,28 +2,30 @@
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=postgresql-old-upgrade
-pkgver=12.9
+pkgver=13.6
 _majorver=${pkgver%.*}
-pkgrel=2
+pkgrel=1.1
 pkgdesc='PostgreSQL build for migrating between major versions with pg_upgrade'
 url='https://www.postgresql.org/'
 arch=('x86_64')
 license=('custom:PostgreSQL')
 depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0' 'pam'
          'zlib' 'icu' 'libldap' 'krb5' 'llvm-libs')
-makedepends=('python' 'python2' 'perl' 'tcl>=8.6.0' 'llvm' 'clang')
-optdepends=('python2: for PL/Python 2 support'
-            'python: for PL/Python 3 support'
+makedepends=('python' 'perl' 'tcl>=8.6.0' 'llvm' 'clang')
+optdepends=('python: for PL/Python 3 support'
             'perl: for PL/Perl support'
             'tcl: for PL/Tcl support')
+options=('debug')
 source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-sha256sums=('89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce')
-sha512sums=('11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f')
-b2sums=('fc88d61d369569a3054b889848eaf1405a4f5137cd8c2cf27282115f70853dd4d5d8b4bf0a9fc60c63db936246a0a64077c9bfdb90685d4dfe375558e4519b2b')
+b2sums=('f5ea95fd9ffc8846e0aaf5bac03b02afa71e62e796bbe40f68af727a2f3c74eddd98cb68427bcc13b87b6fa00a8e2a7b18dd7749318f0a4a32cfdbf9b0e0a873')
+
+# Upstream provides md5 and sha256
+md5sums=('06161451ca1b9fc888ce6e18ca93f7d1')
+sha256sums=('bafc7fa3d9d4da8fe71b84c63ba8bdfe8092935c30c0aa85c24b2c08508f67fc')
 
 build() {
   cd postgresql-${pkgver}
-  local options=(
+  local configure_options=(
     --prefix=/opt/pgsql-${_majorver}
     --with-gssapi
     --with-libxml
@@ -39,46 +41,27 @@ build() {
     --without-systemd
     --with-ldap
     --with-llvm
+    --without-libxslt
     --disable-nls
     --enable-thread-safety
+    --enable-rpath
   )
 
-  CFLAGS+=" -ffat-lto-objects" # Fix static libs
-
-  # only build plpython3 for now
-  ./configure "${options[@]}" \
-    PYTHON=/usr/bin/python
-  make -C src/pl/plpython all
-  make -C contrib/hstore_plpython all
-  make -C contrib/ltree_plpython all
-
-  # save plpython3 build and Makefile.global
-  cp -a src/pl/plpython{,3}
-  cp -a contrib/hstore_plpython{,3}
-  cp -a contrib/ltree_plpython{,3}
-  cp -a src/Makefile.global{,.python3}
-  make distclean
+  # Fix static libs
+  CFLAGS+=" -ffat-lto-objects"
 
-  # regular build with everything
-  ./configure "${options[@]}" \
-    PYTHON=/usr/bin/python2
+  ./configure "${configure_options[@]}"
   make -C src all
   make -C contrib all
 }
 
 package() {
   cd postgresql-${pkgver}
+
+  # install
   make -C src DESTDIR="${pkgdir}" install
   make -C contrib DESTDIR="${pkgdir}" install
 
-  # install plpython3
-  mv src/Makefile.global src/Makefile.global.save
-  cp src/Makefile.global.python3 src/Makefile.global
-  touch -r src/Makefile.global.save src/Makefile.global
-  make -C src/pl/plpython3 DESTDIR="${pkgdir}" install
-  make -C contrib/hstore_plpython3 DESTDIR="${pkgdir}" install
-  make -C contrib/ltree_plpython3 DESTDIR="${pkgdir}" install
-
   install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 

x86_64/testing/PKGBUILD

@@ -1,68 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=postgresql-old-upgrade
-pkgver=13.6
-_majorver=${pkgver%.*}
-pkgrel=1.1
-pkgdesc='PostgreSQL build for migrating between major versions with pg_upgrade'
-url='https://www.postgresql.org/'
-arch=('x86_64')
-license=('custom:PostgreSQL')
-depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0' 'pam'
-         'zlib' 'icu' 'libldap' 'krb5' 'llvm-libs')
-makedepends=('python' 'perl' 'tcl>=8.6.0' 'llvm' 'clang')
-optdepends=('python: for PL/Python 3 support'
-            'perl: for PL/Perl support'
-            'tcl: for PL/Tcl support')
-options=('debug')
-source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-b2sums=('f5ea95fd9ffc8846e0aaf5bac03b02afa71e62e796bbe40f68af727a2f3c74eddd98cb68427bcc13b87b6fa00a8e2a7b18dd7749318f0a4a32cfdbf9b0e0a873')
-
-# Upstream provides md5 and sha256
-md5sums=('06161451ca1b9fc888ce6e18ca93f7d1')
-sha256sums=('bafc7fa3d9d4da8fe71b84c63ba8bdfe8092935c30c0aa85c24b2c08508f67fc')
-
-build() {
-  cd postgresql-${pkgver}
-  local configure_options=(
-    --prefix=/opt/pgsql-${_majorver}
-    --with-gssapi
-    --with-libxml
-    --with-openssl
-    --with-perl
-    --with-python
-    --with-tcl
-    --with-pam
-    --without-readline
-    --with-system-tzdata=/usr/share/zoneinfo
-    --with-uuid=e2fs
-    --with-icu
-    --without-systemd
-    --with-ldap
-    --with-llvm
-    --without-libxslt
-    --disable-nls
-    --enable-thread-safety
-    --enable-rpath
-  )
-
-  # Fix static libs
-  CFLAGS+=" -ffat-lto-objects"
-
-  ./configure "${configure_options[@]}"
-  make -C src all
-  make -C contrib all
-}
-
-package() {
-  cd postgresql-${pkgver}
-
-  # install
-  make -C src DESTDIR="${pkgdir}" install
-  make -C contrib DESTDIR="${pkgdir}" install
-
-  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-# vim: ts=2 sw=2 et: