popt, keyutils, readline rebuilds/updates for /lib cleaning

filesystem/locale.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
+      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
+
+if [ ! -r /etc/locale.conf ]; then
+  return
+fi
+
+. /etc/locale.conf
+
+export LANG="${LANG:-C}"
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION

keyutils/PKGBUILD

@@ -1,31 +1,28 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer abveritas@chakra-project.org
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=keyutils
-pkgver=1.4
+pkgver=1.5.5
-pkgrel=2
+pkgrel=1
 pkgdesc="Linux Key Management Utilities"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://www.kernel.org"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc' 'sh')
-backup=(etc/request-key.conf)
+backup=('etc/request-key.conf')
-source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=("http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('d759680b2f23c99af95938f5026f25fb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile
+  
   make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  
+  make DESTDIR="$pkgdir" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib"  install
 }
-md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')

popt/PKGBUILD

@@ -1,42 +1,30 @@
-# $Id: PKGBUILD 80029 2010-05-10 17:03:30Z andrea $
+#
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Core Packages for Chakra, part of chakra-project.org
-# Contributor: dorphell <dorphell@archlinux.org>
+#
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# maintainer abveritas@chakra-project.org
-# Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=popt
 pkgver=1.16
-pkgrel=3
+pkgrel=4
 pkgdesc="A commandline option parser"
-arch=('i686' 'x86_64') 
+arch=('x86_64') 
 url="http://rpm5.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz)
+source=("http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('3743beefa3dd6247a73f8f7a32c14c33')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr || return 1
+  ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=$pkgdir install || return 1
-
-  # move libs in /lib
-  install -Dm755 ${pkgdir}/usr/lib/libpopt.so.0.0.0 \
-    ${pkgdir}/lib/libpopt.so.0.0.0 || return 1
   
-  rm ${pkgdir}/usr/lib/libpopt.so* || return 1
+  make DESTDIR="${pkgdir}" install
-  ln -sf /lib/libpopt.so ${pkgdir}/usr/lib/libpopt.so
+  install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  ln -sf libpopt.so.0 ${pkgdir}/lib/libpopt.so
-  ln -sf libpopt.so.0.0.0 ${pkgdir}/lib/libpopt.so.0
-
-  # install license
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-    $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
 }

readline/PKGBUILD

@@ -1,22 +1,23 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer abveritas[at]chakra-project[dot]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=readline
 _basever=6.2
-_patchlevel=001 #prepare for some patches
+_patchlevel=004 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=2
+pkgrel=1
 pkgdesc="GNU readline library"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
 license=('GPL')
 depends=('glibc' 'ncurses')
 backup=('etc/inputrc')
-source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz
+options=('!emptydirs')
-        inputrc)
+install='readline.install'
+source=("http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz"
+        'inputrc')
 if [ $_patchlevel -gt 00 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p))
@@ -24,14 +25,16 @@ if [ $_patchlevel -gt 00 ]; then
 fi
 md5sums=('67948acb2ca081f23359d0256e9a271c'
          '58d54966c1191db45973cb3191ac621a'
-         '83287d52a482f790dfb30ec0a8746669')
+         '83287d52a482f790dfb30ec0a8746669'
+         '0665020ea118e8434bd145fb71f452cc'
+         'c9d5d79718856e711667dede87cb7622'
+         'c08e787f50579ce301075c523fa660a4')
 
 build() {
   cd ${srcdir}/${pkgname}-$_basever
-  for p in ../readline${_basever//./}-*; do
+  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    [ -e "$p" ] || continue
+    msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-    msg "applying patch ${p}"
+    patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
-    patch -Np0 -i ${p}
   done
 
   # Remove RPATH from shared objects
@@ -40,7 +43,7 @@ build() {
   # build with -fPIC for x86_64 (FS#15634)
   [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
 
-  ./configure --prefix=/usr --libdir=/lib
+  ./configure --prefix=/usr 
   make SHLIB_LIBS=-lncurses
 }
 
@@ -49,14 +52,5 @@ package() {
   make DESTDIR=${pkgdir} install
   
   install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
-
-  # FHS recommends only shared libs in /lib
-  install -dm755 $pkgdir/usr/lib
-  mv $pkgdir/lib/*.a $pkgdir/usr/lib
-
-  # to make the linker find the shared lib and fix compile issues
-  cd ${pkgdir}/usr/lib
-  ln -sv /lib/libreadline.so .
-  ln -sv /lib/libhistory.so .
 }
 

readline/readline.install

@@ -1,18 +1,13 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(history.info readline.info rluserman.info)
 
-post_install() {
+post_upgrade() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
-post_upgrade() {
-  post_install $1
-  echo ">> You can safely ignore any \"cannot open shared object\" errors you see above"
-}
-
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do