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, 76 deletions

diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD
deleted file mode 100644
index a6b0033a1..000000000
--- a/extra/gecko-sharp-2.0/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137770 2011-09-10 17:09:41Z pierre $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=gecko-sharp-2.0
-pkgver=0.13
-pkgrel=4
-pkgdesc="C# bindings for gtkmozembed"
-arch=('i686' 'x86_64')
-license=('LGPL' 'MPL')
-url="http://www.mono-project.com/"
-depends=('xulrunner' 'gtk-sharp-2')
-makedepends=('monodoc' 'pkgconfig')
-source=("http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2"
-        'gecko-sharp-2.0-0.12-xulrunner.patch')
-md5sums=('f88eaa06e71f8d8fa34cf59a3e034a6b'
-         '4f2c07c3fb0c1a94adaa4e4c8d57608b')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-    DESTDIR=${pkgdir} install
-}
diff --git a/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch b/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch
deleted file mode 100644
index 5d19fea72..000000000
--- a/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw.xl gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw
---- gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw.xl	2006-12-22 20:57:47.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw	2007-11-27 15:54:41.000000000 +0100
-@@ -349,6 +349,12 @@
-           <parameter type="const-char*" name="aPath" />
-         </parameters>
-       </method>
-+      <method name="SetPath" cname="gtk_moz_embed_set_path" shared="true">
-+        <return-type type="void" />
-+        <parameters>
-+          <parameter type="const-char*" name="aPath" />
-+        </parameters>
-+      </method>
-       <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-         <return-type type="void" />
-         <parameters>
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml.xl gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml
---- gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml.xl	2006-12-22 20:57:54.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml	2007-11-27 15:54:41.000000000 +0100
-@@ -349,6 +349,12 @@
-           <parameter type="const-char*" name="aPath" />
-         </parameters>
-       </method>
-+      <method name="SetPath" cname="gtk_moz_embed_set_path" shared="true">
-+        <return-type type="void" />
-+        <parameters>
-+          <parameter type="const-char*" name="aPath" />
-+        </parameters>
-+      </method>
-       <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-         <return-type type="void" />
-         <parameters>
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in.xl gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in
---- gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in.xl	2006-12-22 20:57:47.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in	2007-11-27 16:05:02.000000000 +0100
-@@ -3,5 +3,5 @@
-   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
--  <dllmap dll="gtkembedmoz.dll" target="libgtkembedmoz@LIB_PREFIX@@LIB_SUFFIX@"/>
-+  <dllmap dll="gtkembedmoz.dll" target="libxul@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>