Make pkgbase of all packages match the name of the PKGBUILD directory (#2878)

This either changes the pkgbase to match the directory name or the other way around. The motivation for this is to make it possible to automatically generate an URL to the PKGBUILD file from the package information alone.
2017-09-12 13:25:41 +02:00
parent 0c1c08a355
commit 4d8828efed
158 changed files with 59 additions and 50 deletions
--- a/mingw-w64-OpenSceneGraph-git/PKGBUILD
+++ b/mingw-w64-OpenSceneGraph-git/PKGBUILD
--- a/mingw-w64-OpenSceneGraph-git/additional-gl-header.patch
+++ b/mingw-w64-OpenSceneGraph-git/additional-gl-header.patch
--- a/mingw-w64-OpenSceneGraph-git/find-collada.patch
+++ b/mingw-w64-OpenSceneGraph-git/find-collada.patch
--- a/mingw-w64-OpenSceneGraph/PKGBUILD
+++ b/mingw-w64-OpenSceneGraph/PKGBUILD
--- a/mingw-w64-OpenSceneGraph/add-gstreamer-cflags.patch
+++ b/mingw-w64-OpenSceneGraph/add-gstreamer-cflags.patch
--- a/mingw-w64-OpenSceneGraph/additional-gl-header.patch
+++ b/mingw-w64-OpenSceneGraph/additional-gl-header.patch
--- a/mingw-w64-OpenSceneGraph/find-collada.patch
+++ b/mingw-w64-OpenSceneGraph/find-collada.patch
--- a/mingw-w64-OpenSceneGraph/find-freetype.patch
+++ b/mingw-w64-OpenSceneGraph/find-freetype.patch
--- a/mingw-w64-OpenSceneGraph/fix-3ds-plugin.patch
+++ b/mingw-w64-OpenSceneGraph/fix-3ds-plugin.patch
--- a/mingw-w64-arm-none-eabi-binutils/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=binutils
 _target=arm-none-eabi

-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=2.24
 pkgrel=1
--- a/mingw-w64-arm-none-eabi-gcc/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-gcc/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=gcc
 _target=arm-none-eabi

-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=4.8.4
 pkgrel=1
--- a/mingw-w64-arm-none-eabi-gdb/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-gdb/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=gdb
 _target=arm-none-eabi

-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=7.6.0
 pkgrel=1
--- a/mingw-w64-arm-none-eabi-newlib/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-newlib/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=newlib
 _target=arm-none-eabi

-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=2.1.0
 pkgrel=1
--- a/mingw-w64-atom-editor-git/PKGBUILD
+++ b/mingw-w64-atom-editor-git/PKGBUILD
--- a/mingw-w64-atom-shell-git/0001-python-python2.patch
+++ b/mingw-w64-atom-shell-git/0001-python-python2.patch
--- a/mingw-w64-atom-shell-git/0002-Add-ninja-option.patch
+++ b/mingw-w64-atom-shell-git/0002-Add-ninja-option.patch
--- a/mingw-w64-atom-shell-git/0002-debugging.patch
+++ b/mingw-w64-atom-shell-git/0002-debugging.patch
--- a/mingw-w64-atom-shell-git/PKGBUILD
+++ b/mingw-w64-atom-shell-git/PKGBUILD
--- a/mingw-w64-c99-to-c89-git/0001-Less-of-the-silly-nonsense.patch
+++ b/mingw-w64-c99-to-c89-git/0001-Less-of-the-silly-nonsense.patch
--- a/mingw-w64-c99-to-c89-git/0002-Ignore-trailing-cr-and-spaces-in-tests.patch
+++ b/mingw-w64-c99-to-c89-git/0002-Ignore-trailing-cr-and-spaces-in-tests.patch
--- a/mingw-w64-c99-to-c89-git/PKGBUILD
+++ b/mingw-w64-c99-to-c89-git/PKGBUILD
--- a/mingw-w64-clang35/PKGBUILD
+++ b/mingw-w64-clang35/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=clang
+pkgbase="mingw-w64-${_realname}35"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}35"
         "${MINGW_PACKAGE_PREFIX}-clang-analyzer35"
         "${MINGW_PACKAGE_PREFIX}-clang-tools-extra35"
--- a/mingw-w64-cocos2d-x-console-git/PKGBUILD
+++ b/mingw-w64-cocos2d-x-console-git/PKGBUILD
--- a/mingw-w64-cocos2d-x-git/PKGBUILD
+++ b/mingw-w64-cocos2d-x-git/PKGBUILD
--- a/mingw-w64-cocos2d-x/001-bullet-find.patch
+++ b/mingw-w64-cocos2d-x/001-bullet-find.patch
--- a/mingw-w64-cocos2d-x/PKGBUILD
+++ b/mingw-w64-cocos2d-x/PKGBUILD
--- a/mingw-w64-freeimage/FreeImage-3.17.0_CVE-2015-0852.patch
+++ b/mingw-w64-freeimage/FreeImage-3.17.0_CVE-2015-0852.patch
--- a/mingw-w64-freeimage/FreeImage-3.17.0_mingw-makefiles.patch
+++ b/mingw-w64-freeimage/FreeImage-3.17.0_mingw-makefiles.patch
--- a/mingw-w64-freeimage/FreeImage-3.17.0_unbundle.patch
+++ b/mingw-w64-freeimage/FreeImage-3.17.0_unbundle.patch
--- a/mingw-w64-freeimage/PKGBUILD
+++ b/mingw-w64-freeimage/PKGBUILD
--- a/mingw-w64-gdb-git/PKGBUILD
+++ b/mingw-w64-gdb-git/PKGBUILD
@@ -3,7 +3,7 @@

 _realname=gdb
 _gcc_ver=$(gcc -v 2>&1 | grep "^gcc version" | head -n1 | cut -c 13- | sed -r "s/\\s.*$//")
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgver=r91505.63345acf64
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}")
--- a/mingw-w64-geany-plugins/PKGBUILD
+++ b/mingw-w64-geany-plugins/PKGBUILD
@@ -5,6 +5,7 @@
 # Contributor (Arch Linux): Patrick Melo <patrick@patrickmelo.eti.br>

 _realname=geany-plugins
+pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.29
 pkgrel=1
--- a/mingw-w64-gimp-ufraw/PKGBUILD
+++ b/mingw-w64-gimp-ufraw/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=ufraw
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-gimp-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-gimp-${_realname}"
 groups=("${MINGW_PACKAGE_PREFIX}-gimp-plugins")
 pkgver=0.22
--- a/mingw-w64-glsl-optimizer-git/0001-GYP-Add-missing-files.patch
+++ b/mingw-w64-glsl-optimizer-git/0001-GYP-Add-missing-files.patch
--- a/mingw-w64-glsl-optimizer-git/0002-tests-MinGW-w64-Fix-build.patch
+++ b/mingw-w64-glsl-optimizer-git/0002-tests-MinGW-w64-Fix-build.patch
--- a/mingw-w64-glsl-optimizer-git/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
+++ b/mingw-w64-glsl-optimizer-git/0003-Win64-long-is-32-bit-use-intptr_t-instead.patch
--- a/mingw-w64-glsl-optimizer-git/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
+++ b/mingw-w64-glsl-optimizer-git/0004-tests-MinGW-w64-Use-find_package-OpenGL-in-CMakeList.patch
--- a/mingw-w64-glsl-optimizer-git/0006-CMake-Handle-installation.patch
+++ b/mingw-w64-glsl-optimizer-git/0006-CMake-Handle-installation.patch
--- a/mingw-w64-glsl-optimizer-git/PKGBUILD
+++ b/mingw-w64-glsl-optimizer-git/PKGBUILD
--- a/mingw-w64-gtkhtml3/PKGBUILD
+++ b/mingw-w64-gtkhtml3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=gtkhtml
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=4.8.5
 pkgrel=1
--- a/mingw-w64-gtksourceview2/PKGBUILD
+++ b/mingw-w64-gtksourceview2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=gtksourceview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.10.5
 pkgrel=3
--- a/mingw-w64-gtksourceview3/PKGBUILD
+++ b/mingw-w64-gtksourceview3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=gtksourceview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=3.24.3
 pkgrel=1
--- a/mingw-w64-gtksourceviewmm3/PKGBUILD
+++ b/mingw-w64-gtksourceviewmm3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=gtksourceviewmm
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=3.18.0
 pkgrel=2
--- a/mingw-w64-hlsl2glsl-git/0001-CMakeLists.txt-Fixes-and-improvements.patch
+++ b/mingw-w64-hlsl2glsl-git/0001-CMakeLists.txt-Fixes-and-improvements.patch
--- a/mingw-w64-hlsl2glsl-git/0002-Fix-pool_allocator-compile-guards.patch
+++ b/mingw-w64-hlsl2glsl-git/0002-Fix-pool_allocator-compile-guards.patch
--- a/mingw-w64-hlsl2glsl-git/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
+++ b/mingw-w64-hlsl2glsl-git/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
--- a/mingw-w64-hlsl2glsl-git/0004-CMake-Handle-installation.patch
+++ b/mingw-w64-hlsl2glsl-git/0004-CMake-Handle-installation.patch
--- a/mingw-w64-hlsl2glsl-git/PKGBUILD
+++ b/mingw-w64-hlsl2glsl-git/PKGBUILD
--- a/mingw-w64-kcwsh-qt5-git/PKGBUILD
+++ b/mingw-w64-kcwsh-qt5-git/PKGBUILD
@@ -5,6 +5,7 @@ _variant=-static
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "kcwsh"
 _ver_base=0.1.0
+pkgbase=mingw-w64-kcwsh-qt5-git
 pkgver=0.1.0.236.be0e645
 pkgrel=1
 arch=('any')
--- a/mingw-w64-laszip/LASzip-2.2.0.patch
+++ b/mingw-w64-laszip/LASzip-2.2.0.patch
--- a/mingw-w64-laszip/PKGBUILD
+++ b/mingw-w64-laszip/PKGBUILD
--- a/mingw-w64-libcello-git/PKGBUILD
+++ b/mingw-w64-libcello-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kazuki Shigemichi <shigemichik@gmail.com>

 _realname=libcello
-pkgbase="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgbase="mingw-w64-${_realname}-git"
 pkgname="${pkgbase}-git"
 pkgver=2.0.3.293.a6a7354
 pkgrel=1
--- a/mingw-w64-libkcw-qt5-git/PKGBUILD
+++ b/mingw-w64-libkcw-qt5-git/PKGBUILD
@@ -5,6 +5,7 @@ _variant=-static
 source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
 _kde_f5_init_package "${_variant}" "libkcw"
 _ver_base=0.1.0
+pkgbase=mingw-w64-libkcw-qt5-git
 pkgver=0.1.0.70.810b71c
 pkgrel=1
 arch=('any')
--- a/mingw-w64-liblas/PKGBUILD
+++ b/mingw-w64-liblas/PKGBUILD
--- a/mingw-w64-liblas/libLAS-1.8.0.patch
+++ b/mingw-w64-liblas/libLAS-1.8.0.patch
--- a/mingw-w64-libraw/LibRaw_obsolete-macros.patch
+++ b/mingw-w64-libraw/LibRaw_obsolete-macros.patch
--- a/mingw-w64-libraw/LibRaw_wsock32.patch
+++ b/mingw-w64-libraw/LibRaw_wsock32.patch
--- a/mingw-w64-libraw/PKGBUILD
+++ b/mingw-w64-libraw/PKGBUILD
--- a/mingw-w64-librest/PKGBUILD
+++ b/mingw-w64-librest/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>

 _realname=rest
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lib${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-lib${_realname}"
 pkgver=0.8.0
 pkgrel=1
--- a/mingw-w64-mingw-w64-libsigsegv-git/PKGBUILD
+++ b/mingw-w64-mingw-w64-libsigsegv-git/PKGBUILD
--- a/mingw-w64-mingw-w64-libsigsegv-git/fix-win64.patch
+++ b/mingw-w64-mingw-w64-libsigsegv-git/fix-win64.patch
--- a/mingw-w64-libsmallchange-hg/PKGBUILD
+++ b/mingw-w64-libsmallchange-hg/PKGBUILD
@@ -2,7 +2,7 @@

 _realname=smallchange

-pkgbase=mingw-w64-${_realname}-hg
+pkgbase=mingw-w64-lib${_realname}-hg
 pkgname="${MINGW_PACKAGE_PREFIX}-lib${_realname}-hg"
 pkgver=r1055.b646e0d1ccc1
 pkgrel=1
--- a/mingw-w64-libvterm-bzr/PKGBUILD
+++ b/mingw-w64-libvterm-bzr/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>

 _realname=libvterm
+pkgbase="mingw-w64-${_realname}-bzr"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-bzr"
 pkgver=r681
 pkgrel=1
--- a/mingw-w64-lua-bitop/PKGBUILD
+++ b/mingw-w64-lua-bitop/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>

 _realname=bitop
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=1.0.2
 pkgrel=1
--- a/mingw-w64-lua-lpeg/PKGBUILD
+++ b/mingw-w64-lua-lpeg/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Felix Huettner <huettner94@gmx.de>

 _realname=lpeg
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=0.12
--- a/mingw-w64-lua-lsqlite3/PKGBUILD
+++ b/mingw-w64-lua-lsqlite3/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor (Fluke): Ricky Wu <rickleaf.wu@gmail.com>

 _realname=lsqlite3
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=0.9.3
 pkgrel=1
--- a/mingw-w64-lua-luacom-git/PKGBUILD
+++ b/mingw-w64-lua-luacom-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ricky Wu <rickleaf.wu@gmail.com>

 _realname=luacom
-pkgbase=mingw-w64-${_realname}-git
+pkgbase=mingw-w64-lua-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-lua51-${_realname}-git"
 pkgver=v1.4.1.4.g8f818f5
 pkgrel=1
--- a/mingw-w64-lua-luarocks/PKGBUILD
+++ b/mingw-w64-lua-luarocks/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ricky Wu <rickleaf.wu@gmail.com>

 _realname=luarocks
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}")
 pkgver=2.4.1
 pkgrel=1
--- a/mingw-w64-lua-mpack/PKGBUILD
+++ b/mingw-w64-lua-mpack/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Rui Abreu Ferreira <raf-ep@gmx.com>

 _realname=mpack
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-lua-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-lua51-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-lua-${_realname}")
 pkgver=1.0.4
--- a/mingw-w64-luatex-svn/PKGBUILD
+++ b/mingw-w64-luatex-svn/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>

 _realname=luatex
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-svn
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.0
 pkgrel=1
--- a/mingw-w64-mcfgthread-git/PKGBUILD
+++ b/mingw-w64-mcfgthread-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: LH_Mouse <lh_mouse@126.com>

 _realname=mcfgthread
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}"-libs)
 pkgver=r250.9aa34c3
--- a/mingw-w64-meld3/PKGBUILD
+++ b/mingw-w64-meld3/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>

 _realname=meld
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}3"
 pkgver=3.16.4
 pkgrel=1
--- a/mingw-w64-oce/PKGBUILD
+++ b/mingw-w64-oce/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Nick Østergaard <oe.nick at gmail dot com>

 _realname=oce
+pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=0.17.2
 pkgrel=4
--- a/mingw-w64-ogre3d/PKGBUILD
+++ b/mingw-w64-ogre3d/PKGBUILD
--- a/mingw-w64-ogre3d/mingw-w64-fix.patch
+++ b/mingw-w64-ogre3d/mingw-w64-fix.patch
--- a/mingw-w64-ogre3d/ogre-1.9.0-fix-cflags.patch
+++ b/mingw-w64-ogre3d/ogre-1.9.0-fix-cflags.patch
--- a/mingw-w64-ogre3d/ogre-endlessworld-fix.patch
+++ b/mingw-w64-ogre3d/ogre-endlessworld-fix.patch
--- a/mingw-w64-ogre3d/ogre-freeimage-fix.patch
+++ b/mingw-w64-ogre3d/ogre-freeimage-fix.patch
--- a/mingw-w64-ogre3d/use-mingw-w64-directx.patch
+++ b/mingw-w64-ogre3d/use-mingw-w64-directx.patch
--- a/mingw-w64-openblas/PKGBUILD
+++ b/mingw-w64-openblas/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jürgen Pfeifer <juergen@familiepfeifer.de>

 _realname=OpenBLAS
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-openblas
 pkgname="${MINGW_PACKAGE_PREFIX}-openblas"
 pkgver=0.2.20
 pkgrel=1
--- a/mingw-w64-openjpeg2/PKGBUILD
+++ b/mingw-w64-openjpeg2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=openjpeg
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.2.0
 pkgrel=1
--- a/mingw-w64-osgQt/0001-remove-missing-macros.patch
+++ b/mingw-w64-osgQt/0001-remove-missing-macros.patch
--- a/mingw-w64-osgQt/PKGBUILD
+++ b/mingw-w64-osgQt/PKGBUILD
--- a/mingw-w64-osgQtQuick/PKGBUILD
+++ b/mingw-w64-osgQtQuick/PKGBUILD
--- a/mingw-w64-osgearth-git/PKGBUILD
+++ b/mingw-w64-osgearth-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: James Duley <jagduley gmail>

 _realname=osgearth
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug-git")
 pkgver=r7923.978cc0b
 pkgrel=1
--- a/mingw-w64-osmgpsmap-git/PKGBUILD
+++ b/mingw-w64-osmgpsmap-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Josip <bpisoj@gmail.com>

 _realname=osm-gps-map
-pkgbase=mingw-w64-${_realname}-git
+pkgbase=mingw-w64-osmgpsmap-git
 pkgname="${MINGW_PACKAGE_PREFIX}-osmgpsmap-git"
 provides=("${MINGW_PACKAGE_PREFIX}-osmgpsmap")
 conflicts=("${MINGW_PACKAGE_PREFIX}-osmgpsmap")
--- a/mingw-w64-pdftex-svn/PKGBUILD
+++ b/mingw-w64-pdftex-svn/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>

 _realname=pdftex
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-svn
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.0
 pkgrel=1
--- a/mingw-w64-pygobject2/PKGBUILD
+++ b/mingw-w64-pygobject2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=pygobject
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-gobject2" "${MINGW_PACKAGE_PREFIX}-python3-gobject2" "${MINGW_PACKAGE_PREFIX}-pygobject2-devel")
 pkgver=2.28.6
 pkgrel=6
--- a/mingw-w64-pygtksourceview2/PKGBUILD
+++ b/mingw-w64-pygtksourceview2/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=pygtksourceview
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2"
 pkgver=2.10.1
 pkgrel=1
--- a/mingw-w64-python-binwalk/PKGBUILD
+++ b/mingw-w64-python-binwalk/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Martell Malone <martellmalone@gmail.com>

 _realname=binwalk
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") #"${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 pkgver=2.1.1
 pkgrel=1
--- a/mingw-w64-python-csssselect/PKGBUILD
+++ b/mingw-w64-python-csssselect/PKGBUILD
--- a/mingw-w64-python-h5py/PKGBUILD
+++ b/mingw-w64-python-h5py/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >

 _realname=h5py
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.7.0
--- a/mingw-w64-python-icu/PKGBUILD
+++ b/mingw-w64-python-icu/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Josip <bpisoj@gmail.com>

 _realname=PyICU
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python-icu
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-icu" "${MINGW_PACKAGE_PREFIX}-python3-icu")
 pkgver=1.9.7
 pkgrel=2
--- a/mingw-w64-python-lhafile/PKGBUILD
+++ b/mingw-w64-python-lhafile/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Frode Solheim <frode@fs-uae.net>

-_realname=python-lhafile
+_realname=lhafile
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-lhafile"
         "${MINGW_PACKAGE_PREFIX}-python3-lhafile")
--- a/mingw-w64-python-path/PKGBUILD
+++ b/mingw-w64-python-path/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ryuta Suzuki <oroppas@gmail.com>

 _realname=path.py
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python-path
 pkgname=("${MINGW_PACKAGE_PREFIX}-python3-path"
         "${MINGW_PACKAGE_PREFIX}-python2-path")
 pkgver=10.3.1
--- a/mingw-w64-python-pillow/PKGBUILD
+++ b/mingw-w64-python-pillow/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>

 _realname=Pillow
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python-pillow
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pillow" "${MINGW_PACKAGE_PREFIX}-python3-pillow")
 pkgver=4.2.1
 pkgrel=2
--- a/mingw-w64-python-pywin32/PKGBUILD
+++ b/mingw-w64-python-pywin32/PKGBUILD
@@ -9,7 +9,7 @@ arch=('any')
 pkgver=219
 pkgrel=1
 makedepends=(${MINGW_PACKAGE_PREFIX}-python2 ${MINGW_PACKAGE_PREFIX}-python3 rsync)
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=(${MINGW_PACKAGE_PREFIX}-python2-${_realname} ${MINGW_PACKAGE_PREFIX}-python3-${_realname})
 source=("https://prdownloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.zip"
        001-compile-and-setup-fixes.patch)
--- a/mingw-w64-python-rst2pdf/PKGBUILD
+++ b/mingw-w64-python-rst2pdf/PKGBUILD
@@ -1,6 +1,6 @@
 _pyname=rst2pdf
 _realname=rst2pdf
-pkgbase=mingw-w64-python2-${_realname}
+pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=0.93
 pkgrel=3
--- a/mingw-w64-python2-beautifulsoup3/PKGBUILD
+++ b/mingw-w64-python2-beautifulsoup3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 _realname=beautifulsoup3
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=3.2.1
 pkgrel=2
--- a/mingw-w64-python2-enum34/PKGBUILD
+++ b/mingw-w64-python2-enum34/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Frederic Wang <fred.wang@free.fr>

 _realname=enum34
-pkgbase=mingw-w64-python-${_realname}
+pkgbase=mingw-w64-python2-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=1.1.6
 pkgrel=1
--- a/Show More
+++ b/Show More