add stable repo changes

ccr/PKGBUILD

@@ -4,14 +4,11 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=ccr
-pkgver=20100914
+pkgver=20100927
 pkgrel=1
 pkgdesc="Bash wrapper for pacman and the CCR"
-url="http://github.com/bruenig/packer"
+url="http://github.com/bruenig/ccr"
 license="GPL"
 arch=('any')
 makedepends=('git')
@@ -19,20 +16,20 @@ depends=('grep' 'sed' 'coreutils' 'bash' 'wget' 'pacman')
 optdepends=('sudo: install and update packages as non-root'
             'pacman-color: colorized output'
 	    'base-devel: for building packages from the ccr')
-_gitroot='git://github.com/bruenig/packer.git'
-_gitname='packer'
+source=(http://chakra-project.org/sources/ccr/ccr-$pkgver-$pkgrel.tar.xz)
+md5sums=(3b831830867ef58f186f8c1a97c59147)
+
+# source PKGBUILD && _create-tarball
+_create-tarball() {
+    mkdir -p "ccr"
+    git clone git://github.com/bruenig/packer.git "ccr"
+    tar -cJf ccr-$pkgver-$pkgrel.tar.xz "ccr"
+    md5sum "ccr-$pkgver-$pkgrel.tar.xz"
+    rm -rf "ccr"
+}
 
 build() {
-    cd "$startdir/src"
-  
-    msg "Connecting to github GIT server...."
-    
-    if [ -d "$startdir/src/$_gitname" ] ; then
-        cd $_gitname && git pull origin
-    else
-        git clone "$_gitroot"
-        cd $_gitname
-    fi
+    cd "$startdir/src/ccr"
 
     # Change all the server references from http://aur.archlinux.org to http://chakra-project.org/ccr
     cat packer | sed "s/aur\.archlinux\.org/chakra\-project\.org\/ccr/g" > step1
@@ -42,4 +39,13 @@ build() {
     cat step2 | sed "s/Aur/Ccr/g" > ccr
       
     install -m 755 -D ccr "$startdir/pkg/usr/bin/ccr"
+
+    # Do some sed-magic
+    sed -i -e "s~AUR~CCR~g" packer.8
+    sed -i -e "s~aur~ccr~g" packer.8
+    sed -i -e "s~packer~ccr~g" packer.8
+    sed -i -e "s~Packer~CCR~g" packer.8
+    sed -i -e "s~PACKER~CCR~g" packer.8
+
+    install -m 644 -D packer.8 "$startdir/pkg/usr/share/man/man8/ccr.8"
 }

clementine/PKGBUILD

+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+pkgname=clementine
+pkgver=0.5.1
+pkgrel=2
+pkgdesc="A modern music player and library organiser and a port of Amarok 1.4, with some features rewritten to take advantage of Qt4. "
+url="http://www.clementine-player.org/"
+license="GPL"
+arch=('i686' 'x86_64')
+depends=('glew' 'liblastfm' 'taglib'  'gstreamer0.10' 'libmtp' 'libgpod>=0.7.94' 'hicolor-icon-theme')
+makedepends=('mesa' 'cmake' 'boost')
+optdepends=(
+	'gstreamer0.10-base-plugins: for more open formats'
+	'gstreamer0.10-good-plugins: still free'
+	'gstreamer0.10-ugly-plugins: damn if you really need those'
+)
+source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('4a18e971a1a7a98b8c7516c8e1c597e9')
+install=(clementine.install)
+
+build() {
+	cd ${srcdir}/$pkgname-$pkgver
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+	make
+}
+
+package() {
+	cd ${srcdir}/$pkgname-$pkgver
+	make DESTDIR=${pkgdir} install
+}

clementine/clementine.install

+pkgname=clementine
+
+post_install() {
+  gtk-update-icon-cache -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+
+post_remove() {
+  gtk-update-icon-cache -t -f usr/share/icons/hicolor
+}

dvdauthor/PKGBUILD

@@ -8,18 +8,18 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=dvdauthor
-pkgver=0.6.14
+pkgver=0.6.18
 pkgrel=1
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64')
 url="http://dvdauthor.sourceforge.net/"
 license=('GPL')
-depends=('libdvdread' 'imagemagick')
+depends=('libdvdread' 'imagemagick' 'fribidi')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('bd646b47950c4091ffd781d43fd2c5e9')
+md5sums=('ded5373800ac6448ff044606f5047550')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

kdenlive/PKGBUILD

@@ -8,18 +8,18 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=kdenlive
-pkgver=0.7.7.1
+pkgver=0.7.8
 pkgrel=1
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64')
 url="http://www.kdenlive.org/"
 license=('GPL')
-depends=('kdelibs>=4.4.5' 'mlt>=0.5.6' 'dvgrab' 'kdebase-runtime')
+depends=('kdelibs>=4.4.5' 'mlt>=0.5.10' 'dvgrab' 'kdebase-runtime')
 optdepends=("dvdauthor: for creating dvds"
 	    "recordmydesktop: for desktop-recordings")
 makedepends=('automoc4' 'cmake' 'gettext')
 source=(http://downloads.sourceforge.net/kdenlive/kdenlive-$pkgver.tar.gz)
-md5sums=('ff18ee589297c1cca2c165fd4d3a4731')
+md5sums=('7011d0c6b26f7f2350065defef3d9a76')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"

packer/PKGBUILD

@@ -8,7 +8,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=packer
-pkgver=20100908
+pkgver=20100927
 pkgrel=1
 pkgdesc="Bash wrapper for pacman and aur"
 url="http://github.com/bruenig/packer"
@@ -19,20 +19,20 @@ depends=('grep' 'sed' 'coreutils' 'bash' 'wget' 'pacman')
 optdepends=('sudo: install and update packages as non-root'
             'pacman-color: colorized output'
             'base-devel: for building packages')
-_gitroot='git://github.com/bruenig/packer.git'
-_gitname='packer'
+source=(http://chakra-project.org/sources/packer/packer-$pkgver-$pkgrel.tar.xz)
+md5sums=(1e07a9dfa6b9b109efe5a8651f98f976)
+
+# source PKGBUILD && _create-tarball
+_create-tarball() {
+    mkdir -p "packer"
+    git clone git://github.com/bruenig/packer.git "packer"
+    tar -cJf packer-$pkgver-$pkgrel.tar.xz "packer"
+    md5sum "packer-$pkgver-$pkgrel.tar.xz"
+    rm -rf "packer"
+}
 
 build() {
-    cd "$startdir/src"
-  
-    msg "Connecting to github GIT server...."
-    
-    if [ -d "$startdir/src/$_gitname" ] ; then
-        cd $_gitname && git pull origin
-    else
-        git clone "$_gitroot"
-        cd $_gitname
-    fi
+    cd "$startdir/src/packer"
       
     install -m 755 -D packer "$startdir/pkg/usr/bin/packer"
     install -m 644 -D packer.8 "$startdir/pkg/usr/share/man/man8/packer.8"

wine/PKGBUILD

@@ -10,10 +10,8 @@ pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
-source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
-        unbreak-wow64.patch)
-md5sums=('f266536a8096f6b705f2f802549dc0e5'
-         'c3118b7df69ad4e93b5ce98f6a592620')
+source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
+md5sums=('36fe53f4db6d5d98b01f5d5f2cd24d11')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -31,9 +29,7 @@ depends=(
 )
 
 makedepends=(autoconf ncurses bison perl fontforge flex prelink
-  'gcc>=4.5.0-2'  cross32-gcc
-                  'lib32-glibc>=2.12-5'
-  libgphoto2
+  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
   giflib          lib32-giflib
   libxpm          lib32-libxpm
   libpng          lib32-libpng
@@ -46,134 +42,100 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
   libldap         lib32-libldap
   lcms            lib32-lcms
   openal          lib32-openal
-  esound          lib32-esound
   jack            lib32-jack
-  cups            lib32-libcups
-  sane
-  samba
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
 )
   
 optdepends=(
-  libgphoto2
-  giflib        lib32-giflib
-  libpng        lib32-libpng
-  libldap       lib32-libldap
-  lcms          lib32-lcms
-  libxml2       lib32-libxml2
-  openal        lib32-openal
-  esound        lib32-esound
-  jack          lib32-jack
-  cups          lib32-libcups
-  sane
-  samba
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  libxml2         lib32-libxml2
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
 )
 
 if [[ $CARCH == i686 ]]; then
   # Strip lib32 etc. on i686
   depends=(${depends[@]/*32-*/})
   makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
   optdepends=(${optdepends[@]/*32-*/})
 else
   provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
   conflicts=('bin32-wine' 'wine-wow64')
   replaces=('bin32-wine')
-  _libdir32=/opt/lib32/usr/lib
-  _libdir64=/usr/lib
 fi
 
-
 build() {
   cd "$srcdir"
 
   # Allow ccache to work
   mv $pkgname-$_pkgbasever $pkgname
 
-msg2 "Patching..."
-
-  (
-    cd $pkgname
-    patch -Np1 -i "$srcdir/unbreak-wow64.patch"
-  )
-
-  # (Re)create build dirs
+  # Get rid of old build dirs
   rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
 
-  if [[ $CARCH == i686 ]]; then
-
-msg2 "Building Wine..."
-
-    cd "$srcdir/$pkgname-32-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --with-x
-
-    make
-
-  else
-
-msg2 "Building Wine-64..."
+  if [[ $CARCH == x86_64 ]]; then
+    msg2 "Building Wine-64..."
 
+    mkdir $pkgname-64-build
     cd "$srcdir/$pkgname-64-build"
     ../$pkgname/configure \
       --prefix=/usr \
-      --libdir="$_libdir64" \
       --sysconfdir=/etc \
+      --libdir=/usr/lib \
       --with-x \
       --enable-win64
 
     make
 
-msg2 "Building Wine-32..."
+    # Wine32 build needs a patched ldd
+    # Do it here until it's patched in glibc
+    cp /usr/bin/ldd "$srcdir/ldd"
+    sed -i '/^RTLDLIST=/s:"$: /lib/ld-linux.so.2&:' "$srcdir/ldd"
 
-    cd "$srcdir/$pkgname-32-build"
-    ../$pkgname/configure \
-       CFLAGS="${CFLAGS/x86-64/i686}" \
-       CXXFLAGS="${CXXFLAGS/x86-64/i686}" \
-       LDFLAGS="$LDFLAGS -L/opt/lib32/lib -L/opt/lib32/usr/lib" \
-       LDD=/usr/bin/ldd32 \
-       --host=i686-unknown-linux-gnu \
-       --prefix=/usr \
-       --libdir="$_libdir32" \
-       --sysconfdir=/etc \
-       --with-x \
-       --with-wine64="$srcdir/$pkgname-64-build"
+    _wine32opts=(
+      LDD="$srcdir/ldd"
+      --libdir=/usr/lib32
+      --with-wine64="$srcdir/$pkgname-64-build"
+    )
 
-    make
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
   fi
-}
 
-package() {
-  if [[ $CARCH == i686 ]]; then
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-x \
+    "${_wine32opts[@]}"
 
-msg2 "Packaging Wine..."
+  make
+}
 
-    cd "$srcdir/$pkgname-32-build"
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
 
+  if [[ $CARCH == i686 ]]; then
     make prefix="$pkgdir/usr" install
-
   else
-
-msg2 "Packaging Wine-32..."
-
-    cd "$srcdir/$pkgname-32-build"
-
     make prefix="$pkgdir/usr" \
-      libdir="$pkgdir$_libdir32" \
-      dlldir="$pkgdir$_libdir32/wine" install
-
-msg2 "Packaging Wine-64..."
+      libdir="$pkgdir/usr/lib32" \
+      dlldir="$pkgdir/usr/lib32/wine" install
 
+    msg2 "Packaging Wine-64..."
     cd "$srcdir/$pkgname-64-build"
-
     make prefix="$pkgdir/usr" \
-      libdir="$pkgdir$_libdir64" \
-      dlldir="$pkgdir$_libdir64/wine" install
+      libdir="$pkgdir/usr/lib" \
+      dlldir="$pkgdir/usr/lib/wine" install
   fi
-
-  mkdir -p "$pkgdir/etc/wine"
 }
 
-# vim:set ts=8 sts=2 sw=2 et:
-