use splitpkg template in packages that fail to build

mingw-w64-osgbullet-git/PKGBUILD

@@ -37,7 +37,7 @@ build() {
   plain "No build step"
 }
 
-package_release() {
+package_osgbullet-git() {
   provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
   replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-svn)
@@ -56,7 +56,7 @@ package_release() {
   make DESTDIR=${pkgdir} install
 }
 
-package_debug() {
+package_osgbullet-debug-git() {
   depends=("${MINGW_PACKAGE_PREFIX}-${_realname}-git=${pkgver}" "${MINGW_PACKAGE_PREFIX}-OpenSceneGraph-debug" "${MINGW_PACKAGE_PREFIX}-osgworks-debug")
   provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug" "${MINGW_PACKAGE_PREFIX}-${_realname}-degug-svn")
@@ -82,18 +82,13 @@ package_debug() {
   rm -rf ${pkgdir}${MINGW_PREFIX}/share/osgBullet/extra
 }
 
-package_mingw-w64-i686-osgbullet-git() {
-  package_release
-}
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
 
-package_mingw-w64-i686-osgbullet-debug-git() {
-  package_debug
-}
-
-package_mingw-w64-x86_64-osgbullet-git() {
-  package_release
-}
-
-package_mingw-w64-x86_64-osgbullet-debug-git() {
-  package_debug
-}
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;

mingw-w64-osgearth/PKGBUILD

@@ -67,7 +67,7 @@ build() {
   done
 }
 
-package_release() {
+package_osgearth() {
   depends+=("${MINGW_PACKAGE_PREFIX}-OpenSceneGraph")
   pkgdesc="A terrain rendering toolkit for OpenSceneGraph (mingw-w64)"
 
@@ -78,7 +78,7 @@ package_release() {
   cp -rf ${srcdir}/${_realname}-${_realname}-${pkgver}/data ${pkgdir}${MINGW_PREFIX}/share/osgearth
 }
 
-package_debug() {
+package_osgearth-debug() {
   depends+=("${MINGW_PACKAGE_PREFIX}-OpenSceneGraph-debug")
   options=('staticlibs' '!strip')
   pkgdesc="A terrain rendering toolkit for OpenSceneGraph (debug) (mingw-w64)"
@@ -91,18 +91,13 @@ package_debug() {
   rm -rf ${pkgdir}${MINGW_PREFIX}/share
 }
 
-package_mingw-w64-i686-osgearth() {
-  package_release
-}
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
 
-package_mingw-w64-i686-osgearth-debug() {
-  package_debug
-}
-
-package_mingw-w64-x86_64-osgearth() {
-  package_release
-}
-
-package_mingw-w64-x86_64-osgearth-debug() {
-  package_debug
-}
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;

mingw-w64-osgocean-git/PKGBUILD

@@ -71,7 +71,7 @@ build() {
   make
 }
 
-package_release() {
+package_osgocean-git() {
   provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
   replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-svn)
@@ -81,7 +81,7 @@ package_release() {
   make DESTDIR=${pkgdir} install
 }
 
-package_debug() {
+package_osgocean-debug-git() {
   depends=("${MINGW_PACKAGE_PREFIX}-${_realname}-git=${pkgver}" "${MINGW_PACKAGE_PREFIX}-OpenSceneGraph-debug")
   provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug-svn")
@@ -96,18 +96,13 @@ package_debug() {
   rm -rf ${pkgdir}${MINGW_PREFIX}/share/osgOcean
 }
 
-package_mingw-w64-i686-osgocean-git() {
-  package_release
-}
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
 
-package_mingw-w64-i686-osgocean-debug-git() {
-  package_debug
-}
-
-package_mingw-w64-x86_64-osgocean-git() {
-  package_release
-}
-
-package_mingw-w64-x86_64-osgocean-debug-git() {
-  package_debug
-}
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;

mingw-w64-python-pywin32/PKGBUILD

@@ -33,7 +33,6 @@ build() {
 }
 
 _package() {
-    depends=(${MINGW_PACKAGE_PREFIX}-${_python}-setuptools)
     cd "${srcdir}/build-${_python}-${CARCH}-${_realname}-${pkgver}"
     DISTUTILS_DEBUG=1 \
     MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
@@ -43,7 +42,23 @@ _package() {
         --optimize=1
 }
 
-package_mingw-w64-i686-python2-pywin32()   { _python=python2 _package; }
-package_mingw-w64-i686-python3-pywin32()   { _python=python3 _package; }
-package_mingw-w64-x86_64-python2-pywin32() { _python=python2 _package; }
-package_mingw-w64-x86_64-python3-pywin32() { _python=python3 _package; }
+package_python2-pywin32() {
+    depends=(${MINGW_PACKAGE_PREFIX}-python2-setuptools)
+    _python=python2 _package
+}
+
+package_python3-pywin32() {
+    depends=(${MINGW_PACKAGE_PREFIX}-python3-setuptools)
+    _python=python3 _package
+}
+
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
+
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;

mingw-w64-sip/PKGBUILD

@@ -67,18 +67,13 @@ package_python-sip() {
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-sip/LICENSE"
 }
 
-package_mingw-w64-i686-sip() {
-  package_sip
-}
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
 
-package_mingw-w64-i686-python-sip() {
-  package_python-sip
-}
-
-package_mingw-w64-x86_64-sip() {
-  package_sip
-}
-
-package_mingw-w64-x86_64-python-sip() {
-  package_python-sip
-}
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;