lib32-ncurses: upgrade with ncurses group

lib32-ncurses/PKGBUILD

@@ -1,50 +1,41 @@
-# Lib32 Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
-
 _pkgbasename=ncurses
 pkgname=lib32-${_pkgbasename}
-pkgver=5.9
-<<<<<<< HEAD
-pkgrel=3
-=======
-pkgrel=4
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
+pkgver=6.0
+pkgrel=1
 pkgdesc="System V Release 4.0 curses emulation library (32-bit)"
 arch=('x86_64')
 url="http://www.gnu.org/software/ncurses/"
 license=('MIT')
-depends=('lib32-glibc' $_pkgbasename=$pkgver)
-makedepends=("gcc-multilib")
-source=(ftp://ftp.gnu.org/pub/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1')
+depends=('lib32-gcc-libs' $_pkgbasename=$pkgver)
+makedepends=("gcc")
+source=(https://ftp.gnu.org/pub/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz{,.sig})
+validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
+md5sums=('ee13d052e1ead260d7c28071f46eefb1'
+         'SKIP')
 
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd ${srcdir}/
-  mkdir ncurses{,w}-build
-
-  cd ${srcdir}/ncursesw-build
-  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
-     --with-shared --with-normal --without-debug --without-ada --with-gpm=no \
-     --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32
-  make
-
-  # libncurses.so.5 for external binary support 
-  cd ${srcdir}/ncurses-build
-#  [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
-  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada --with-gpm=no \
-    --with-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/lib32
+  cd ${_pkgbasename}-${pkgver}
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man \
+              --libdir=/usr/lib32 \
+              --with-install-prefix=${pkgdir} \
+              --with-shared \
+              --with-normal \
+              --without-debug \
+              --without-ada \
+              --enable-widec \
+              --enable-pc-files \
+              --with-cxx-binding --with-cxx-shared \
+              --enable-ext-colors --enable-ext-mouse
   make
 }
 
 package() {
-  cd ${srcdir}/ncursesw-build
+  cd ${_pkgbasename}-${pkgver}
   make install
 
   install -dm755 ${pkgdir}/usr/lib32
@@ -57,17 +48,14 @@ package() {
   done
   ln -sf libncurses++w.a ${pkgdir}/usr/lib32/libncurses++.a
 
-  # Some packages look for -lcurses during build
+  # some packages look for -lcurses during build
   rm -f ${pkgdir}/usr/lib32/libcursesw.so
   echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib32/libcursesw.so
   ln -sf libncurses.so ${pkgdir}/usr/lib32/libcurses.so
   ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a
   ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a
 
-  # non-widec compatibility library
-  cd ${srcdir}/ncurses-build        
-  install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.${pkgver}
-  ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.5
-
   rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}