Tue Jan 3 23:14:42 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-01-03 23:14:43 +0000
committer: root <root@rshg054.dnsready.net> 2012-01-03 23:14:43 +0000
commit: d1d68784dc66793601c239fa64cc0e02ebd9444e (patch)
tree: 15179b96ec3e632fad3cc528115d83c0fe47e5bd
parent: 48c96871761a4aad193d814e87ddb87c322e17d2 (diff)
66 files changed, 2057 insertions, 144 deletions
diff --git a/community-staging/pkgtools/PKGBUILD b/community-staging/pkgtools/PKGBUILD
new file mode 100644
index 000000000..922bb5fa3
--- /dev/null
+++ b/community-staging/pkgtools/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
+# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
+pkgname=pkgtools
+pkgver=23
+pkgrel=3
+pkgdesc="A collection of scripts for Arch Linux packages"
+arch=('i686' 'x86_64')
+url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
+license=('GPL')
+source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
+backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
+install=pkgtools.install
+provides=(newpkg pkgfile)
+depends=('bash>=4' 'pcre' 'libarchive' 'python')
+optdepends=('cron: For pkgfile --update entry'
+            'abs: Provides proto packaging files for newpkg'
+            'python-yaml: for gem2arch'
+            'python2: for pkgconflict')
+md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
+
+build() {
+  cd "$srcdir/Daenyth-$pkgname"-*
+
+  make
+}
+
+package() {
+  cd "$srcdir/Daenyth-$pkgname"-*
+
+  make DESTDIR="$pkgdir" install
+
+  # fix infinite loop in autotools configure scripts
+  sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/pkgtools/pkgtools.install b/community-staging/pkgtools/pkgtools.install
new file mode 100644
index 000000000..bcbf2f85c
--- /dev/null
+++ b/community-staging/pkgtools/pkgtools.install
@@ -0,0 +1,66 @@
+_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
+_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
+   If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
+_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
+   This will automatically run pkgfile whenever you run
+   a command which the shell cannot find. If you want
+   this functionality, set CMD_SEARCH_ENABLED to 1 in
+   /etc/pkgtools/pkgfile.conf (or per-user by copying
+   that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
+   in your current shell run:
+     source /etc/profile"
+
+is_update_from() {
+  res="`vercmp $1 $2`"
+  case $res in
+    '-1'|'0') return 0;;
+    '1') return 1;;
+  esac
+}
+
+## arg 1:  the new package version
+post_install() {
+  echo "$_MSG_UPDATE"
+  echo "$_MSG_HOOK"
+  echo "$_MSG_CRON"
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  if is_update_from $2 11-1; then
+    echo " - All bugs related to pkgfile -b should be fixed in this update."
+  fi
+  if is_update_from $2 12-1; then
+    echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
+    echo "   Please remove any old symlinks relating to it."
+    echo "$_MSG_HOOK"
+  fi
+  if is_update_from $2 15-1; then
+    echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
+    echo "   run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
+  fi
+  if is_update_from $2 18-1; then
+    echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
+  fi
+  if is_update_from $2 19-1; then
+    echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
+    echo "   regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
+    echo "   in /etc/pkgtools/pkgfile.conf"
+    echo " - This version of pkgtools contains a new tool called 'maintpkg'"
+    echo "   It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
+  fi
+  if is_update_from $2 22-1; then
+    echo " - This is the largest release in a long time. This updates all python scripts to py3k."
+    echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
+  fi
+}
+
+## arg 1:  the old package version
+post_remove() {
+  cat << _EOM
+ - You may want to clean /var/cache/pkgtools/lists
+_EOM
+}
+
+# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community-testing/fpc/Makefile-mk382.diff b/community-testing/fpc/Makefile-mk382.diff
new file mode 100644
index 000000000..00909766d
--- /dev/null
+++ b/community-testing/fpc/Makefile-mk382.diff
@@ -0,0 +1,174 @@
+--- Makefile.fpc.orig	2011-04-02 01:15:34.000000000 +0400
++++ Makefile.fpc	2011-08-05 22:29:44.000000000 +0400
+@@ -4,7 +4,7 @@
+ 
+ [package]
+ name=compiler
+-version=2.4.4
++version=2.5.1
+ 
+ [target]
+ programs=pp
+@@ -32,7 +32,7 @@
+ unexport FPC_VERSION FPC_COMPILERINFO
+ 
+ # Which platforms are ready for inclusion in the cycle
+-CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips
++CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
+ 
+ # All supported targets used for clean
+ ALLTARGETS=$(CYCLETARGETS)
+@@ -148,6 +148,12 @@
+ ifeq ($(CPC_TARGET),arm)
+ CPUSUF=arm
+ endif
++ifeq ($(CPC_TARGET),mips)
++CPUSUF=mips
++endif
++ifeq ($(CPC_TARGET),mipsel)
++CPUSUF=mipsel
++endif
+ 
+ # Do not define the default -d$(CPU_TARGET) because that
+ # will conflict with our -d$(CPC_TARGET)
+@@ -224,12 +230,39 @@
+ override LOCALOPT+=
+ endif
+ 
++# mipsel specific
++ifeq ($(PPC_TARGET),mipsel)
++override LOCALOPT+=-Fumips
++endif
++
++
++OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
++OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
++# symbol liveness WPO requires nm, smart linking and no stripping (the latter
++# is forced by the Makefile when necessary)
++ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
++ifdef LINKSMART
++ifdef CREATESMART
++OPTWPOCOLLECT+=-OWsymbolliveness -Xs-
++OPTWPOPERFORM+=-Owsymbolliveness
++endif
++endif
++endif
++
++
+ [rules]
+ #####################################################################
+ # Setup Targets
+ #####################################################################
+ 
+ ifeq ($(OS_TARGET),win32)
++USE_CMP_FOR_DIFF=1
++endif
++ifeq ($(OS_TARGET),win64)
++USE_CMP_FOR_DIFF=1
++endif
++
++ifdef USE_CMP_FOR_DIFF
+ ifdef CMP
+ override DIFF:=$(CMP) -i218
+ endif
+@@ -267,6 +300,8 @@
+ TEMPNAME1=ppc1$(EXEEXT)
+ TEMPNAME2=ppc2$(EXEEXT)
+ TEMPNAME3=ppc3$(EXEEXT)
++TEMPWPONAME1=ppcwpo1$(EXEEXT)
++TEMPWPONAME2=ppcwpo2$(EXEEXT)
+ MAKEDEP=ppdep$(EXEEXT)
+ MSG2INC=./msg2inc$(EXEEXT)
+ ifdef CROSSINSTALL
+@@ -327,15 +362,15 @@
+         -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
+ 
+ tempclean:
+-        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
++        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo
+ 
+ execlean :
+-        -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
++        -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2)
+ 
+ $(addsuffix _clean,$(ALLTARGETS)):
+         -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
+         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
+-        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
++        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME))
+ 
+ cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET))
+         -$(DEL) $(EXENAME)
+@@ -444,6 +479,28 @@
+ # Normal cycle
+ #
+ 
++ifndef NOWPOCYCLE
++ifdef RELEASE
++DOWPOCYCLE=1
++# Two WPO cycles in case of RELEASE=1
++wpocycle:
++# don't use cycle_clean, it will delete the compiler utilities again
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(MOVE) $(EXENAME) $(TEMPWPONAME1)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(COPY) $(EXENAME) $(TEMPWPONAME2)
++endif
++endif
++
++ifndef DOWPOCYCLE
++wpocycle:
++endif
++
+ # Used to avoid unnecessary steps
+ ifdef DIFF
+ ifdef OLDFPC
+@@ -490,6 +547,7 @@
+         $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next
+         $(DIFF) $(TEMPNAME3) $(EXENAME)
+         $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)'
++        $(MAKE) wpocycle
+         $(MAKE) echotime
+ 
+ else
+@@ -508,8 +566,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
+@@ -523,10 +584,10 @@
+ # ppc3/ppcXXX = native (skipped for cross installation)
+ #
+ 
++cycle: override FPC=
+ cycle:
+ # ppc (source native)
+ # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here
+-override FPC=
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler
+ # ppcross<ARCH> (source native)
+@@ -535,8 +596,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
diff --git a/community-testing/fpc/PKGBUILD b/community-testing/fpc/PKGBUILD
new file mode 100644
index 000000000..16a70055a
--- /dev/null
+++ b/community-testing/fpc/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 61547 2012-01-02 19:53:55Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
+# Contributor: Jan Willemson <janwil@hot.ee>
+# Contributor: Hugo Ideler <hugoideler@dse.nl>
+# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
+# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
+
+pkgname=fpc
+pkgver=2.6.0
+pkgrel=1
+pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
+arch=('i686' 'x86_64')
+url="http://www.freepascal.org/"
+license=('GPL' 'LGPL' 'custom')
+backup=("etc/fpc.cfg")
+depends=(ncurses)
+makedepends=(fpc)
+options=(zipman)
+source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz)
+md5sums=('17375e665a4e1311f85812fe2754f609')
+
+build() {
+  cd ${srcdir}/fpcbuild-$pkgver
+  pushd fpcsrc/compiler
+  fpcmake -Tall
+  popd
+  make NOGDB=1 build
+}
+
+package() {
+  cd ${srcdir}/fpcbuild-$pkgver
+
+  export HOME=$srcdir
+
+  make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install
+
+  export PATH=$pkgdir/usr/bin:$PATH
+
+  install -Dm0644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/COPYING.FPC
+
+  [ "$CARCH" = "i686" ] && ln -s /usr/lib/fpc/${pkgver}/ppc386 ${pkgdir}/usr/bin/
+  [ "$CARCH" = "x86_64" ] && ln -s /usr/lib/fpc/${pkgver}/ppcx64 ${pkgdir}/usr/bin/
+
+  mkdir -p ${pkgdir}/etc
+  ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg $pkgdir/usr/lib/fpc/${pkgver} ${pkgdir}/etc
+
+  mv $pkgdir/usr/man $pkgdir/usr/share/
+
+  find $pkgdir/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \;
+}
diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD
new file mode 100644
index 000000000..8e66362d6
--- /dev/null
+++ b/community-testing/gpac/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 61561 2012-01-03 00:05:30Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=gpac
+pkgver=3824
+pkgrel=1
+pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
+arch=('i686' 'x86_64')
+url="http://gpac.sourceforge.net"
+license=('LGPL')
+depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa')
+makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad')
+optdepends=('jack: for jack support' 'a52dec: for A52 support'
+            'faad2: for AAC support' 'libmad: for mp3 support')
+options=('!makeflags')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('bf7039c2585d539475babc7996851627efd7ec59')
+
+# source PKGBUILD && mksource
+mksource() {
+  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
+  _svnver=$pkgver
+  _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
+  _svnmod="$pkgname-$pkgver"
+  mkdir ${pkgname}-$pkgver
+  pushd ${pkgname}-$pkgver
+  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
+  echo "#define GPAC_SVN_REVISION	\"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h
+  find . -depth -type d -name .svn -exec rm -rf {} \;
+  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
+  popd
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-lib
+}
diff --git a/community-testing/lazarus/ChangeLog b/community-testing/lazarus/ChangeLog
new file mode 100644
index 000000000..79ed3b287
--- /dev/null
+++ b/community-testing/lazarus/ChangeLog
@@ -0,0 +1,3 @@
+2008-01-21  JJDaNiMoTh  <jjdanimoth.aur@gmail.com>
+
+    * PKGBUILD: moved man pages to /usr/share
diff --git a/community-testing/lazarus/PKGBUILD b/community-testing/lazarus/PKGBUILD
new file mode 100644
index 000000000..5bba33fb7
--- /dev/null
+++ b/community-testing/lazarus/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 61551 2012-01-02 20:07:08Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
+
+pkgname=lazarus
+pkgver=0.9.30.2
+pkgrel=2
+pkgdesc='Delphi-like IDE for FreePascal'
+url='http://www.lazarus.freepascal.org/'
+license=('GPL2' 'MPL' 'custom:LGPL')
+arch=('i686' 'x86_64')
+depends=('fpc' 'fpc-src' 'gtk2')
+#makedepends=(rpmextract)
+options=('!emptydirs' '!makeflags')
+source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2)
+md5sums=('0dcf54613c2f9d38a32d183431e2dfc9')
+
+build() {
+  cd $srcdir/${pkgname}
+  make FPC=/usr/bin/fpc clean bigide
+}
+
+package() {
+  cd $srcdir/${pkgname}
+
+  # skip the 'make install' mess completely and do everything manually
+  mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc
+  rm -r debian
+  cp -R . $pkgdir/usr/lib/lazarus
+
+  ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus
+  ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus
+  ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild
+
+  cp -R install/man/man1/* $pkgdir/usr/share/man/man1/
+
+  mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus
+
+  # make 'desktop-file-validate' happy and fix missing .png icon
+  sed -e 's|\(Categories\).*|\1=IDE;Development;|' \
+      -e 's|\.png|\.xpm|' -i install/lazarus.desktop
+  install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
+  install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
+  rm -r $pkgdir/usr/lib/lazarus/install
+
+  # license files: /usr/lib/lazarus/COPYING*
+  install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
+
+  # strip
+  find $pkgdir -perm /ugo+x -type f -exec strip {} \;
+  find $pkgdir -name \*.so -type f -exec strip {} \;
+}
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index 3bedc783f..c9367da60 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-modules-extra-svn
-pkgver=66402
+pkgver=66640
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
 arch=('i686' 'x86_64')
 groups=('e17-extra-svn')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('e-svn' 'libxkbfile' 'emprint-svn' 'libmpd' 'efreet-svn' 'e_dbus-svn')
+depends=('e-svn' 'libxkbfile' 'libmpd' 'efreet-svn' 'e_dbus-svn' 'emprint-svn')
 makedepends=('subversion')
 conflicts=('e-modules-extra')
 provides=('e-modules-extra')
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 0af60fa68..394e3f8c7 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61304 2011-12-28 09:16:51Z rvanharen $
+# $Id: PKGBUILD 61522 2012-01-02 10:51:45Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-svn
-pkgver=66577
+pkgver=66707
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 156f5c6ec..a0037209a 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61302 2011-12-28 09:16:20Z rvanharen $
+# $Id: PKGBUILD 61520 2012-01-02 10:50:24Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index ddf7b3fba..a7de9381f 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61292 2011-12-28 09:13:58Z rvanharen $
+# $Id: PKGBUILD 61514 2012-01-02 10:37:36Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ecore-svn
-pkgver=66578
+pkgver=66702
 pkgrel=1
 pkgdesc="Ecore is an abstraction layer for e17"
 arch=('i686' 'x86_64')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index 5bd376e54..8821ddd52 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61288 2011-12-28 09:12:48Z rvanharen $
+# $Id: PKGBUILD 61510 2012-01-02 10:30:50Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eet-svn
-pkgver=66148
+pkgver=66634
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index b891a574a..d86eaf1ea 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61300 2011-12-28 09:15:52Z rvanharen $
+# $Id: PKGBUILD 61518 2012-01-02 10:45:51Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index 7dd8ecc23..f0840e0df 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61286 2011-12-28 09:12:19Z rvanharen $
+# $Id: PKGBUILD 61507 2012-01-02 10:24:26Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina-svn
-pkgver=66483
+pkgver=66694
 pkgrel=1
 pkgdesc="E17 file chunk reading/writing library"
 arch=('i686' 'x86_64')
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index 32083801f..40cc29b45 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61296 2011-12-28 09:14:55Z rvanharen $
+# $Id: PKGBUILD 61516 2012-01-02 10:43:43Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD
index c32c6e363..301d52d78 100755
--- a/community/emprint-svn/PKGBUILD
+++ b/community/emprint-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61524 2012-01-02 10:53:00Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=emprint-svn
-pkgver=61738
+pkgver=64443
 pkgrel=1
 pkgdesc="screenshot module for e17"
 arch=('i686' 'x86_64')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index d2de06582..b5539c63f 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61290 2011-12-28 09:13:15Z rvanharen $
+# $Id: PKGBUILD 61512 2012-01-02 10:34:03Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas-svn
-pkgver=66570
+pkgver=66727
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64')
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index a2bdd189c..ccfbf4d53 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59673 2011-11-29 10:05:44Z spupykin $
+# $Id: PKGBUILD 61559 2012-01-02 22:44:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.7
+pkgver=1.5.0.8
 pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema
 options=('docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
 	opencv-buildfix.patch)
-md5sums=('66ef32dab2b424c25ac7ced06fc69bbf'
+md5sums=('530e733b81e3c1cca7f17bfad4a56821'
          'f135182ced743c296e08ddd560fa6be9')
 
 build() {
diff --git a/community/krename/PKGBUILD b/community/krename/PKGBUILD
index 5186211c1..8c802de9c 100644
--- a/community/krename/PKGBUILD
+++ b/community/krename/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 56339 2011-10-05 19:08:08Z andrea $
+# $Id: PKGBUILD 61563 2012-01-03 03:32:45Z ebelanger $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=krename
-pkgver=4.0.7
-pkgrel=2
+pkgver=4.0.9
+pkgrel=1
 pkgdesc="A very powerfull batch file renamer for KDE"
 arch=('i686' 'x86_64')
 url="http://www.krename.net"
 license=('GPL')
-depends=('kdelibs' 'taglib' 'xdg-utils')
+depends=('kdebase-runtime' 'taglib')
 makedepends=('cmake' 'automoc4')
 options=('libtool')
 install=krename.install
 source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c53d1819247a88bc4f49d52936f1e2bc7fa9850d')
+sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e')
 
 build() {
   cd "${srcdir}"
diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD
index ab2f8549f..8a00d0a65 100644
--- a/community/libmnl/PKGBUILD
+++ b/community/libmnl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 59542 2011-11-28 00:38:43Z seblu $
+# $Id: PKGBUILD 61555 2012-01-02 21:43:24Z seblu $
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net
 # Contributor: Christian Hesse <mail@earthworm.de>
 
 pkgname=libmnl
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.2
+pkgrel=1
 pkgdesc='Minimalistic user-space library oriented to Netlink developers.'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/libmnl/'
 license=('LGPL2.1')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('e936236bb57a2375afa4e70e75dc3ba9')
+sha1sums=('62440193d128adc0946a8737e86dc0068424eedb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 9b5dd3a67..b6cdcd8c1 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -4,7 +4,7 @@
 _pkg=OpenImageIO
 pkgname=openimageio
 pkgver=0.10.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
@@ -12,6 +12,7 @@ license=('custom')
 depends=('openexr' 'boost-libs' 'jasper' 'glew')
 makedepends=('cmake' 'qt' 'python2' 'boost')
 optdepends=('qt: iv image viewer' 'python2: bindings support')
+options=(!buildflags)
 source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}")
 md5sums=('08a1bc2b82862ad5547bba569f4f633f')
 
diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD
index bd5ee48d6..7ef36f88c 100644
--- a/community/pam_pwcheck/PKGBUILD
+++ b/community/pam_pwcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 7508 2010-01-07 03:43:27Z dgriffiths $
+# $Id: PKGBUILD 61543 2012-01-02 13:40:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pam_pwcheck
 pkgver=3.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A password strength checking module for PAM-aware password changing programs"
 arch=(i686 x86_64)
 url="http://www.thkukuk.de/pam/pam_pwcheck/"
@@ -13,9 +13,8 @@ source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.
 md5sums=('27be63338af88d14610d182b6a161cd1')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --mandir=/usr/share
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index c72ff78e3..09e64feba 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61372 2011-12-29 07:38:35Z spupykin $
+# $Id: PKGBUILD 61545 2012-01-02 13:41:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=31.1.0
+pkgver=31.2.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell')
 install=tea.install
 source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('2b9671ed681de662f556c5a8f3efc321'
+md5sums=('720a9b586d0ae3f73f83dc954bd17a21'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index 7b2d84942..fcf9f4d25 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 143599 2011-11-26 23:39:41Z eric $
+# $Id: PKGBUILD 145843 2012-01-02 20:31:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=bluefish
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="A powerful HTML editor for experienced web designers and programmers"
 arch=('i686' 'x86_64')
 url="http://bluefish.openoffice.nl/"
 license=('GPL3')
-depends=('gtk3' 'enchant' 'desktop-file-utils')
+depends=('gtk3' 'enchant' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('gucharmap' 'intltool')
 optdepends=('gucharmap: for using the charmap plugin')
 options=('!libtool')
 install=bluefish.install
 source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig})
-sha1sums=('b8f5dad17c7365bc6f4342b6c22bdc328e31d20d'
-          'faf37ece57fc155c3510e5d6cec5679f22cd11f4')
+sha1sums=('f7b2e9915e196c971c6bcca04d8d6b87efab1ae6'
+          '89d5130d91999ff0319b709f0ed2cbcf7aa028d6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+    src/plugin_zencoding/zencoding/{,filters/,actions/}*.py
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --enable-spell-check --disable-update-databases --disable-xml-catalog-update
   make
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 8f7577438..bb7f1e9ca 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141903 2011-11-03 00:30:00Z bisson $
+# $Id: PKGBUILD 145829 2012-01-02 13:33:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a5964122bf2ee2675eb9423dea7839410806fee9')
+sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 832edd85d..f34e49306 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145146 2011-12-18 00:41:44Z pierre $
+# $Id: PKGBUILD 145827 2012-01-02 12:43:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=4.3.15
-pkgrel=1
+pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -11,13 +11,15 @@ license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
 install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile')
+        'zprofile' 'svn-1.7.patch')
 backup=('etc/zsh/zprofile')
 md5sums=('11766b0dd674a513810903cd33ffcac4'
-         '24a9335edf77252a7b5f52e079f7aef7')
+         '24a9335edf77252a7b5f52e079f7aef7'
+         '4fcbc119fdb624a8c483a278f3a82efd')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i "${srcdir}/svn-1.7.patch"
 	# FS#16360
 	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
 				 Doc/zsh.texi \
diff --git a/extra/zsh/svn-1.7.patch b/extra/zsh/svn-1.7.patch
new file mode 100644
index 000000000..5ef314cc9
--- /dev/null
+++ b/extra/zsh/svn-1.7.patch
@@ -0,0 +1,34 @@
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+index b1cb730..41cc3e7 100644
+--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
++++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+@@ -6,12 +6,28 @@
+ 
+ setopt localoptions noksharrays extendedglob NO_shwordsplit
+ local svnbase svnbranch a b rrn
++local -i rc
+ local -A svninfo parentinfo
+ local -xA hook_com
+ 
+ svnbase=".";
+ svninfo=()
+-${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
++# Unfortunately, `$pipestatus' is broken currently. Until that problem is
++# resolved, here is a workaround that will get things done, without using it.
++# Clumsily, but that's life.
++local -a dat
++dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} )
++rc=$?
++(( rc != 0 )) && return 1
++# The following line is the real code, the following is the workaround.
++#${vcs_comm[cmd]} info --non-interactive \
++print -l "${dat[@]}" \
++|& while IFS=: read a b; do
++    svninfo[${a// /_}]="${b## #}"
++done
++#rc=${pipestatus[1]}
++#(( rc != 0 )) && return 1
++
+ while [[ -d "${svnbase}/../.svn" ]]; do
+     parentinfo=()
+     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done
diff --git a/gnu/README b/gnu/README
new file mode 100644
index 000000000..1b506dae2
--- /dev/null
+++ b/gnu/README
@@ -0,0 +1 @@
+This repo is for GNU software needed for some gnu.org tasks
diff --git a/gnu/gnun/PKGBUILD b/gnu/gnun/PKGBUILD
new file mode 100644
index 000000000..00b5b8116
--- /dev/null
+++ b/gnu/gnun/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+#
+
+pkgname=gnun
+pkgver=0.4
+pkgrel=1
+arch=('any')
+license=('GPL3')
+pkgdesc="Build system for gnu.org translations"
+url="http://www.gnu.org/software/gnun/"
+depends=('guile' 'po4a' 'libxml2')
+makedepends=('heirloom-mailx' 'cvs' 'svn')
+optdepends=('cvs: for CVS support'
+            'subversion: for Subversion support')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('3baf8a16cc017e6335e65975c7223ac8'
+         '9bd1bada0b07154cf3e1c1cf937194e7')
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    ./configure --prefix=/usr --libexecdir=/usr/lib
+
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    make DESTDIR=${pkgdir} install install-info
+}
diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD
index 579464504..bfa567b89 100644
--- a/kde-unstable/kdemultimedia/PKGBUILD
+++ b/kde-unstable/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145540 2011-12-22 23:11:51Z andrea $
+# $Id: PKGBUILD 145819 2012-01-02 11:17:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
 pkgver=4.7.95
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -19,11 +19,16 @@ groups=('kde' 'kdemultimedia')
 makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
              'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
+        'mplayerthumbs.config'
+        'fix-kmix-high-cpu.patch')
 sha1sums=('8c56f7bcbfd012492f97a3a827f97d07b7b6b390'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+          'd993b72004378aee84de3d410e9b25f91aa88138')
 
 build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p0 -i "${srcdir}"/fix-kmix-high-cpu.patch
+
     cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch b/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch
new file mode 100644
index 000000000..8ff32e866
--- /dev/null
+++ b/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch
@@ -0,0 +1,195 @@
+Index: kmix/gui/mdwslider.h
+===================================================================
+--- kmix/gui/mdwslider.h	(revision 1270927)
++++ kmix/gui/mdwslider.h	(revision 1270928)
+@@ -56,7 +56,7 @@
+ 	       bool includePlayback, bool includeCapture,
+ 	       bool small, Qt::Orientation,
+ 	       QWidget* parent, ViewBase* view, ProfControl *pctl);
+-    ~MDWSlider() { }
++    virtual ~MDWSlider();
+ 
+     enum LabelType { LT_ALL, LT_FIRST_CAPTURE, LT_NONE };
+     void addActionToPopup( KAction *action );
+Index: kmix/gui/viewbase.cpp
+===================================================================
+--- kmix/gui/viewbase.cpp	(revision 1270927)
++++ kmix/gui/viewbase.cpp	(revision 1270928)
+@@ -128,13 +128,14 @@
+     // allow view to "polish" itself
+     constructionFinished();
+ 
+-   kDebug() << "CONNECT ViewBase count " << _mixers.size();
+-  foreach ( Mixer* mixer, _mixers )
+-  {
+-    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id(); 
+-   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
+-   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
+-  }
++// Moved the following up one Level to KMixerWidget
++//   kDebug() << "CONNECT ViewBase count " << _mixers.size();
++//  foreach ( Mixer* mixer, _mixers )
++//  {
++//    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
++//   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
++//   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
++//  }
+ 
+     
+ }
+@@ -217,10 +218,6 @@
+ 		setMixSet();
+ 		kDebug(67100) << "ViewBase::controlsReconfigured() " << mixer_ID << ": Recreating widgets (mixset contains: " << _mixSet->count() << ")";
+ 		createDeviceWidgets();
+-
+-		// We've done the low level stuff our selves but let elements
+-		// above know what has happened so they can reload config etc.
+-		emit redrawMixer(mixer_ID);
+ 	}
+ }
+ 
+Index: kmix/gui/kmixerwidget.h
+===================================================================
+--- kmix/gui/kmixerwidget.h	(revision 1270927)
++++ kmix/gui/kmixerwidget.h	(revision 1270928)
+@@ -75,6 +75,10 @@
+    void saveConfig( KConfig *config );
+    void loadConfig( KConfig *config );
+ 
++  private slots:
++    void controlsReconfiguredToplevel(QString mixerId);
++    void refreshVolumeLevelsToplevel();
++
+   private:
+    Mixer *_mixer;
+    QVBoxLayout *m_topLayout; // contains TabWidget
+@@ -82,6 +86,7 @@
+    ProfTab* _tab;
+    std::vector<ViewBase*> _views;
+    KActionCollection* _actionCollection;  // -<- applciations wide action collection
++   QWidget* _mainWindow;
+ 
+    
+    void createLayout(ViewBase::ViewFlags vflags);
+Index: kmix/gui/mixdevicewidget.h
+===================================================================
+--- kmix/gui/mixdevicewidget.h	(revision 1270927)
++++ kmix/gui/mixdevicewidget.h	(revision 1270928)
+@@ -47,7 +47,7 @@
+     MixDeviceWidget( MixDevice* md,
+                      bool small, Qt::Orientation orientation,
+                      QWidget* parent, ViewBase*, ProfControl * );
+-    ~MixDeviceWidget();
++    virtual ~MixDeviceWidget();
+ 
+     void addActionToPopup( KAction *action );
+ 
+Index: kmix/gui/mdwslider.cpp
+===================================================================
+--- kmix/gui/mdwslider.cpp	(revision 1270927)
++++ kmix/gui/mdwslider.cpp	(revision 1270928)
+@@ -81,6 +81,17 @@
+     update();
+ }
+ 
++MDWSlider::~MDWSlider()
++{
++	foreach( QAbstractSlider* slider, m_slidersPlayback)
++	{
++		delete slider;
++	}
++	foreach( QAbstractSlider* slider, m_slidersCapture)
++	{
++		delete slider;
++	}
++}
+ 
+ void MDWSlider::createActions()
+ {
+Index: kmix/gui/kmixerwidget.cpp
+===================================================================
+--- kmix/gui/kmixerwidget.cpp	(revision 1270927)
++++ kmix/gui/kmixerwidget.cpp	(revision 1270928)
+@@ -37,6 +37,7 @@
+ #include <ktabwidget.h>
+ 
+ // KMix
++#include "apps/kmix.h"
+ #include "gui/guiprofile.h"
+ #include "gui/kmixerwidget.h"
+ #include "gui/kmixtoolbox.h"
+@@ -58,6 +59,8 @@
+      m_topLayout(0), _guiprof(guiprof),
+      _actionCollection(actionCollection)
+ {
++	_mainWindow = parent;
++	//kDebug() << "kmixWindow created: parent=" << parent << ", parentWidget()=" << parentWidget();
+    if ( _mixer )
+    {
+       createLayout(vflags);
+@@ -169,13 +172,42 @@
+       connect( vbase, SIGNAL(toggleMenuBar()), parentWidget(), SLOT(toggleMenuBar()) );
+       // *this will be deleted on rebuildGUI(), so lets queue the signal
+       connect( vbase, SIGNAL(rebuildGUI())   , parentWidget(), SLOT(recreateGUIwithSavingView()), Qt::QueuedConnection );
+-      connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
++      //connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
++
++      kDebug() << "CONNECT ViewBase count " << vbase->getMixers().size();
++	  foreach ( Mixer* mixer, vbase->getMixers() )
++	  {
++	    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
++	   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevelsToplevel()) );
++	   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfiguredToplevel(QString)) );
++	  }
+       return true;
+    }
+ }
+ 
++void KMixerWidget::controlsReconfiguredToplevel(QString mixerId)
++{
++	foreach ( ViewBase* vbase, _views)
++	{
++		vbase->controlsReconfigured(mixerId);
++	}
++	KMixWindow* kmixWindow = qobject_cast<KMixWindow*>(_mainWindow);
++	kDebug() << "kmixWindow to redraw: " << kmixWindow << ", not-casted=" << _mainWindow;
++	if (kmixWindow != 0)
++	{
++		kmixWindow->redrawMixer(mixerId);
++	}
++}
+ 
++void KMixerWidget::refreshVolumeLevelsToplevel()
++{
++	foreach ( ViewBase* vbase, _views)
++	{
++		vbase->refreshVolumeLevels();
++	}
++}
+ 
++
+ /**
+  * Returns the current View. Normally we have only one View, so we always return the first view.
+  * This method is only here for one reason: We can plug in an action in the main menu, so that
+Index: kmix/gui/viewbase.h
+===================================================================
+--- kmix/gui/viewbase.h	(revision 1270927)
++++ kmix/gui/viewbase.h	(revision 1270928)
+@@ -114,6 +114,8 @@
+    GUIProfile* guiProfile() { return _guiprof; };
+    KActionCollection* actionCollection() { return _actions; };
+ 
++   QSet<Mixer*>& getMixers() { return _mixers; };
++
+     /**
+      * Contains the widgets for the _mixSet. There is a 1:1 relationship, which means:
+      * _mdws[i] is the Widget for the MixDevice _mixSet[i] - please see ViewBase::createDeviceWidgets().
+@@ -124,7 +126,7 @@
+ 
+ signals:
+     void rebuildGUI();
+-    void redrawMixer( const QString& mixer_ID );
++    //void redrawMixer( const QString& mixer_ID );
+ 
+ 
+ protected:
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index fc7ebe757..cfd053a4c 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.2.0
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('00fc74269978b6e455fea97f22ba81b588bdf3e79548003b75f3328104b418b6')
+sha256sums=('de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -39,4 +39,3 @@ package() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
-
diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD
index 03652ec06..d94638df2 100644
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-libre/rePKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-CARCH=x86_64
+#CARCH=x86_64
 unset build package md5sums source
 _repo=extra       # Put the repo here
 _mirror=ftp://ftp.archlinux.org # Put mirror here
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 4dd9b5b0b..2602022f4 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -5,17 +5,17 @@
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34344
+pkgver=34426
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass')
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
 source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('e4016248418b8f9d55b540d68b6cfee2'
+md5sums=('ff81117293e76b59e54debc439d8e612'
          'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
@@ -46,9 +46,9 @@ package_mplayer-libre() {
     pkgdesc="A movie player for linux (no unfree faac support)"
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl' 'speex'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
+    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
+    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
@@ -67,8 +67,8 @@ package_mplayer-libre() {
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' 'speex'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass')
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray')
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
index 1e382761c..6a0c46222 100644
--- a/libre/thunderbird-libre/rePKGBUILD
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -5,7 +5,6 @@
 
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-CARCH=x86_64
 unset build package md5sums source
 _repo=extra
 options=(!strip)
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index a9c8fdd76..c0febff7c 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -1,6 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Henry Jensen <hjensen@connochaetos.org>
 
+_pgo=false
+
 # We're getting this from Debian Sid
 _debname=iceweasel
 _debver=9.0.1
@@ -13,6 +15,10 @@ pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
 pkgrel=2
 
+if $_pgo; then
+  pkgname+='-pgo'
+fi
+
 pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -47,16 +53,21 @@ makedepends=(
   'python2'
   'quilt'
   'wireless_tools'
-  'xorg-server-xvfb'
   'yasm'
   'zip'
 )
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options=(!ccache)
+fi
+
 url="http://www.geticeweasel.org/"
 install=iceweasel.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
         mozconfig
+        mozconfig.pgo
         xulrunner-copy-stub.patch
         libre.patch
         iceweasel-install-dir.patch
@@ -100,8 +111,8 @@ build() {
   patch -Np1 -i "$srcdir/libre.patch"
   cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
 
-  if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then
-    echo "ac_add_options --with-ccache=`which ccache`" >> .mozconfig
+  if $_pgo; then
+    cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
 
   # Fix PRE_RELEASE_SUFFIX
@@ -111,9 +122,13 @@ build() {
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
 
-  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  kill $! || true
+  if $_pgo; then
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    kill $! || true
+  else
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  fi
 }
 
 package() {
@@ -122,15 +137,15 @@ package() {
 
   install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
 
-  # For some crazy reason, pgo moves the branding (and many other non-object
-  # files) to odd locations in the ff-pgo directory.
+  # I don't even know why we're hitting the objdir, and ConnOS didn't.
   _brandingdir=debian/branding
-  brandingdir=ff-pgo/dist/branding
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
+  brandingdir=moz-objdir/$_brandingdir
+  icondir="$pkgdir/usr/share/icons/hicolor"
+  for i in 16x16 32x32 48x48 64x64; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
   done
-  install -Dm644 "$brandingdir/mozicon128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg"
+  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png"
+  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
 
   install -d                                  "$pkgdir/usr/share/applications"
   install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
@@ -146,13 +161,14 @@ package() {
   rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
 
   # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$_pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
 
 md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
          '6cde9fe38df1434fdcc0f3a078b0238e'
          'd9b5f2a893ad80da492aec8c9a7cbb7c'
-         'c401067e1ffcb8df5a53076845d28a88'
+         'eab149c1994ab14392e55af3abb08e80'
+         'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          '3c1a7d6984b47a0ab36a5d8e6672cb2b'
          'e529742c0a425648087bc3ce537fe4c5'
diff --git a/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
index 88e5ec422..e79896323 100644
--- a/mozilla-testing/iceweasel-libre/mozconfig
+++ b/mozilla-testing/iceweasel-libre/mozconfig
@@ -33,14 +33,9 @@ ac_add_options --disable-installer
 # Optimization
 ac_add_options --enable-optimize
 
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-
 export MOZILLA_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Iceweasel
 ac_add_options --disable-official-branding
@@ -56,3 +51,5 @@ ac_add_options --with-branding=debian/branding
 ac_add_options --disable-safe-browsing
 export BUILD_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
+
+# Build-generated
diff --git a/mozilla-testing/iceweasel-libre/mozconfig.pgo b/mozilla-testing/iceweasel-libre/mozconfig.pgo
new file mode 100644
index 000000000..b0c249ebf
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/mozconfig.pgo
@@ -0,0 +1,4 @@
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD
index b15f66916..1cf183cf7 100644
--- a/social/diaspora-git/PKGBUILD
+++ b/social/diaspora-git/PKGBUILD
@@ -5,24 +5,33 @@
 # After installing, see the Diaspora wiki page for more information:
 # https://wiki.archlinux.org/index.php/Diaspora
 
-pkgname=diaspora-git
+pkgbase=diaspora-git
+pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git')
 pkgver=20110623
 pkgrel=1
 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network"
 arch=('i686' 'x86_64')
-url="http://www.joindiaspora.com/"
+url="https://diasporafoundation.org/"
 license=('AGPL3')
-depends=('ruby' 'mysql-ruby' 'redis' 'imagemagick' 'libxslt')
+depends=('ruby' 'redis' 'imagemagick' 'libxslt')
 makedepends=('git' 'ruby-headers')
+provides=('diaspora')
 install=diaspora.install
 source=('diaspora.bin'
         'diaspora.rc'
         'diaspora.logrotate'
         'diaspora.pam')
+md5sums=('440ce2511485855030e74e28843a037d'
+         '7bffaaee41b515247ba19a19c77dc5bf'
+         '60f6b3972c73cbc6b1c9ab87c88fb655'
+         '96f82c38f3f540b53f3e5144900acf17')
 
-_gitroot="http://github.com/diaspora/diaspora.git"
+_gitroot="https://github.com/diaspora/diaspora.git"
 _gitname="diaspora"
 
+# I use this because I'm behind an asshole proxy
+tsocks=tsocks
+
 build() {
   cd "$srcdir"
 
@@ -43,59 +52,75 @@ build() {
   [[ -d $_gitname-build ]] && rm -fr $_gitname-build
   git clone $_gitname $_gitname-build
 
-  # Recover gems cache
-  rm -fr $_gitname-gems
-  mkdir -p $_gitname-gems
-  [[ -d cache ]] && mv cache $_gitname-gems
-
 # Include all gems
-  export GEM_HOME="$srcdir/$_gitname-gems"
-  export GEM_PATH="$srcdir/$_gitname-gems"
+  export GEM_HOME="${PWD}/vendor"
+  export GEM_PATH="${PWD}/vendor"
   export PATH="${PATH}:${GEM_PATH}/bin"
 
+  cd ${srcdir}/${_gitname}-build
+
   gem install bundler
+}
+
+# Helper
+_package() {
+  cd "${srcdir}"
+
+  usrdir="${pkgdir}/usr/share/webapps"
+
+  install -d "${usrdir}"
+  cp -a ${_gitname}-build "${usrdir}/${_gitname}"
+
+  cd "${usrdir}/${_gitname}"
 
-  # Patch ruby_core_source to not install the headers in the system
-  # Remove this if you are behind a proxy and install the ruby-headers package instead
-#  gem install ruby_core_source
-#  sed -i "s@^  dest_dir.*@  dest_dir = \"$srcdir/rubyhdrs/\" + ruby_dir@" \
-#    $_gitname-gems/gems/ruby_core_source*/lib/ruby_core_source.rb
+# Set the example config
+  sed -e 's/rails_env:.*/rails_env: "production"/' \
+      -e "s/db:.*/db: \"${DB}\"/" \
+      -i config/script_server.yml.example
 
-  pushd $_gitname-build
-  bundle install --path vendor
+  ${tsocks} bundle install --local --path vendor --without development test
 
-  # We make this now because we do not install the git history
-  tar czf public/source.tar.gz  `git ls-tree -r master | awk '{print $4}'`
+  find -type d -name ".git" -exec rm -fr '{}' \; &>/dev/null || true
 
-  rm -fr .git
-  popd
+  install -Dm755 ${_gitname}.bin "${pkgdir}/usr/bin/${_gitname}"
+  install -Dm755 ${_gitname}.rc "${pkgdir}/etc/rc.d/${_gitname}"
+  install -Dm644 ${_gitname}.logrotate "${pkgdir}/etc/logrotate.d/${_gitname}"
+  install -Dm644 ${_gitname}.pam "${pkgdir}/etc/pam.d/${_gitname}"
 
-  # Keep the gems cache
-  mv $_gitname-gems/cache "$srcdir"
+  install -d ${pkgdir}/usr/share/licenses/${_gitname}/
+  install -Dm644 ${srcdir}/${_gitname}-build/{AUTHORS,COPYRIGHT,GNU-AGPL-3.0} \
+                 ${pkgdir}/usr/share/licenses/${_gitname}/
 }
 
-package() {
-  cd "$srcdir"
-  options=(!strip)
+package_diaspora-mysql-git() {
+    pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network (MySQL version)"
+    provides=('diaspora-mysql' 'diaspora')
+    depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'mysql')
+    options=(!strip)
+
+    export DB="mysql"
 
-  usrdir="$pkgdir/usr/share/webapps"
+    _package
+}
 
-  install -d "$usrdir"
-  cp -r $_gitname-build "$usrdir/$_gitname"
-  #cp -r $_gitname-gems "$usrdir/"
-  find "$usrdir/$_gitname-gems" \
-    -type d -name ".git" -exec rm -fr '{}' \; &>/dev/null || true
+package_diaspora-postgresql-git() {
+    pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network (PostgreSQL version)"
+    provides=('diaspora-postgresql' 'diaspora')
+    depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'postgresql')
+    options=(!strip)
 
-  install -Dm755 $_gitname.bin "$pkgdir/usr/bin/$_gitname"
-  install -Dm755 $_gitname.rc "$pkgdir/etc/rc.d/$_gitname"
-  install -Dm644 $_gitname.logrotate "$pkgdir/etc/logrotate.d/$_gitname"
-  install -Dm644 $_gitname.pam "$pkgdir/etc/pam.d/$_gitname"
+    export DB="postgresql"
 
-  install -d $pkgdir/usr/share/licenses/$_gitname/
-  install -Dm644 ${srcdir}/$_gitname-build/{AUTHORS,COPYRIGHT,GNU-AGPL-3.0} \
-                 $pkgdir/usr/share/licenses/$_gitname/
+    _package
+}
+
+package_diaspora-sqlite-git() {
+    pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network (SQLite3 version)"
+    provides=('diaspora-sqlite' 'diaspora')
+    depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'sqlite3')
+    options=(!strip)
+
+    export DB="sqlite"
+
+    _package
 }
-md5sums=('7e7402127f9a05bc58aff0adc5057d1c'
-         '7bffaaee41b515247ba19a19c77dc5bf'
-         '60f6b3972c73cbc6b1c9ab87c88fb655'
-         '96f82c38f3f540b53f3e5144900acf17')
diff --git a/social/diaspora-git/diaspora.bin b/social/diaspora-git/diaspora.bin
index d18a40014..2168c7e7c 100644
--- a/social/diaspora-git/diaspora.bin
+++ b/social/diaspora-git/diaspora.bin
@@ -1,3 +1,6 @@
+#!/bin/bash
+
 cd /usr/share/webapps/diaspora
-export GEM_HOME=/usr/share/webapps/diaspora-gems/
+export GEM_HOME=${PWD}/vendor
+
 ./script/server &>>/var/log/diaspora.log
diff --git a/social/diaspora-git/diaspora.install b/social/diaspora-git/diaspora.install
index faf2cb78f..7833be058 100644
--- a/social/diaspora-git/diaspora.install
+++ b/social/diaspora-git/diaspora.install
@@ -1,12 +1,11 @@
 
 dusr=diaspora
 dhome=/usr/share/webapps/diaspora
-dgems=/usr/share/webapps/diaspora-gems
 dlog=/var/log/diaspora.log
 
 post_install() {
   getent passwd $dusr &>/dev/null || useradd -r -d $dhome -s /bin/bash $dusr &>/dev/null
-  chown -R $dusr:$dusr $dhome $dgems &>/dev/null
+  chown -R $dusr:$dusr $dhome &>/dev/null
   [[ -f $dlog ]] && chown $dusr:$dusr $dlog
 }
 
diff --git a/staging/apr-util/PKGBUILD b/staging/apr-util/PKGBUILD
index 3f144c339..c5f9410df 100644
--- a/staging/apr-util/PKGBUILD
+++ b/staging/apr-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145150 2011-12-18 04:37:39Z andrea $
+# $Id: PKGBUILD 145823 2012-01-02 11:42:51Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.3.12
-pkgrel=4
+pkgrel=5
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
diff --git a/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD
new file mode 100644
index 000000000..801d7403c
--- /dev/null
+++ b/staging/claws-mail-extra-plugins/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 145839 2012-01-02 19:48:20Z dreisner $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Mildred <mildred593 at online dot fr>
+
+pkgname=claws-mail-extra-plugins
+pkgver=3.8.0
+pkgrel=2
+pkgdesc="Extra plugins for claws-mail"
+url="http://www.claws-mail.org/plugins.php?branch=EXT"
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('claws-mail>=3.8.0')
+makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
+             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
+             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
+optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
+            'perl: for perl plugin'
+            'libnotify: for notification plugin'
+            'libcanberra: for notification plugin'
+            'dbus-core: for notification plugin'
+            'libxml2: for gtkhtml2_viewer and rssyl plugins'
+            'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive: for archive plugin'
+            'libytnef: for tnef_parse plugin'
+            'libwebkit: for the fancy webkit html plugin'
+            'libsoup-gnome: for the fancy webkit html plugin'
+            'python2: for python plugin'
+	    'libgdata: for gdata plugin')
+conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
+           'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
+           'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
+           'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
+replaces=('sylpheed-claws-extra-plugins')
+options=('!libtool' '!strip')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
+md5sums=('4776f6e0357a694f384349ac73b6da52')
+
+build() {
+  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
+
+  # fix for python2
+  export PYTHON="/usr/bin/python2"
+
+  # fix gdata plugin build
+  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure
+ 
+  for dir in */; do
+    [[ $dir != geolocation_plugin-* ]] && (
+      cd $dir
+
+      ./configure --prefix=/usr --disable-static
+      make
+    )
+  done
+}
+
+package() {
+  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
+  for dir in */; do
+    [[ $dir != geolocation_plugin-* ]] && 
+      make -C $dir DESTDIR="$pkgdir" install
+  done
+
+  # fix fileconflict with libical, #11485
+  rm -f "$pkgdir/usr/include/ical.h"
+}
diff --git a/staging/cmake/PKGBUILD b/staging/cmake/PKGBUILD
new file mode 100644
index 000000000..a2972c813
--- /dev/null
+++ b/staging/cmake/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 145835 2012-01-02 19:34:59Z dreisner $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=cmake
+pkgver=2.8.7
+pkgrel=2
+pkgdesc="A cross-platform open-source make system"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.cmake.org"
+depends=('curl' 'libarchive' 'shared-mime-info')
+makedepends=('qt')
+optdepends=('qt: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e1b237aeaed880f65dec9c20602452f6')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  ./bootstrap --prefix=/usr \
+    --mandir=/share/man \
+    --docdir=/share/doc/cmake \
+    --system-libs \
+    --qt-gui \
+    --parallel=2
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  vimpath="$pkgdir/usr/share/vim/vimfiles"
+  install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
+  install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
+  install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
+  install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/staging/cmake/cmake.install b/staging/cmake/cmake.install
new file mode 100644
index 000000000..55f6c843b
--- /dev/null
+++ b/staging/cmake/cmake.install
@@ -0,0 +1,12 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD
new file mode 100644
index 000000000..b49dbed88
--- /dev/null
+++ b/staging/evolution-data-server/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 145813 2012-01-02 10:05:49Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evolution-data-server
+pkgver=3.2.2
+pkgrel=2
+pkgdesc="Centralized access to appointments and contacts"
+arch=('i686' 'x86_64')
+depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
+makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
+options=('!libtool')
+url="http://www.gnome.org"
+license=('GPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --with-openldap=yes \
+      --libexecdir=/usr/lib/evolution-data-server \
+      --with-krb5=/usr --with-libdb=/usr \
+      --enable-vala-bindings
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD
new file mode 100644
index 000000000..14d003a4d
--- /dev/null
+++ b/staging/evolution-exchange/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 145815 2012-01-02 10:16:37Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evolution-exchange
+pkgver=3.2.1
+pkgrel=2
+pkgdesc="Ximian Connector Exchange plugin for Evolution"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.ximian.com"
+depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
+makedepends=('intltool' 'evolution')
+options=('!libtool' '!emptydirs')
+install=evolution-exchange.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/evolution --disable-static \
+      --with-libdb=/usr --with-krb5=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 $pkgdir/etc/gconf/schemas/*.schemas
+  rm -f $pkgdir/etc/gconf/schemas/*.schemas
+}
diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install
new file mode 100644
index 000000000..1179887f9
--- /dev/null
+++ b/staging/evolution-exchange/evolution-exchange.install
@@ -0,0 +1,17 @@
+pkgname=evolution-exchange
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/staging/evolution-groupwise/PKGBUILD b/staging/evolution-groupwise/PKGBUILD
new file mode 100644
index 000000000..a5f6a12cc
--- /dev/null
+++ b/staging/evolution-groupwise/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 145817 2012-01-02 10:20:33Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=evolution-groupwise
+pkgver=3.2.1
+pkgrel=2
+pkgdesc="GroupWise connector for evolution"
+arch=(i686 x86_64)
+url="http://projects.gnome.org/evolution/"
+license=(LGPL)
+depends=('evolution-data-server' 'gtkhtml4')
+makedepends=(intltool evolution)
+optdepends=('evolution: evolution plugin')
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
diff --git a/staging/gvfs/PKGBUILD b/staging/gvfs/PKGBUILD
new file mode 100644
index 000000000..5aca1f451
--- /dev/null
+++ b/staging/gvfs/PKGBUILD
@@ -0,0 +1,113 @@
+# $Id: PKGBUILD 145841 2012-01-02 19:54:43Z dreisner $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
+pkgver=1.10.1
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
+url="http://www.gnome.org"
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/etc/bash_completion.d
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support')
+  install=gvfs.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  sed -e 's/^am__append_3/#am__append_3/' \
+      -e 's/^am__append_4/#am__append_4/' \
+      -i monitor/Makefile
+  make DESTDIR="${pkgdir}" install
+
+  cd "${pkgdir}"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
+  install=gvfs-smb.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -m755 -d "${pkgdir}/usr/lib/gvfs"
+  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=${pkgver}")
+  install=gvfs-module.install
+  install -m755 -d "${pkgdir}/usr/lib/gvfs"
+  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
+
+}
diff --git a/staging/gvfs/gvfs-module.install b/staging/gvfs/gvfs-module.install
new file mode 100644
index 000000000..09d1f11ec
--- /dev/null
+++ b/staging/gvfs/gvfs-module.install
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/staging/gvfs/gvfs-smb.install b/staging/gvfs/gvfs-smb.install
new file mode 100644
index 000000000..0b8783c7b
--- /dev/null
+++ b/staging/gvfs/gvfs-smb.install
@@ -0,0 +1,12 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/staging/gvfs/gvfs.install b/staging/gvfs/gvfs.install
new file mode 100644
index 000000000..9458b1513
--- /dev/null
+++ b/staging/gvfs/gvfs.install
@@ -0,0 +1,14 @@
+post_install() {
+  usr/bin/gio-querymodules usr/lib/gio/modules
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  usr/bin/gio-querymodules usr/lib/gio/modules
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/staging/libarchive/PKGBUILD b/staging/libarchive/PKGBUILD
new file mode 100644
index 000000000..ace8bb47e
--- /dev/null
+++ b/staging/libarchive/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 145831 2012-01-02 19:21:38Z dreisner $
+# Maintainer: Dan McGee <dan@archlinux.org>
+pkgname=libarchive
+pkgver=3.0.2
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.googlecode.com/"
+license=('BSD')
+depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz")
+md5sums=('4df33cb107c9702c80473e0794ddf833')
+sha256sums=('b27a10182f4fc3f69d01419a59ddb16fccf5df8c4b166008c04f41905e29fd74')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --without-xml2
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # currently fails in a minor test involving atime updates (#60)
+  make check || :
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
diff --git a/staging/libarchive/release-2.8-fixes.patch b/staging/libarchive/release-2.8-fixes.patch
new file mode 100644
index 000000000..c21eeaa7b
--- /dev/null
+++ b/staging/libarchive/release-2.8-fixes.patch
@@ -0,0 +1,234 @@
+Index: build/cmake/config.h.in
+===================================================================
+--- build/cmake/config.h.in	(revision 3670)
++++ build/cmake/config.h.in	(revision 3737)
+@@ -1,5 +1,8 @@
+ /* config.h.  Generated from config.h.cmake by cmake configure */
+ 
++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
++#cmakedefine ZLIB_WINAPI 1
++
+ /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
+ #cmakedefine ARCHIVE_HASH_MD5_LIBC
+ 
+Index: libarchive/archive_read_support_format_all.c
+===================================================================
+--- libarchive/archive_read_support_format_all.c	(revision 3670)
++++ libarchive/archive_read_support_format_all.c	(revision 3737)
+@@ -1,5 +1,5 @@
+ /*-
+- * Copyright (c) 2003-2007 Tim Kientzle
++ * Copyright (c) 2003-2011 Tim Kientzle
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -39,5 +39,13 @@
+ 	archive_read_support_format_tar(a);
+ 	archive_read_support_format_xar(a);
+ 	archive_read_support_format_zip(a);
++
++	/* Note: We always return ARCHIVE_OK here, even if some of the
++	 * above return ARCHIVE_WARN.  The intent here is to enable
++	 * "as much as possible."  Clients who need specific
++	 * compression should enable those individually so they can
++	 * verify the level of support. */
++	/* Clear any warning messages set by the above functions. */
++	archive_clear_error(a);
+ 	return (ARCHIVE_OK);
+ }
+Index: libarchive/archive_write_disk.c
+===================================================================
+--- libarchive/archive_write_disk.c	(revision 3670)
++++ libarchive/archive_write_disk.c	(revision 3737)
+@@ -1513,6 +1513,22 @@
+ }
+ 
+ #if defined(_WIN32) || defined(__CYGWIN__)
++static int
++guidword(const char *p, int n)
++{
++	int i;
++
++	for (i = 0; i < n; i++) {
++		if ((*p >= '0' && *p <= '9') ||
++		    (*p >= 'a' && *p <= 'f') ||
++		    (*p >= 'A' && *p <= 'F'))
++			p++;
++		else
++			return (-1);
++	}
++	return (0);
++}
++
+ /*
+  * 1. Convert a path separator from '\' to '/' .
+  *    We shouldn't check multi-byte character directly because some
+@@ -1521,26 +1537,92 @@
+  * 2. Replace unusable characters in Windows with underscore('_').
+  * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
+  */
+-static void
++static int
+ cleanup_pathname_win(struct archive_write_disk *a)
+ {
+ 	wchar_t wc;
+ 	char *p;
+ 	size_t alen, l;
+ 
+-	alen = 0;
+-	l = 0;
+-	for (p = a->name; *p != '\0'; p++) {
+-		++alen;
+-		if (*p == '\\')
+-			l = 1;
++	p = a->name;
++	/* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
++	 * "\\?\Volume{GUID}\"
++	 * (absolute path prefixes used by Windows API) */
++	if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
++	    (p[2] == '.' || p[2] == '?') && (p[3] ==  '\\' || p[3] == '/'))
++	{
++		/* A path begin with "\\?\UNC\" */
++		if (p[2] == '?' &&
++		    (p[4] == 'U' || p[4] == 'u') &&
++		    (p[5] == 'N' || p[5] == 'n') &&
++		    (p[6] == 'C' || p[6] == 'c') &&
++		    (p[7] == '\\' || p[7] == '/'))
++			p += 8;
++		/* A path begin with "\\?\Volume{GUID}\" */
++		else if (p[2] == '?' &&
++		    (p[4] == 'V' || p[4] == 'v') &&
++		    (p[5] == 'O' || p[5] == 'o') &&
++		    (p[6] == 'L' || p[6] == 'l') &&
++		    (p[7] == 'U' || p[7] == 'u') &&
++		    (p[8] == 'M' || p[8] == 'm') &&
++		    (p[9] == 'E' || p[9] == 'e') &&
++		    p[10] == '{') {
++			if (guidword(p+11, 8) == 0 && p[19] == '-' &&
++			    guidword(p+20, 4) == 0 && p[24] == '-' &&
++			    guidword(p+25, 4) == 0 && p[29] == '-' &&
++			    guidword(p+30, 4) == 0 && p[34] == '-' &&
++			    guidword(p+35, 12) == 0 && p[47] == '}' &&
++			    (p[48] == '\\' || p[48] == '/'))
++				p += 49;
++			else
++				p += 4;
++		/* A path begin with "\\.\PhysicalDriveX" */
++		} else if (p[2] == '.' &&
++		    (p[4] == 'P' || p[4] == 'p') &&
++		    (p[5] == 'H' || p[5] == 'h') &&
++		    (p[6] == 'Y' || p[6] == 'y') &&
++		    (p[7] == 'S' || p[7] == 's') &&
++		    (p[8] == 'I' || p[8] == 'i') &&
++		    (p[9] == 'C' || p[9] == 'c') &&
++		    (p[9] == 'A' || p[9] == 'a') &&
++		    (p[9] == 'L' || p[9] == 'l') &&
++		    (p[9] == 'D' || p[9] == 'd') &&
++		    (p[9] == 'R' || p[9] == 'r') &&
++		    (p[9] == 'I' || p[9] == 'i') &&
++		    (p[9] == 'V' || p[9] == 'v') &&
++		    (p[9] == 'E' || p[9] == 'e') &&
++		    (p[10] >= '0' && p[10] <= '9') &&
++		    p[11] == '\0') {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Path is a physical drive name");
++			return (ARCHIVE_FAILED);
++		} else
++			p += 4;
++	}
++
++	/* Skip leading drive letter from archives created
++	 * on Windows. */
++	if (((p[0] >= 'a' && p[0] <= 'z') ||
++	     (p[0] >= 'A' && p[0] <= 'Z')) &&
++		 p[1] == ':') {
++		if (p[2] == '\0') {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Path is a drive name");
++			return (ARCHIVE_FAILED);
++		}
++		if (p[2] == '\\' || p[2] == '/')
++			p += 3;
++	}
++
++	for (; *p != '\0'; p++) {
+ 		/* Rewrite the path name if its character is a unusable. */
+ 		if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
+ 		    *p == '<' || *p == '>' || *p == '|')
+ 			*p = '_';
+ 	}
+-	if (alen == 0 || l == 0)
+-		return;
++	alen = p - a->name;
++	if (alen == 0 || strchr(a->name, '\\') == NULL)
++		return (ARCHIVE_OK);
+ 	/*
+ 	 * Convert path separator.
+ 	 */
+@@ -1560,6 +1642,7 @@
+ 		p += l;
+ 		alen -= l;
+ 	}
++	return (ARCHIVE_OK);
+ }
+ #endif
+ 
+@@ -1583,7 +1666,8 @@
+ 	}
+ 
+ #if defined(_WIN32) || defined(__CYGWIN__)
+-	cleanup_pathname_win(a);
++	if (cleanup_pathname_win(a) != ARCHIVE_OK)
++		return (ARCHIVE_FAILED);
+ #endif
+ 	/* Skip leading '/'. */
+ 	if (*src == '/')
+Index: libarchive/archive_util.c
+===================================================================
+--- libarchive/archive_util.c	(revision 3670)
++++ libarchive/archive_util.c	(revision 3737)
+@@ -155,6 +155,7 @@
+ {
+ 	archive_string_empty(&a->error_string);
+ 	a->error = NULL;
++	a->archive_error_number = 0;
+ }
+ 
+ void
+Index: libarchive/archive_read_extract.c
+===================================================================
+--- libarchive/archive_read_extract.c	(revision 3670)
++++ libarchive/archive_read_extract.c	(revision 3737)
+@@ -108,7 +108,7 @@
+ 	if (r != ARCHIVE_OK)
+ 		/* If _write_header failed, copy the error. */
+  		archive_copy_error(&a->archive, ad);
+-	else if (archive_entry_size(entry) > 0)
++	else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
+ 		/* Otherwise, pour data into the entry. */
+ 		r = copy_data(_a, ad);
+ 	r2 = archive_write_finish_entry(ad);
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 3670)
++++ CMakeLists.txt	(revision 3737)
+@@ -154,6 +154,13 @@
+   SET(HAVE_ZLIB_H 1)
+   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
++  IF(WIN32 AND NOT CYGWIN)
++    SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
++    SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
++    CHECK_C_SOURCE_Runs(
++      "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
++      ZLIB_WINAPI)
++  ENDIF(WIN32 AND NOT CYGWIN)
+ ENDIF(ZLIB_FOUND)
+ MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
+ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+   Merged /trunk:r1989,3247,3722
+
diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD
new file mode 100644
index 000000000..1ed1f0303
--- /dev/null
+++ b/staging/moc/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 145847 2012-01-02 21:43:42Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=moc
+pkgver=20110528
+pkgrel=5
+pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
+arch=('i686' 'x86_64')
+url="http://moc.daper.net/"
+license=('GPL')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
+makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
+optdepends=('speex: for using the speex plugin' 
+	    'ffmpeg: for using the ffmpeg plugin'
+	    'taglib: for using the musepack plugin' 
+	    'libmpcdec: for using the musepack plugin' 
+            'wavpack: for using the wavpack plugin' 
+	    'libmodplug: for using the modplug plugin')
+options=('!libtool')
+source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
+        gcc-undefined-symbols.diff moc-ffmpeg.patch)
+sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720'
+          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p0 -i ../moc-ffmpeg.patch
+
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./autogen.sh
+  ./configure --prefix=/usr --without-rcc --without-aac \
+    --with-oss  --with-alsa  --with-jack --with-mp3 \
+    --with-musepack --with-vorbis --with-flac --with-wavpack \
+    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+    --with-samplerate --with-curl --disable-debug
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff
new file mode 100644
index 000000000..09e9b8bda
--- /dev/null
+++ b/staging/moc/gcc-undefined-symbols.diff
@@ -0,0 +1,12 @@
+--- decoder.c~	2011-05-08 09:28:28.077137883 +0200
++++ decoder.c	2011-05-10 21:40:48.887941968 +0200
+@@ -259,6 +259,9 @@
+ 	for (i = 0; i < plugins_num; i++)
+ 		if (plugins[i].decoder->destroy)
+ 			plugins[i].decoder->destroy ();
++	for (i = 0; i < plugins_num; i++)
++		if (plugins[i].handle)
++                    lt_dlclose(plugins[i].handle);
+ 
+ 	if (lt_dlexit())
+ 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch
new file mode 100644
index 000000000..7554ea14e
--- /dev/null
+++ b/staging/moc/moc-ffmpeg.patch
@@ -0,0 +1,26 @@
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
++++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
+@@ -28,12 +28,6 @@
+ #include <ffmpeg/avformat.h>
+ #endif
+ 
+-/* libavformat's API will be changing at version 53, but at present there
+- * appears to be no guidance on what will replace the deprecated fields. */
+-#ifndef FF_API_OLD_METADATA
+-#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
+-#endif
+-
+ /* FFmpeg also likes common names, without that, our common.h and log.h
+  * would not be included. */
+ #undef COMMON_H
+@@ -137,7 +131,7 @@
+ 	av_read_play (data->ic);
+ 	for (i = 0; i < data->ic->nb_streams; i++) {
+ 		data->enc = data->ic->streams[i]->codec;
+-		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
++		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+ 			audio_index = i;
+ 			break;
+ 		}
diff --git a/staging/openldap/PKGBUILD b/staging/openldap/PKGBUILD
new file mode 100644
index 000000000..7a0e367f7
--- /dev/null
+++ b/staging/openldap/PKGBUILD
@@ -0,0 +1,96 @@
+# $Id: PKGBUILD 145851 2012-01-03 02:45:43Z eric $
+# Maintainer:
+
+pkgbase=openldap
+pkgname=('libldap' 'openldap')
+pkgver=2.4.28
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.openldap.org/"
+license=('custom')
+makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
+        slapd slapd.default ntlm.patch)
+sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
+          'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
+          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
+          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
+
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -Np1 -i "${srcdir}"/ntlm.patch
+  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
+  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
+  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
+  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+
+  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
+  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
+    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
+    --enable-ipv6 --enable-syslog --enable-local \
+    --enable-bdb --enable-hdb \
+    --enable-crypt --enable-dynamic \
+    --with-threads  --disable-wrappers \
+    --enable-spasswd --with-cyrus-sasl \
+    --enable-overlays=mod --enable-modules=yes
+  make
+}
+
+check() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  make test
+}
+
+package_libldap() {
+  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
+  depends=('libsasl' 'libfetch' 'e2fsprogs')
+  backup=('etc/openldap/ldap.conf')
+  options=('!libtool')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  for dir in include libraries doc/man/man3 ; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+  
+# get rid of duplicate default conf files
+  rm "${pkgdir}"/etc/openldap/*.default
+
+  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
+  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
+
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_openldap() {
+  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
+  depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
+  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
+  options=('!libtool' 'emptydirs')
+  install=openldap.install
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  for dir in clients servers doc/man/man{1,5,8} ; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+  rm -r "${pkgdir}"/run
+
+# get rid of duplicate default conf files
+  rm "${pkgdir}"/etc/openldap/*.default
+
+  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
+
+  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+
+  install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
+  install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
+  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
+  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/staging/openldap/ntlm.patch b/staging/openldap/ntlm.patch
new file mode 100644
index 000000000..6804b610d
--- /dev/null
+++ b/staging/openldap/ntlm.patch
@@ -0,0 +1,230 @@
+Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
+actually called by evolution-data-server, checked at version 1.12.2.
+Without this patch, the Exchange addressbook integration uses simple binds
+with cleartext passwords.
+
+Russ checked with openldap-software for upstream's opinion on this patch
+on 2007-12-21.  Upstream had never received it as a patch submission and
+given that it's apparently only for older Exchange servers that can't do
+SASL and DIGEST-MD5, it's not very appealing.
+
+Bug#457374 filed against evolution-data-server asking if this support is
+still required on 2007-12-21.
+
+Index: trunk/include/ldap.h
+===================================================================
+--- trunk.orig/include/ldap.h
++++ trunk/include/ldap.h
+@@ -2461,5 +2461,25 @@
+ 	LDAPControl	**ctrls,
+ 	LDAPDerefRes	**drp ));
+ 
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++      LDAP    *ld,
++      LDAP_CONST char *dn,
++      ber_tag_t tag,
++      struct berval *cred,
++      LDAPControl **sctrls,
++      LDAPControl **cctrls,
++      int   *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++      LDAP    *ld,
++      LDAPMessage *res,
++      struct berval *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+Index: trunk/libraries/libldap/ntlm.c
+===================================================================
+--- /dev/null
++++ trunk/libraries/libldap/ntlm.c
+@@ -0,0 +1,138 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <ac/socket.h>
++#include <ac/string.h>
++#include <ac/time.h>
++#include <ac/errno.h>
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++ LDAP    *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int   *msgidp )
++{
++ BerElement  *ber;
++ int rc;
++ ber_int_t id;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
++
++ if( msgidp == NULL ) {
++   ld->ld_errno = LDAP_PARAM_ERROR;
++   return ld->ld_errno;
++ }
++
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++   ld->ld_errno = LDAP_NO_MEMORY;
++   return ld->ld_errno;
++ }
++
++ assert( LBER_VALID( ber ) );
++
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++      id, LDAP_REQ_BIND,
++      ld->ld_version, dn, tag,
++      cred );
++
++ /* Put Server Controls */
++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++   ber_free( ber, 1 );
++   return ld->ld_errno;
++ }
++
++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++   ld->ld_errno = LDAP_ENCODING_ERROR;
++   ber_free( ber, 1 );
++   return ld->ld_errno;
++ }
++
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++ if(*msgidp < 0)
++   return ld->ld_errno;
++
++ return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++ LDAP    *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
++{
++ ber_int_t errcode;
++ ber_tag_t tag;
++ BerElement  *ber;
++ ber_len_t len;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
++
++ if ( ld == NULL || res == NULL ) {
++   return LDAP_PARAM_ERROR;
++ }
++
++ if( res->lm_msgtype != LDAP_RES_BIND ) {
++   ld->ld_errno = LDAP_PARAM_ERROR;
++   return ld->ld_errno;
++ }
++
++ if ( ld->ld_error ) {
++   LDAP_FREE( ld->ld_error );
++   ld->ld_error = NULL;
++ }
++ if ( ld->ld_matched ) {
++   LDAP_FREE( ld->ld_matched );
++   ld->ld_matched = NULL;
++ }
++
++ /* parse results */
++
++ ber = ber_dup( res->lm_ber );
++
++ if( ber == NULL ) {
++   ld->ld_errno = LDAP_NO_MEMORY;
++   return ld->ld_errno;
++ }
++
++ tag = ber_scanf( ber, "{ioa" /*}*/,
++      &errcode, challenge, &ld->ld_error );
++ ber_free( ber, 0 );
++
++ if( tag == LBER_ERROR ) {
++   ld->ld_errno = LDAP_DECODING_ERROR;
++   return ld->ld_errno;
++ }
++
++ ld->ld_errno = errcode;
++
++ return( ld->ld_errno );
++}
++
+Index: trunk/libraries/libldap/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap/Makefile.in
++++ trunk/libraries/libldap/Makefile.in
+@@ -27,7 +27,7 @@
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ 	tls2.c tls_o.c tls_g.c tls_m.c \
+-	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ 	assertion.c deref.c ldif.c fetch.c
+ 
+ OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+-	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ 	assertion.lo deref.lo ldif.lo fetch.lo
+ 
+ LDAP_INCDIR= ../../include       
+Index: trunk/libraries/libldap_r/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -29,7 +29,7 @@
+ 	init.c options.c print.c string.c util-int.c schema.c \
+ 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ 	tls2.c tls_o.c tls_g.c tls_m.c \
+-	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ 	assertion.c deref.c ldif.c fetch.c
+ SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
+ 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+-	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ 	assertion.lo deref.lo ldif.lo fetch.lo
+ 
+ LDAP_INCDIR= ../../include       
diff --git a/staging/openldap/openldap.install b/staging/openldap/openldap.install
new file mode 100644
index 000000000..cf3cb9f25
--- /dev/null
+++ b/staging/openldap/openldap.install
@@ -0,0 +1,20 @@
+post_install(){
+  groupadd -g 439 ldap &>/dev/null
+  useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+  chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_upgrade(){
+  getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
+  getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+  chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_remove(){
+  if getent passwd ldap >/dev/null 2>&1; then
+    userdel ldap
+  fi
+  if getent group ldap >/dev/null 2>&1; then
+    groupdel ldap
+  fi
+}
diff --git a/staging/openldap/slapd b/staging/openldap/slapd
new file mode 100755
index 000000000..4f212da66
--- /dev/null
+++ b/staging/openldap/slapd
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
+
+PID=`pidof -o %PPID /usr/sbin/slapd`
+case "$1" in
+  start)
+    stat_busy "Starting OpenLDAP"
+    [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
+    if [ -z "$PID" ]; then
+      if [ -z "$SLAPD_SERVICES" ]; then
+        /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
+      else
+        /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
+      fi
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        stat_done
+      fi
+      add_daemon slapd
+    else
+      stat_fail
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping OpenLDAP"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /run/openldap/slapd.pid
+      rm -f /run/openldap/slapd.args
+      rm_daemon slapd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/staging/openldap/slapd.default b/staging/openldap/slapd.default
new file mode 100644
index 000000000..72ae2a6a7
--- /dev/null
+++ b/staging/openldap/slapd.default
@@ -0,0 +1,6 @@
+# slapd normally serves ldap only on all TCP-ports 389. slapd can also
+# service requests on TCP-port 636 (ldaps) and requests via unix
+# sockets.
+# Example usage:
+#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
+SLAPD_OPTIONS=""
diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD
index 43a5a069b..fa85df37b 100644
--- a/staging/php/PKGBUILD
+++ b/staging/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145096 2011-12-16 21:32:24Z pierre $
+# $Id: PKGBUILD 145825 2012-01-02 11:52:31Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -23,7 +23,7 @@ pkgname=('php'
          'php-xsl')
 pkgver=5.3.8
 _suhosinver=5.3.7-0.9.10
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD
index cd9465524..cac90d2da 100644
--- a/staging/redland/PKGBUILD
+++ b/staging/redland/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145106 2011-12-17 03:32:44Z eric $
+# $Id: PKGBUILD 145821 2012-01-02 11:29:29Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
@@ -6,11 +6,11 @@ pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
 pkgver=1.0.15
-pkgrel=2
+pkgrel=3
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD
new file mode 100644
index 000000000..702406e58
--- /dev/null
+++ b/staging/ruby/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 145849 2012-01-03 02:35:43Z eric $
+# Maintainer:
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Jeramy Rutley <jrutley@gmail.com>
+
+pkgbase=ruby
+pkgname=('ruby' 'ruby-docs')
+pkgver=1.9.3_p0
+pkgrel=3
+pkgdesc="An object-oriented language for quick and easy programming"
+arch=('i686' 'x86_64')
+url="http://www.ruby-lang.org/en/"
+license=('BSD' 'custom')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
+sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
+  DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
+      --enable-shared --enable-pthread --disable-rpath
+  make
+}
+
+package_ruby() {
+  depends=('openssl' 'libffi' 'libyaml')
+  provides=('rubygems' 'rake')
+  conflicts=('rake')
+  optdepends=('tk: for Ruby/TK')
+
+  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
+  make DESTDIR="${pkgdir}" install-nodoc
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
+}
+
+package_ruby-docs() {
+  pkgdesc="Documentation files for ruby"
+
+  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
+  make DESTDIR="${pkgdir}" install-doc install-capi
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
+}
author	root <root@rshg054.dnsready.net>	2012-01-03 23:14:43 +0000
committer	root <root@rshg054.dnsready.net>	2012-01-03 23:14:43 +0000
commit	d1d68784dc66793601c239fa64cc0e02ebd9444e (patch)
tree	15179b96ec3e632fad3cc528115d83c0fe47e5bd
parent	48c96871761a4aad193d814e87ddb87c322e17d2 (diff)