Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

2 files changed, 0 insertions, 87 deletions

diff --git a/community/luasec/ChangeLog b/community/luasec/ChangeLog
deleted file mode 100644
index 4a64bc6a7..000000000
--- a/community/luasec/ChangeLog
+++ /dev/null
@@ -1,60 +0,0 @@
-2010-02-15  Dwayne Bent  <dbb.1@liqd.org>
-
-	* PKGBUILD:
-	Install license file
-	[ea00bf4731a9] [tip]
-
-	* PKGBUILD:
-	Updated email address
-	[7dbb9017cecc]
-
-2009-12-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4-1 for changeset 91906cc7dfbd
-	[3c36a2298de6]
-
-	* PKGBUILD, luasec.patch:
-	New upstream version
-	[91906cc7dfbd] [v0.4-1]
-
-2009-08-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.3.3-1 for changeset 9635074f31a3
-	[e6b3934bbbba]
-
-	* PKGBUILD:
-	New upstream version
-	[9635074f31a3] [v0.3.3-1]
-
-2009-07-01  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, luasec.patch:
-	Changed to using custom patch
-	[30893f6a9840]
-
-	* PKGBUILD:
-	Added minimum versions to dependencies
-	[b538b6270f60]
-
-2009-05-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.3.2-1 for changeset eacacff733b2
-	[f93b17e1495c]
-
-	* PKGBUILD:
-	New upstream version
-	[eacacff733b2] [v0.3.2-1]
-
-2009-05-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.3.1-1 for changeset 9f9bd46fe838
-	[9d25feaa12a5]
-
-	* PKGBUILD:
-	Initial commit.
-	[9f9bd46fe838] [v0.3.1-1]
-
diff --git a/community/luasec/luasec.patch b/community/luasec/luasec.patch
deleted file mode 100644
index 7b0c9d6cc..000000000
--- a/community/luasec/luasec.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	2009-12-19 14:54:45.000000000 -0500
-+++ Makefile	2009-12-19 14:57:22.000000000 -0500
-@@ -1,11 +1,11 @@
- # Inform the location to intall the modules
--LUAPATH=/usr/local/share/lua/5.1
--LUACPATH=/usr/local/lib/lua/5.1
-+LUAPATH=/usr/share/lua/5.1
-+LUACPATH=/usr/lib/lua/5.1
- 
- # Edit the lines below to inform new path, if necessary
- #
--#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include
--#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib
-+INCDIR=-I/usr/include -I/usr/include/openssl
-+LIBDIR=-L/usr/lib
- 
- # For Mac OS X: set the system version
- MACOSX_VERSION=10.4
-@@ -26,7 +26,7 @@
- 	@echo "  * macosx"
- 
- install:
--	@cd src ; $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install
-+	@cd src ; $(MAKE) LUACPATH="$(DESTDIR)$(LUACPATH)" LUAPATH="$(DESTDIR)$(LUAPATH)" install
- 
- linux:
- 	@echo "---------------------"