refactor: update more `agave` stuff

6 files changed, 61 insertions, 79 deletions

diff --git a/gnome-doc-utils/.SRCINFO b/gnome-doc-utils/.SRCINFO
index cdfa47e..67e44d5 100644
--- a/gnome-doc-utils/.SRCINFO
+++ b/gnome-doc-utils/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-doc-utils
 	pkgdesc = Documentation utilities for Gnome
-	pkgver = 0.21
-	pkgrel = 604
+	pkgver = 0.20.10+16+gc03cc09
+	pkgrel = 4
 	url = https://www.gnome.org
 	arch = any
 	license = GPL
@@ -11,7 +11,8 @@ pkgbase = gnome-doc-utils
 	makedepends = git
 	depends = docbook-xml
 	depends = rarian
-	source = git+https://github.com/kj-sh604/gnome-doc-utils.git
+	depends = python2-libxml2
+	source = git+https://gitlab.gnome.org/Archive/gnome-doc-utils.git#commit=c03cc0963996934e03587af3e351c2bb9dab6b2a
 	sha256sums = SKIP
 
 pkgname = gnome-doc-utils
diff --git a/gnome-doc-utils/PKGBUILD b/gnome-doc-utils/PKGBUILD
index 166243d..326aa76 100644
--- a/gnome-doc-utils/PKGBUILD
+++ b/gnome-doc-utils/PKGBUILD
@@ -1,25 +1,31 @@
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-doc-utils
-pkgver=0.21
-pkgrel=604
+pkgver=0.20.10+16+gc03cc09
+pkgrel=4
 pkgdesc="Documentation utilities for Gnome"
 arch=('any')
 license=('GPL' 'LGPL')
-depends=(docbook-xml rarian)
+depends=(docbook-xml rarian python2-libxml2)
 makedepends=(intltool gnome-common git)
 url="https://www.gnome.org"
-source=("git+https://github.com/kj-sh604/gnome-doc-utils.git")
-# pkgver() {
-#   cd $pkgname
-#   git describe --tags | sed 's/-/+/g'
-# }
+_commit=c03cc0963996934e03587af3e351c2bb9dab6b2a  # master
+source=("git+https://git.gnome.org/browse/gnome-doc-utils#commit=$_commit")
+source=("git+https://gitlab.gnome.org/Archive/gnome-doc-utils.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
   cd $pkgname
   rm -f m4/glib-gettext.m4
+  sed -i 's/SUBDIRS = .*/SUBDIRS = /' 'doc/Makefile.am'
   NOCONFIGURE=1 ./autogen.sh
-  sed -i 's/SUBDIRS = .*/SUBDIRS = /' doc/Makefile.am
 }
 
 build() {
@@ -34,4 +40,3 @@ package() {
   cd "$pkgname"
   make DESTDIR="$pkgdir" install
 }
-sha256sums=('SKIP')
diff --git a/python2-libxml2/.SRCINFO b/python2-libxml2-kj_sh604/.SRCINFO
index bdf9a12..89b2a11 100644
--- a/python2-libxml2/.SRCINFO
+++ b/python2-libxml2-kj_sh604/.SRCINFO
@@ -1,23 +1,19 @@
-pkgbase = python2-libxml2
-	pkgdesc = XML parsing library, version 2
+pkgbase = python2-libxml2-kj_sh604
+	pkgdesc = Python 2 bindings for the XML parsing library v2
 	pkgver = 2.9.14
-	pkgrel = 2
+	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
 	arch = x86_64
 	arch = aarch64
 	arch = i686
-	arch = pentium4
 	arch = armv7h
-	arch = armv6l
 	license = MIT
 	makedepends = git
-	depends = icu
-	depends = ncurses
+	depends = glibc
+	depends = libxml2-legacy
 	depends = python2
-	depends = libxml2
-	depends = readline
-	depends = xz
-	depends = zlib
+	provides = python2-libxml2
+	conflicts = python2-libxml2
 	source = python2-libxml2::git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=7846b0a677f8d3ce72486125fa281e92ac9970e8
 	source = no-fuzz.diff
 	source = https://www.w3.org/XML/Test/xmlts20130923.tar.gz
@@ -25,4 +21,4 @@ pkgbase = python2-libxml2
 	sha256sums = 3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f
 	sha256sums = 9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f
 
-pkgname = python2-libxml2
+pkgname = python2-libxml2-kj_sh604
diff --git a/python2-libxml2/.gitignore b/python2-libxml2-kj_sh604/.gitignore
index 48f9191..48f9191 100644
--- a/python2-libxml2/.gitignore
+++ b/python2-libxml2-kj_sh604/.gitignore
diff --git a/python2-libxml2/PKGBUILD b/python2-libxml2-kj_sh604/PKGBUILD
index ada77d2..d9f7460 100644
--- a/python2-libxml2/PKGBUILD
+++ b/python2-libxml2-kj_sh604/PKGBUILD
@@ -1,44 +1,32 @@
-# Maintainer: Pellegrino Prevete <pellegrinoprevete@gmail.com>
-# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: MarsSeed <marcell.meszaros@runbox.eu>
-
-_py="python2"
-_pkg="libxml2"
-pkgname="${_py}-${_pkg}"
+_modulename="libxml2"
+_pyruntime=python2
+pkgname="${_pyruntime}-${_modulename}-kj_sh604"
+_pkgname="${_pyruntime}-${_modulename}"
 pkgver=2.9.14
-_pkgver=2.9.10
-pkgrel=2
-pkgdesc='XML parsing library, version 2'
-_url="https://gitlab.gnome.org/GNOME/${_pkg}"
+pkgrel=1
+pkgdesc='Python 2 bindings for the XML parsing library v2'
+_url="https://gitlab.gnome.org/GNOME/${_modulename}"
 url="${_url}/-/wikis/home"
-arch=(
-  x86_64
-  aarch64
-  i686
-  pentium4
-  armv7h
-  armv6l
-)
+arch=(x86_64 aarch64 i686 armv7h)
 license=(MIT)
 depends=(
-  icu
-  ncurses
-  "${_py}"
-  "${_pkg}"
-  readline
-  xz
-  zlib
+  glibc
+  libxml2-legacy
+  "${_pyruntime}"
 )
 makedepends=(
   git
 )
+provides=(
+ "${_pkgname}" 
+)
+conflicts=(
+ "${_pkgname}" 
+)
 _commit=7846b0a677f8d3ce72486125fa281e92ac9970e8  # tags/v2.9.14^0
 _w3_tests="https://www.w3.org/XML/Test/xmlts20130923.tar.gz"
 source=(
-  "${pkgname}::git+${_url}.git#commit=$_commit"
+  "${_pkgname}::git+${_url}.git#commit=$_commit"
   no-fuzz.diff # Do not run fuzzing tests
   "${_w3_tests}"
 )
@@ -49,7 +37,7 @@ sha256sums=(
 )
 
 pkgver() {
-  cd "${pkgname}"
+  cd "${_pkgname}"
   git describe --tags \
     | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
@@ -59,7 +47,7 @@ prepare() {
   mkdir -p build
   ln -s xmlconf build/xmlconf || echo "${_msg}"
 
-  cd "${pkgname}"
+  cd "${_pkgname}"
 
   # Take patches from https://src.fedoraproject.org/rpms/libxml2/tree/master
   local src
@@ -75,26 +63,26 @@ prepare() {
 }
 
 build() (
-  local _configure="../${pkgname}/configure"
+  local _configure="../${_pkgname}/configure"
   local _configure_opts=(
     --prefix=/usr
     --with-threads
     --with-history
-    --with-python="/usr/bin/${_py}"
+    --with-python="/usr/bin/${_pyruntime}"
     --with-icu
   )
   local _cflags=(
-    "-I/usr/include/${_pkg}-2.9"
+    "-I/usr/include/${_modulename}-2.9"
   )
   local _ldflags=(
-    "-L/usr/lib/${_pkg}-2.9"
+    "-L/usr/lib/${_modulename}-2.9"
   )
 
   cd build
 
   CFLAGS="${_cflags[*]}" \
   LDFLAGS="${_ldflags[*]}" \
-    "../${pkgname}/configure" "${_configure_opts[@]}"
+    "../${_pkgname}/configure" "${_configure_opts[@]}"
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 
@@ -105,36 +93,28 @@ build() (
   find doc -type f -exec chmod 0644 {} +
 )
 
-check() {
-  CFLAGS="${_cflags[*]}" \
-  LDFLAGS="${_ldflags[*]}" \
-  make -C build check
-}
-
 package() {
   make DESTDIR="${pkgdir}" -C build install
-  "${_py}" -m compileall \
+  "${_pyruntime}" -m compileall \
            -d /usr/lib "${pkgdir}/usr/lib"
-  "${_py}" -O \
+  "${_pyruntime}" -O \
            -m compileall \
            -d /usr/lib "${pkgdir}/usr/lib"
 
   install -Dm 644 build/COPYING \
-          -t "${pkgdir}/usr/share/licenses/${pkgname}"
+          -t "${pkgdir}/usr/share/licenses/${_pkgname}"
 
   rm -rf "${pkgdir}/usr/bin/"
   rm -rf "${pkgdir}/usr/bin/"
-  rm -rf "${pkgdir}/usr/include/${_pkg}/libxml"
+  rm -rf "${pkgdir}/usr/include/${_modulename}/libxml"
   rm -rf "${pkgdir}/usr/lib/cmake"
-  rm -rf "${pkgdir}/usr/lib/${_pkg}"*
+  rm -rf "${pkgdir}/usr/lib/${_modulename}"*
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
   rm -rf "${pkgdir}/usr/lib/xml2Conf.sh"
   rm -rf "${pkgdir}/usr/share/aclocal"
-  rm -rf "${pkgdir}/usr/share/doc/${_pkg}"
-  rm -rf "${pkgdir}/usr/share/doc/${_pkg}-python-${pkgver}"
-  rm -rf "${pkgdir}/usr/share/gtk-doc/html/${_pkg}"
+  rm -rf "${pkgdir}/usr/share/doc/${_modulename}"
+  rm -rf "${pkgdir}/usr/share/doc/${_modulename}-${_pyruntime}-${pkgver}"
+  rm -rf "${pkgdir}/usr/share/gtk-doc/html/${_modulename}"
   rm -rf "${pkgdir}/usr/share/man/man1"
   rm -rf "${pkgdir}/usr/share/man/man3"
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/python2-libxml2/no-fuzz.diff b/python2-libxml2-kj_sh604/no-fuzz.diff
index 67ab6cc..67ab6cc 100644
--- a/python2-libxml2/no-fuzz.diff
+++ b/python2-libxml2-kj_sh604/no-fuzz.diff