mass changes

Signed-off-by: Florian Pritz <bluewind@xssn.at>

28 files changed, 635 insertions, 219 deletions

diff --git a/0ad/PKGBUILD b/0ad/PKGBUILD
index b024fcf..e2fca24 100644
--- a/0ad/PKGBUILD
+++ b/0ad/PKGBUILD
@@ -1,15 +1,17 @@
-# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
+# Maintainer: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 
 pkgname=0ad
-pkgver=alpha_1
-_pkgver=r07970-alpha
-pkgrel=5
+pkgver=alpha_3
+_pkgver=r08832-alpha
+pkgrel=1
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://wildfiregames.com/0ad"
 license=('GPL2' 'CCPL')
-depends=('binutils' 'boost' 'crypto++' 'devil' 'enet-old' 'fam' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'mesa' 'nasm' 'openal' 'sdl' 'wxgtk' 'zip' 'zlib')
-conflicts=('0ad-svn')
+depends=('binutils' 'boost' 'crypto++' 'devil' 'enet-old' 'fam' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'mesa' 'nasm' 'openal' 'python' 'sdl' 'wxgtk' 'zip' 'zlib')
+makedepends=('cmake')
+conflicts=('0ad-svn' '0ad-ppa-wfg')
 provides=('0ad')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
 	"http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-data.tar.xz"
@@ -19,8 +21,8 @@ source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
 	"${pkgname}.desktop"
 	"${pkgname}-editor.desktop"
 	"${pkgname}.png")
-md5sums=('75a4a308c75a836ae61112b63b4f8b36'
-         '2b78c9aa2f88faaf3ddf4efe2434a7bc'
+md5sums=('b9df52751596633d9aab4cc3b253cb82'
+         '38abc29fc714946ed17ac86ac67fb614'
          '92575ff82bd29369b7b0ee0ce307b39e'
          '0a8abdb0fc32af6d48ea235c46be5b7c'
          '1a54a2b4ab72424d14ffc42a01925ff3'
@@ -29,34 +31,35 @@ md5sums=('75a4a308c75a836ae61112b63b4f8b36'
          '51559438e79c0eb8576b98213a5d92d1')
 
 build(){
+  cd "${srcdir}/${pkgname}-${_pkgver}/build/workspaces"
+  ./update-workspaces.sh
 
-cd "${srcdir}/${pkgname}-${_pkgver}/build/workspaces" || return 1
-./update-workspaces.sh || return 1
+  cd ${srcdir}/${pkgname}-${_pkgver}/build/workspaces/gcc
 
-cd ${srcdir}/${pkgname}-${_pkgver}/build/workspaces/gcc || return 1
+  # Official recomendations about -j parameter.
+  if [[ $CARCH = 'x86_64' ]]
+    then
+      CONFIG=Release make -j3
+    else
+      CONFIG=Release make -j2
+  fi
+}
 
-# Official recomendations about -j parameter.
-if [[ $CARCH = 'x86_64' ]]
-  then
-    CONFIG=Release make -j3 || return 1
-  else
-    CONFIG=Release make -j21 CC=distcc || return 1
-fi
-  
-install -d ${pkgdir}/opt/0ad || return 1
-cp -r ${srcdir}/${pkgname}-${_pkgver}/binaries/* ${pkgdir}/opt/0ad || return 1
+package(){  
+  install -d ${pkgdir}/opt/0ad
+  cp -r ${srcdir}/${pkgname}-${_pkgver}/binaries/* ${pkgdir}/opt/0ad
  
-# Removing useless stuff.
-# This might change between releases:
-rm -r ${pkgdir}/opt/0ad/system/*r
-rm -r ${pkgdir}/opt/0ad/system/*.a
-rm -r ${pkgdir}/opt/0ad/system/*t
-rm -r ${pkgdir}/opt/0ad/system/*debug.so
+  # Removing useless stuff.
+  # This might change between releases:
+  rm -r ${pkgdir}/opt/0ad/system/*r
+  rm -r ${pkgdir}/opt/0ad/system/*.a
+  rm -r ${pkgdir}/opt/0ad/system/*t
+  rm -r ${pkgdir}/opt/0ad/system/*debug.so
 
-install -D -m755 ${srcdir}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} || return 1
-install -D -m755 ${srcdir}/${pkgname}-editor.sh ${pkgdir}/usr/bin/${pkgname}-editor || return 1
+  install -D -m755 ${srcdir}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
+  install -D -m755 ${srcdir}/${pkgname}-editor.sh ${pkgdir}/usr/bin/${pkgname}-editor
 
-install -D -m 0644 "${srcdir}/${pkgname}.desktop"		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-install -D -m 0644 "${srcdir}/${pkgname}-editor.desktop"	"${pkgdir}/usr/share/applications/${pkgname}-editor.desktop"
-install -D -m 0644 "${srcdir}/${pkgname}.png"			"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
+  install -D -m 0644 "${srcdir}/${pkgname}.desktop"		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m 0644 "${srcdir}/${pkgname}-editor.desktop"	"${pkgdir}/usr/share/applications/${pkgname}-editor.desktop"
+  install -D -m 0644 "${srcdir}/${pkgname}.png"			"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
\ No newline at end of file
diff --git a/apeinfo/PKGBUILD b/apeinfo/PKGBUILD
new file mode 100644
index 0000000..54d9079
--- /dev/null
+++ b/apeinfo/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Your Name <youremail@domain.com>
+pkgname=apeinfo
+pkgver=1.1
+pkgrel=1
+pkgdesc="display tag data and audio format information for APE (Monkey's Audio) files"
+arch=(i686 x86_64)
+url="http://www.legroom.net/software/apeinfo"
+license=('GPL')
+groups=()
+depends=(mac)
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=(http://www.legroom.net/files/software/apeinfo11_source.tgz)
+noextract=()
+md5sums=() #generate with 'makepkg -g'
+
+build() {
+  cd "$srcdir"
+
+  g++ ${CXXFLAGS} -I/usr/include/mac/ -lmac apeinfo.cpp -o apeinfo
+}
+
+package() {
+  cd "$srcdir"
+
+  install -Dm755 apeinfo "$pkgdir/usr/bin/apeinfo"
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('108476a3ec2e9d909dc0810204a2cbe9')
diff --git a/blazeblogger-git/PKGBUILD b/blazeblogger-git/PKGBUILD
index 8f8b81c..26b4ff7 100644
--- a/blazeblogger-git/PKGBUILD
+++ b/blazeblogger-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Florian Pritz <bluewind@xssn.at>
 # Contributor: Abakus <java5@arcor.de>
 pkgname=blazeblogger-git
-pkgver=20100628
+pkgver=20100822
 pkgrel=1
 pkgdesc="is a simple-to-use but capable CMS for the command line"
 arch=('any')
diff --git a/cairo-compmgr/PKGBUILD b/cairo-compmgr/PKGBUILD
deleted file mode 100644
index ea0c974..0000000
--- a/cairo-compmgr/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Your Name <youremail@domain.com>
-pkgname='cairo-compmgr'
-pkgver='0.2.93'
-pkgrel=1
-pkgdesc="Cairo based composite manager"
-arch=('i686' 'x86_64')
-url="http://cairo-compmgr.tuxfamily.org/"
-license=('GPL')
-depends=('cairo' 'libgnomeui' 'libxcomposite' 'gconf')
-install="${pkgname}.install"
-source=("http://download.tuxfamily.org/ccm/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${startdir}/src/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="${startdir}/pkg" install
-
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas/
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/cairo-compmgr.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -rf ${startdir}/pkg/etc/gconf/schemas/
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('7df7d4df1cd91d655dc4f8073d82c1e8')
-sha256sums=('6cd4552cfa572ca1db593e0cbcd4b4089e613e6409e23e28d93bdd2e6243b05c')
diff --git a/cairo-compmgr/cairo-compmgr.install b/cairo-compmgr/cairo-compmgr.install
deleted file mode 100644
index 27f8c86..0000000
--- a/cairo-compmgr/cairo-compmgr.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  gconfpkg --install cairo-compmgr
-}
-
-pre_upgrade() {
-  gconfpkg --uninstall cairo-compmgr
-}
-
-post_upgrade() {
-  gconfpkg --install cairo-compmgr
-}
-
-pre_remove() {
-  gconfpkg --uninstall cairo-compmgr
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
-
-# vim:set ts=2 sw=2 et:
diff --git a/devtools-git/PKGBUILD b/devtools-git/PKGBUILD
index 1a1d5a5..469078c 100644
--- a/devtools-git/PKGBUILD
+++ b/devtools-git/PKGBUILD
@@ -1,13 +1,13 @@
 # Contributor: Evangelos Foutras <foutrelis@gmail.com>
 
 pkgname=devtools-git
-pkgver=20100705
+pkgver=20110112
 pkgrel=1
-pkgdesc="A few tools to help Arch Linux developers"
-arch=(i686 x86_64)
-url="http://projects.archlinux.org/?p=devtools.git"
+pkgdesc="Tools for Arch Linux package maintainers"
+arch=('any')
+url="http://projects.archlinux.org/devtools.git/"
 license=('GPL')
-depends=('namcap')
+depends=('namcap' 'openssh' 'subversion' 'rsync')
 makedepends=('git')
 provides=('devtools')
 conflicts=('devtools')
@@ -25,7 +25,7 @@ build() {
     cd $_gitname && git pull origin
     msg "The local files are updated."
   else
-    git clone $_gitroot
+    git clone $_gitroot $_gitname
   fi
 
   msg "GIT checkout done or server timeout"
diff --git a/extract/PKGBUILD b/extract/PKGBUILD
index 4d1efed..93fd363 100644
--- a/extract/PKGBUILD
+++ b/extract/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=extract
 pkgver=0.2.4.0
 pkgrel=1
 pkgdesc="Script to extract multiple archives"
-arch=('i686' 'x86_64')
+arch=(any)
 url="http://bluewind.at"
 license=('WTFPLv2')
 depends=('gzip' 'tar' 'p7zip' 'unrar' 'unzip' 'bzip2' 'file' 'xz-utils')
diff --git a/firefox-nightly/PKGBUILD b/firefox-nightly/PKGBUILD
index 774a09c..aa557c6 100644
--- a/firefox-nightly/PKGBUILD
+++ b/firefox-nightly/PKGBUILD
@@ -7,7 +7,7 @@ license=('MPL' 'GPL' 'LGPL')
 pkgname=firefox-nightly
 pkgdesc='Standalone web browser from mozilla.org, nightly build.'
 url='http://www.mozilla.org/projects/firefox'
-pkgver=4.0b5pre
+pkgver=4.0b9pre
 pkgrel=$(date +%Y_%m_%d_%T)
 
 source=( 'firefox-nightly.desktop' 'firefox-nightly-safe.desktop' )
diff --git a/gajim-hg/PKGBUILD b/gajim-hg/PKGBUILD
index 71a8de6..ae8c565 100644
--- a/gajim-hg/PKGBUILD
+++ b/gajim-hg/PKGBUILD
@@ -1,48 +1,49 @@
-# Maintainer: Benjamin Richter <br@waldteufel-online.net>
+# Maintainer: Lev Lybin <lev at lybin dot org>
+# Contributor: Benjamin Richter <br@waldteufel-online.net>
 # Contributor: Changaco <changaco@changaco.net>
 # Contributor: Artyom Smirnov <smirnoffjr@gmail.com>
 
 pkgname=gajim-hg
-pkgver=11794
+pkgver=12485
 pkgrel=1
 pkgdesc="Jabber/XMMP instant messenger client written in PyGTK"
 arch=('i686' 'x86_64')
 url="http://gajim.org"
-license=('GPL')
-depends=('python>=2.5' 'pygtk>=2.16' 'xdg-utils')
+license=('GPL3')
+depends=('python>=2.5' 'pygtk>=2.16' 'xdg-utils' 'python-pysqlite')
 makedepends=('mercurial' 'intltool>=0.40.1')
 optdepends=(
-    'libxss: idle'
-    'pyopenssl: secure SSL/TLS'
-    'pycrypto: End to end encryption'
-    'dbus-glib: link-local messaging (install avahi!)'
-    'avahi: link-local messaging (install dbus-glib!)'
-    'dnsutils: SRV support'
-    'gtkspell: Spell checking (install aspell-LANG!)'
-    'gnome-python-desktop: Keyring support'
-    'python-notify: Notification popups'
-    'dbus-python'
-    'farsight2: for Jingle support')
+	'dbus-python: Python bindings for DBUS'
+	'pyopenssl: for secure SSL/TLS'
+	'notification-daemon: for desktop notification'
+	'dnsutils: for SRV support'
+	'libxss: for idle module'
+	'gtkspell:spelling support (install aspell-LANG!)'
+	'gnome-python-desktop: for GnomeKeyring support'
+	'farsight2: video/voice support'
+	'gstreamer0.10-good: video/voice support'
+	'gstreamer0.10-bad: video/voice support'
+	'pycrypto: End to end encryption'
+	'dbus-glib: link-local messaging (install avahi!)'
+	'avahi: link-local messaging (install dbus-glib!)'
+	'python-notify: Notification popups')
+    
 provides=('gajim')
 conflicts=('gajim' 'gajim-svn')
 replaces=('gajim-svn')
-options=(!libtool)
 install=gajim.install
-source=()
-md5sums=()
 
 _hgroot=http://hg.gajim.org
 _hgrepo=gajim
 
 build() {
-    rm -rf "{$srcdir}/build"
-    
     cd "${srcdir}/${_hgrepo}"
-    [[ $(hg branch) == default ]] || hg update default
-    hg archive "${srcdir}/build"
+    hg update default
+    ./autogen.sh --prefix=/usr
+    make
+}
 
-    cd "${srcdir}/build"
-    ./autogen.sh --prefix=/usr || return 1
-    make || return 1
-    make DESTDIR="${pkgdir}" install || return 1
-} 
+package() {
+    cd "${srcdir}/${_hgrepo}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/gajim-otr-bzr/PKGBUILD b/gajim-otr-bzr/PKGBUILD
deleted file mode 100644
index 8f993e3..0000000
--- a/gajim-otr-bzr/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Hannes Rist <cowider@gmail.com>
-
-pkgname=gajim-otr-bzr
-pkgver=8797
-pkgrel=1
-pkgdesc="Jabber client written in PyGTK, experimental OTR-Branch"
-arch=('i686' 'x86_64')
-provides=('gajim')
-conflicts=('gajim' 'gajim-svn')
-options=(!libtool)
-license=('GPL')
-url="http://www.gajim.org/"
-depends=('gtkspell' 'dnsutils' 'pygtk' 'python-pysqlite' 'dbus-python' 'libxss' 'pycrypto' 'pkgconfig' 'python-otr' 'pyopenssl')
-makedepends=('bzr' 'intltool')
-source=()
-md5sums=()
-
-_bzrtrunk=http://bazaar.launchpad.net/~gajim-otr-dev/gajim/otr
-_bzrmod=otr
-
-
-build() {
-  cd $startdir/src
-  
-  msg "Connecting to the server...."
-
-  if [ ! -d ./$_bzrmod ]; then 
-        bzr co $_bzrtrunk $_bzrmod -r $pkgver
-  else
-        bzr update $_bzrmod
-  fi
-
-  msg "BZR checkout done or server timeout"
-
-  [ -d ./$_bzrmod-build ] && rm -rf ./$_bzrmod-build
-  cp -r ./$_bzrmod ./$_bzrmod-build
-  cd ./$_bzrmod-build
-  
-  msg "Starting make..."
-  cd $startdir/src/$_bzrmod
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/hunt/PKGBUILD b/hunt/PKGBUILD
new file mode 100644
index 0000000..9c0d934
--- /dev/null
+++ b/hunt/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Florian Pritz <flo@xinu.at
+pkgname=hunt
+pkgver=1.5
+pkgrel=1
+pkgdesc="TCP connection hijacker"
+arch=(i686 x86_64)
+url="http://packetstormsecurity.org/sniffers/hunt/"
+license=('GPL')
+groups=()
+depends=()
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=(http://packetstormsecurity.org/sniffers/$pkgname/$pkgname-$pkgver.tgz)
+noextract=()
+md5sums=() #generate with 'makepkg -g'
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+    install -Dm755 "$pkgname" "$pkgdir/usr/bin/hunt-network"
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('5a8886784d1668a8518d5562bfd01ae7')
diff --git a/mac/PKGBUILD b/mac/PKGBUILD
new file mode 100644
index 0000000..6c40c9c
--- /dev/null
+++ b/mac/PKGBUILD
@@ -0,0 +1,23 @@
+# Contributor: stonecrest <stonecrest[at]gmail[dot]com>
+
+pkgname=mac
+pkgver=3.99u4b5
+pkgrel=4
+pkgdesc="APE codec and decompressor"
+arch=('any')
+url="http://supermmx.org/linux/mac"
+license=('unknown')
+depends=()
+makedepends=('gcc' 'yasm' 'gcc-libs')
+source=(http://freshgen.googlecode.com/files/mac-3.99-u4-b5.tar.gz
+        gcc4_errors.patch)
+md5sums=('75716b342e07deae58f56a2522362006'
+         '771c071831871fe8803d139a56515e86')
+
+build() {
+  cd ${srcdir}/$pkgname-3.99-u4-b5
+  patch -Np1 -i ${srcdir}/gcc4_errors.patch || return 1
+  ./configure --prefix=/usr --enable-assembly=yes 
+  make || return 1
+  make DESTDIR=${pkgdir} install
+}
diff --git a/mac/gcc4_errors.patch b/mac/gcc4_errors.patch
new file mode 100644
index 0000000..f7a0898
--- /dev/null
+++ b/mac/gcc4_errors.patch
@@ -0,0 +1,26 @@
+--- mac-3.99-u4-b5-s4/src/MACLib/APELink.cpp	2006-06-01 13:00:57.000000000 +0400
++++ mac-3.99-u4-b5-s4/src/MACLib/APELink.cpp	2009-06-15 00:31:36.081731282 +0400
+@@ -63,10 +63,10 @@
+     if (pData != NULL)
+     {
+         // parse out the information
+-        char * pHeader = strstr(pData, APE_LINK_HEADER);
+-        char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
+-        char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
+-        char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
++        const char * pHeader = strstr(pData, APE_LINK_HEADER);
++        const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
++        const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
++        const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
+ 
+         if (pHeader && pImageFile && pStartBlock && pFinishBlock)
+         {
+@@ -81,7 +81,7 @@
+                 
+                 // get the path
+                 char cImageFile[MAX_PATH + 1]; int nIndex = 0;
+-                char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
++                const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
+                 while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
+                     cImageFile[nIndex++] = *pImageCharacter++;
+                 cImageFile[nIndex] = 0;
diff --git a/mpd-git/PKGBUILD b/mpd-git/PKGBUILD
index a3ef6b4..0b18d9f 100644
--- a/mpd-git/PKGBUILD
+++ b/mpd-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 
 pkgname=mpd-git
-pkgver=20100603
+pkgver=20101030
 pkgrel=1
 pkgdesc="music daemon that plays mp3, flac, aac, mod, wav, mpc and ogg files"
 url="http://musicpd.org"
diff --git a/oss-hg/PKGBUILD b/oss-hg/PKGBUILD
index 79f1ad9..97a9956 100644
--- a/oss-hg/PKGBUILD
+++ b/oss-hg/PKGBUILD
@@ -1,7 +1,7 @@
 # Archlive <http://archlive-pkg.googlecode.com>
 
 pkgname=oss-hg
-pkgver=907
+pkgver=920
 pkgrel=1
 pkgdesc="Open Sound System UNIX audio architecture"
 arch=('i686' 'x86_64')
@@ -36,7 +36,6 @@ build() {
   [ -d $srcdir/${_hgrepo} ] && rm -rf $srcdir/${_hgrepo}
   hg clone $startdir/${_hgrepo} $srcdir/${_hgrepo}
   cd $srcdir/${_hgrepo}
-  zsh
 
   # Avoid these flags conflicting with OSS build system.
   unset CFLAGS
@@ -72,7 +71,7 @@ build() {
   cp -a * "${pkgdir}"
   chmod -R a+r "${pkgdir}" 
   find "${pkgdir}" -type d -exec chmod a+x '{}' \;
-  install -D -m755 "$srcdir/oss.rc" "$pkgdir/etc/rc.d/oss"
+  install -D -m755 "$srcdir/oss.rc" "$pkgdir/etc/rc.d/oss4"
   install -D -m755 "$srcdir/ossxmix.desktop" "$pkgdir/usr/share/applications/ossxmix.desktop"
   install -D -m644 "$srcdir/ossxmix.png" "$pkgdir/usr/share/pixmaps/ossxmix.png"
 }
@@ -82,4 +81,3 @@ md5sums=('b9a380a0ac8896390d71ac13676f27e1'
          '1494a2304a1eb7a1979e7e83d894c67a'
          'f6a0fa9d274d21ab92cd03fca885add7'
          '81e0f51ec04379dee64c31c32b045028')
-# vim: set ft=zsh:
diff --git a/oss-hg/namcap.log b/oss-hg/namcap.log
new file mode 100644
index 0000000..475fa85
--- /dev/null
+++ b/oss-hg/namcap.log
@@ -0,0 +1,8 @@
+PKGBUILD (oss-hg) E: File referenced in $startdir
+PKGBUILD (oss-hg) E: File referenced in $startdir
+PKGBUILD (oss-hg) W: Missing Maintainer tag
+oss-hg W: Referenced library 'libOSSlib.so' is an uninstalled dependency
+oss-hg W: Referenced library 'libossmix.so' is an uninstalled dependency
+oss-hg W: Dependency included and not needed ('module-init-tools')
+oss-hg W: Dependency included and not needed ('libtool')
+oss-hg W: Dependency included and not needed ('sed')
diff --git a/pacman-git/PKGBUILD b/pacman-git/PKGBUILD
new file mode 100644
index 0000000..2a95d09
--- /dev/null
+++ b/pacman-git/PKGBUILD
@@ -0,0 +1,96 @@
+# Maintainer: Dave Reisner <d@falconindy.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: godane <slaxemulator@gmail.com.com>
+# Contributor: Andres Perera <aepd87@gmail.com>
+
+pkgname=pacman-git
+pkgver=20110112
+pkgrel=1
+pkgdesc="A library-based package manager with dependency support. git version."
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org/pacman/"
+license=('GPL')
+groups=('base')
+depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist')
+makedepends=('git' 'asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user'
+            'curl: for rankmirrors usage')
+backup=(etc/pacman.conf etc/makepkg.conf)
+conflicts=('pacman')
+provides=('pacman')
+options=(!libtool)
+source=(pacman.conf
+        pacman.conf.x86_64
+        makepkg.conf)
+md5sums=('eda9cbdb47f85fabda2e7e63801e3e16'
+         '9ba146b4fa7bcb3cc18204b06d1f6157'
+         'aef317285c7d16ac495b0e53deeb948d')
+
+_gitroot="git://projects.archlinux.org/pacman.git"
+_gitname="pacman"
+
+build() {
+  msg 'Connecting to GIT server...'
+
+  if [[ -d $_gitname ]]; then
+    ( cd $_gitname && git pull origin )
+    msg 'The local files are updated.'
+  else
+    git clone $_gitroot
+  fi
+
+  msg 'GIT checkout done or server timeout'
+  msg 'Starting make...'
+
+  rm -rf $_gitname-build
+  git clone $_gitname{,-build}
+  cd $_gitname-build
+
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc \
+    --enable-git-version
+  make
+}
+
+package() {
+  cd "$srcdir/$_gitname-build"
+
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case "$CARCH" in
+    i686)
+      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+      ;;
+    x86_64)
+      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+      ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # set things correctly in the default conf file
+  case "$CARCH" in
+    i686)
+      mycarch="i686"
+      mychost="i686-pc-linux-gnu"
+      myflags="-march=i686 "
+      ;;
+    x86_64)
+      mycarch="x86_64"
+      mychost="x86_64-unknown-linux-gnu"
+      myflags="-march=x86-64 "
+      ;;
+  esac
+  sed -i $pkgdir/etc/makepkg.conf \
+    -e "s|@CARCH[@]|$mycarch|g" \
+    -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@CARCHFLAGS[@]|$myflags|g"
+
+  # install completion files
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
+  mkdir -p $pkgdir/usr/share/zsh/site-functions/
+  install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
+}
+
+# vim: set ts=2 sw=2 et:
diff --git a/pacman-git/makepkg.conf b/pacman-git/makepkg.conf
new file mode 100644
index 0000000..ff08a0f
--- /dev/null
+++ b/pacman-git/makepkg.conf
@@ -0,0 +1,115 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'rsync::/usr/bin/rsync -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/curl
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="@CARCH@"
+CHOST="@CHOST@"
+
+#-- Exclusive: will only run on @CARCH@
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- fakeroot: Allow building packages as a non-root user
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#
+BUILDENV=(fakeroot !distcc color !ccache)
+#
+#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
+#-- specify a space-delimited list of hosts running in the DistCC cluster.
+#DISTCC_HOSTS=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge:     Remove files specified by PURGE_TARGETS
+#
+OPTIONS=(strip docs libtool emptydirs zipman purge)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Directories to be searched for the strip option (if strip is specified)
+STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john@doe.com>"
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
+SRCEXT='.src.tar.gz'
+
+# vim: set ft=sh ts=2 sw=2 et:
diff --git a/pacman-git/namcap.log b/pacman-git/namcap.log
new file mode 100644
index 0000000..76b0571
--- /dev/null
+++ b/pacman-git/namcap.log
@@ -0,0 +1,8 @@
+pacman-git E: Dependency detected and not included (pacman) from files ['usr/bin/pacman', 'usr/bin/pactree', 'usr/bin/testdb', 'usr/bin/testpkg', 'usr/bin/cleanupdelta']
+pacman-git W: Dependency included but already satisfied ('bash')
+pacman-git W: Dependency included but already satisfied ('libarchive')
+pacman-git W: Dependency included but already satisfied ('libfetch')
+pacman-git W: Dependency included and not needed ('pacman-mirrorlist')
+pacman-git W: File (var/cache) exists in a non-standard directory.
+pacman-git W: File (var/cache/pacman) exists in a non-standard directory.
+pacman-git W: File (var/cache/pacman/pkg) exists in a non-standard directory.
diff --git a/pacman-git/pacman.conf b/pacman-git/pacman.conf
new file mode 100644
index 0000000..3a5d875
--- /dev/null
+++ b/pacman-git/pacman.conf
@@ -0,0 +1,79 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+
diff --git a/pacman-git/pacman.conf.x86_64 b/pacman-git/pacman.conf.x86_64
new file mode 100644
index 0000000..e825b4b
--- /dev/null
+++ b/pacman-git/pacman.conf.x86_64
@@ -0,0 +1,84 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repository here.
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+
diff --git a/pigeonhole-hg/PKGBUILD b/pigeonhole-hg/PKGBUILD
index 15aba68..f13ebb4 100644
--- a/pigeonhole-hg/PKGBUILD
+++ b/pigeonhole-hg/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Sebastian Köhler <sebkoehler@whoami.org.uk>
 pkgname=pigeonhole-hg
-pkgver=1380
+pkgver=1458
 pkgrel=1
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0"
 arch=('i686' 'x86_64')
diff --git a/pigeonhole-hg/namcap.log b/pigeonhole-hg/namcap.log
new file mode 100644
index 0000000..a6596e6
--- /dev/null
+++ b/pigeonhole-hg/namcap.log
@@ -0,0 +1,11 @@
+PKGBUILD (pigeonhole-hg) W: Missing Maintainer tag
+pigeonhole-hg W: Referenced library 'libdovecot-sieve.so.0' is an uninstalled dependency
+pigeonhole-hg W: Referenced library 'libdovecot-storage.so.0' is an uninstalled dependency
+pigeonhole-hg W: Referenced library 'libdovecot-lda.so.0' is an uninstalled dependency
+pigeonhole-hg W: Referenced library 'libdovecot.so.0' is an uninstalled dependency
+pigeonhole-hg W: Referenced library 'libdovecot-login.so.0' is an uninstalled dependency
+pigeonhole-hg W: Dependency included and not needed ('dovecot')
+pigeonhole-hg W: File (usr/lib/dovecot/libdovecot-sieve.la) is a libtool file
+pigeonhole-hg W: File (usr/lib/dovecot/modules/lib90_sieve_plugin.la) is a libtool file
+pigeonhole-hg W: File (usr/lib/dovecot/modules/settings/libmanagesieve_login_settings.la) is a libtool file
+pigeonhole-hg W: File (usr/lib/dovecot/modules/settings/libmanagesieve_settings.la) is a libtool file
diff --git a/python-otr/PKGBUILD b/python-otr/PKGBUILD
new file mode 100644
index 0000000..2aaf0ea
--- /dev/null
+++ b/python-otr/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: Andre Klitzing <aklitzing () online () de>
+
+pkgname=python-otr
+pkgver=0.2.1.1
+pkgrel=1
+pkgdesc="Simple python bindings for OTR"
+arch=('i686' 'x86_64')
+url="http://python-otr.pentabarf.de"
+license=('GPL')
+depends=('libotr>=3.2.0' 'python')
+makedepends=('swig')
+conflicts=('pyotr')
+replaces=('pyotr')
+source=(http://$pkgname.pentabarf.de/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('e753e6516d611d0c37a3fc785fb29b21')
+
+build() {
+	cd $srcdir/$pkgname-$pkgver
+
+# Great python3 rebuild
+for file in $(find . -name '*.py' -print); do
+sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "${file}"
+sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' "${file}"
+done
+
+	python2 setup.py build || return 1
+	python2 setup.py install --prefix=/usr --root=$pkgdir || return 1
+}
+
diff --git a/python-otr/namcap.log b/python-otr/namcap.log
new file mode 100644
index 0000000..49a0e7f
--- /dev/null
+++ b/python-otr/namcap.log
@@ -0,0 +1,3 @@
+PKGBUILD (python-otr) W: Missing Maintainer tag
+python-otr E: Dependency detected and not included (python2) from files ['usr/lib/python2.7/site-packages/_otr.so']
+python-otr W: Dependency included and not needed ('python')
diff --git a/tsung/PKGBUILD b/tsung/PKGBUILD
index 4622ef6..a418e41 100644
--- a/tsung/PKGBUILD
+++ b/tsung/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Florian Pritz <f-p@gmx.at>
 
 pkgname=tsung
-pkgver=1.3.1
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="Erlang-based open-source multi-protocol distributed load testing tool"
 arch=('i686' 'x86_64')
@@ -19,5 +19,4 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('04484661643735262e625cac8fc3544d')
-sha1sums=('ac575f3a28b2a564868375efeed57b9ac4ddc2b5')
+md5sums=('c517187b44e22c5b3e169f4dff3164ca')
diff --git a/wireshark-cli/PKGBUILD b/wireshark-cli/PKGBUILD
deleted file mode 100644
index 45142dc..0000000
--- a/wireshark-cli/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Florian "Bluewind" Pritz <flo@xssn.at>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=wireshark-cli
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - no GUI"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('heimdal>=1.3.1' 'libpcap>=1.0.0' 'bash' 'gnutls>=2.4.1' 'libcap>=2.16')
-makedepends=('bison' 'flex')
-url="http://www.wireshark.org/"
-replaces=('ethereal')
-conflicts=('wireshark')
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/wireshark-${pkgver}.tar.bz2)
-
-build() {
-  cd ${srcdir}/wireshark-${pkgver}
-  export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
-
-  autoreconf -f -i
-
-  ./configure --prefix=/usr --with-ssl --disable-wireshark --disable-gtktest
-  make all
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('13b188baea23cdad40b7a55921384a77')
diff --git a/wireshark-cli/wireshark-1.1.2--as-needed.patch b/wireshark-cli/wireshark-1.1.2--as-needed.patch
deleted file mode 100644
index 7da659c..0000000
--- a/wireshark-cli/wireshark-1.1.2--as-needed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/epan/Makefile.am b/epan/Makefile.am
-index b2a569d..717e233 100644
---- a/epan/Makefile.am
-+++ b/epan/Makefile.am
-@@ -130,6 +130,7 @@ libwireshark_la_LIBADD = \
- 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
- 	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
- 	@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
-+	${top_builddir}/wiretap/libwiretap.la \
- 	${top_builddir}/wsutil/libwsutil.la -lm
- 
- libwireshark_la_DEPENDENCIES = \
-@@ -137,6 +138,7 @@ libwireshark_la_DEPENDENCIES = \
- 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
- 	dfilter/libdfilter.la dissectors/libdissectors.la \
- 	dissectors/libdirtydissectors.la $(wslua_lib) \
-+	${top_builddir}/wiretap/libwiretap.la \
- 	${top_builddir}/wsutil/libwsutil.la
- 
- #EXTRA_PROGRAMS = reassemble_test