Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

2 files changed, 0 insertions, 82 deletions

diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD
deleted file mode 100644
index 7edc07f86..000000000
--- a/community/cairo-compmgr/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 56292 2011-10-05 06:05:11Z bluewind $
-# Maintainer: Florian Pritz <flo@xinu.at>
-# Contributor: Adam Hani Schakaki (krzd) <krzd@krzd.net>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: catalyst <catalyst@xaker.ru>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: jackobw
-# Contributor: Gianni Vialetto <g dot vialetto at gmail dot com>
-
-pkgname=cairo-compmgr
-pkgver=git20111002
-_commit=348f149af30bc829c2100d0e622c5dcaf43925b7
-pkgrel=1
-epoch=1
-pkgdesc="A Cairo based composite manager"
-arch=(i686 x86_64 'mips64el')
-url="http://cairo-compmgr.tuxfamily.org/"
-license=(GPL)
-makedepends=(gettext gtk-doc "intltool>=0.41" git)
-depends=("gtk2>=2.16.0" "vala>=0.14" libsm gconf)
-install=cairo-compmgr.install
-options=(!libtool)
-#source=(http://download.tuxfamily.org/ccm/$pkgname/$pkgname-$pkgver.tar.gz)
-source=()
-md5sums=()
-
-__gitroot="git://git.tuxfamily.org/gitroot/ccm/cairocompmgr.git"
-__gitname="cairo-compmgr"
-
-
-build() {
-#  cd "$srcdir/$pkgname-$pkgver"
-  cd "$srcdir"
-
-  msg "Connecting to GIT server...."
-
-  if [ -d $__gitname ] ; then
-    cd $__gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $__gitroot $__gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-  git checkout "$_commit"
-
-#  sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac
-  ./autogen.sh --prefix=/usr
-  make -j1
-}
-
-package() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd "$srcdir/$__gitname-build"
-
-  make DESTDIR="$pkgdir" install
-  mkdir -p "$pkgdir/usr/share/gconf/schemas/"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/cairo-compmgr.schemas" "$pkgdir/etc/gconf/schemas/*.schemas"
-  rm -rf "$pkgdir/etc/gconf/schemas/"
-}
diff --git a/community/cairo-compmgr/cairo-compmgr.install b/community/cairo-compmgr/cairo-compmgr.install
deleted file mode 100644
index 21c829413..000000000
--- a/community/cairo-compmgr/cairo-compmgr.install
+++ /dev/null
@@ -1,17 +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
-}
-
-# vim:set ts=2 sw=2 et: