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

1 files changed, 0 insertions, 51 deletions

diff --git a/community/synce-rra/build-fix.diff b/community/synce-rra/build-fix.diff
deleted file mode 100644
index 848fe2d71..000000000
--- a/community/synce-rra/build-fix.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nruad -Nruad librra-0.11.1.orig/python/pyrra.pyx librra-0.11.1/python/pyrra.pyx
---- librra-0.11.1.orig/python/pyrra.pyx	2008-05-23 20:56:17.000000000 +0100
-+++ librra-0.11.1/python/pyrra.pyx	2008-05-23 20:56:30.000000000 +0100
-@@ -132,7 +132,7 @@
- cdef bool _CB_TypesCallback(RRA_SyncMgrTypeEvent event, uint32_t type, uint32_t count, uint32_t * ids, context):
- 	ida=[]
- 	cdef bool rc
--	for i from 0 <= i < count:
-+	for 0 <= i < count:
- 		ida.append(ids[i])
- 	rc=context.CB_TypeCallback(<RRA_SyncMgrTypeEvent> event,type,ida)
- 	return rc
-@@ -192,9 +192,9 @@
- 	# Event processing
- 	#
- 
--	def SubscribeObjectEvents(self,type):
-+	def SubscribeObjectEvents(self,type_id):
- 		if self.connected != 0:
--			rra_syncmgr_subscribe(self.instance, type, _CB_TypesCallback, self)
-+			rra_syncmgr_subscribe(self.instance, type_id, _CB_TypesCallback, self)
- 			return 0
- 		return -1
- 
-@@ -260,7 +260,7 @@
- 		c_oids = <uint32_t *>malloc(sizeof(uint32_t)*c_cnt)
- 		rc=0
- 		if c_oids != NULL:
--			for i from 0 <= i < c_cnt:
-+			for 0 <= i < c_cnt:
- 				c_oids[i] = oids[i]
- 			rc= rra_syncmgr_get_multiple_objects(self.instance,type_id, c_cnt, c_oids,_CB_WriterCallback, self)
- 			free(c_oids)
-@@ -291,7 +291,7 @@
- 				rc = rra_syncmgr_put_multiple_objects(self.instance,type_id,c_oidcount,
- 								      c_oids,c_newoids,flags,_CB_ReaderCallback,self)
- 				if rc == True:
--					for i from 0 <= i < c_oidcount:
-+					for 0 <= i < c_oidcount:
- 						newoid_array.append(c_newoids[i])
- 			free(c_oids)
- 		return rc
-@@ -312,7 +312,7 @@
- 	# (to be overloaded by user)
- 	#
- 
--	def CB_TypeCallback(self, event, type, idarray):
-+	def CB_TypeCallback(self, event, type_id, idarray):
- 		return False
- 		
- 	def CB_ObjectWriterCallback(self,type_id, obj_id, data):