Fix build scripts to use the same libraries name in dependencies

bash/PKGBUILD

@@ -11,8 +11,8 @@ license=('GPL')
 url="http://www.gnu.org/software/bash/bash.html"
 groups=('base')
 backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('libintl8' 'readline>=6.1' 'msys2-runtime')
+depends=('libintl' 'libreadline>=6.1' 'msys2-runtime')
-makedepends=('gettext-devel' 'readline-devel')
+makedepends=('gettext-devel' 'libreadline-devel')
 provides=('sh')
 install=bash.install
 source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}

groff/PKGBUILD

@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/groff/groff.html"
 license=('GPL')
 groups=('base-devel')
-depends=('perl' 'libgcc' 'libstdcpp')
+depends=('perl' 'gcc-libs')
 makedepends=()
 optdepends=()
 source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz{,.sig}

pacman/PKGBUILD

@@ -1,7 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=pacman
-pkgver=5529.57e372b
+_base_ver=4.1.2
+pkgver=4.1.2.22d261a
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
@@ -25,11 +26,12 @@ source=("$pkgname"::'git://github.com/Alexpux/MSYS2-pacman.git'
 md5sums=('SKIP'
          '2db6c94709bb30cc614a176ecf8badb1'
          'de74a13618347f08ae4a9637f74471c4'
-         'fa80773e7d930b43abc3ee1c58f1d705')
+         'fa6241b97d137a291485b1e5b982e430')
 
 pkgver() {
   cd "$srcdir/$pkgname"
-  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "%s.%s" "${_base_ver}" "$(git rev-parse --short HEAD)"
 }
 
 build() {

pacman/makepkg.conf

@@ -79,7 +79,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- upx:        Compress binary executable files using UPX
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs !libtool staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)

pcre/PKGBUILD

@@ -1,13 +1,13 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgname=('pcre' 'libpcre1' 'libpcre16_0' 'libpcre32_0' 'libpcrecpp0' 'libpcreposix0' 'pcre-devel')
+pkgname=('pcre' 'libpcre' 'libpcre16' 'libpcre32' 'libpcrecpp' 'libpcreposix' 'pcre-devel')
 pkgver=8.33
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64')
 url="http://www.pcre.org/"
 license=('BSD')
-depends=()
+depends=('libreadline' 'libbz2' 'zlib')
 makedepends=('libreadline-devel' 'libbz2-devel' 'zlib-devel')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}
         pcre-8.33-msys2-fix-ln.patch
@@ -55,28 +55,28 @@ package_pcre() {
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
-package_libpcre1() {
+package_libpcre() {
   mkdir -p ${pkgdir}/usr/bin
   cp -f ${srcdir}/dest/usr/bin/*pcre-1.dll ${pkgdir}/usr/bin/
 }
 
-package_libpcre16_0() {
+package_libpcre16() {
   mkdir -p ${pkgdir}/usr/bin
   cp -f ${srcdir}/dest/usr/bin/*pcre16-0.dll ${pkgdir}/usr/bin/
 }
 
-package_libpcre32_0() {
+package_libpcre32() {
   mkdir -p ${pkgdir}/usr/bin
   cp -f ${srcdir}/dest/usr/bin/*pcre32-0.dll ${pkgdir}/usr/bin/
 }
 
-package_libpcrecpp0() {
+package_libpcrecpp() {
-  depends=('libpcre1' 'libgcc' 'libstdcpp')
+  depends=('libpcre' 'gcc-libs')
   mkdir -p ${pkgdir}/usr/bin
   cp -f ${srcdir}/dest/usr/bin/*pcrecpp-0.dll ${pkgdir}/usr/bin/
 }
 
-package_libpcreposix0() {
+package_libpcreposix() {
   mkdir -p ${pkgdir}/usr/bin
   cp -f ${srcdir}/dest/usr/bin/*pcreposix-0.dll ${pkgdir}/usr/bin/
 }

readline/PKGBUILD

@@ -1,6 +1,7 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
-pkgname=('readline' 'readline-devel')
+pkgbase=readline
+pkgname=('libreadline' 'libreadline-devel')
 _basever=6.2
 _patchlevel=004 #prepare for some patches
 pkgver=$_basever.$_patchlevel
@@ -34,13 +35,17 @@ md5sums=('67948acb2ca081f23359d0256e9a271c'
          'b93c1cc3581aa8a2c23a37795f145d93'
          'SKIP')
 
-build() {
+prepare() {
-  cd ${srcdir}/${pkgname}-$_basever
+  cd ${srcdir}/${pkgbase}-$_basever
   for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
     msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
     patch -p1 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
   done
   patch -p1 -i $srcdir/readline-6.2-msys2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgbase}-$_basever
 
   # Remove RPATH from shared objects (FS#14366)
   sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
@@ -51,13 +56,13 @@ build() {
   make DESTDIR=$srcdir/dest install
 }
 
-package_readline() {
+package_libreadline() {
   mkdir -p ${pkgdir}/usr
   cp -rf $srcdir/dest/usr/bin ${pkgdir}/usr/
   cp -rf $srcdir/dest/usr/share ${pkgdir}/usr/
 }
 
-package_readline-devel() {
+package_libreadline-devel() {
   groups=('development')
   options=(staticlibs)
   pkgdesc="readline headers and libraries"

sqlite/PKGBUILD

@@ -11,7 +11,8 @@ pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom:Public Domain')
 url="http://www.sqlite.org/"
-makedepends=('readline')
+depends=('libreadline')
+makedepends=('libreadline-devel')
 source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
 	http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
 	http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip

swig/PKGBUILD

@@ -7,7 +7,7 @@ pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
 url="http://www.swig.org/"
 license=('custom')
-depends=('zlib' 'pcre')
+depends=('zlib' 'libpcre')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 		swig-2.0.10-msys2.patch)
 sha1sums=('d3bf4e78824dba76bfb3269367f1ae0276b49df9'