Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts:
	community/acpi/PKGBUILD
	community/alure/PKGBUILD
	community/ario/PKGBUILD
	community/cantata/PKGBUILD
	community/cgit/PKGBUILD
	community/chntpw/PKGBUILD
	community/clamz/PKGBUILD
	community/deadbeef/PKGBUILD
	community/dunst/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnome-commander/PKGBUILD
	community/gq/PKGBUILD
	community/gtkimageview/PKGBUILD
	community/i3status/PKGBUILD
	community/iasl/PKGBUILD
	community/krename/PKGBUILD
	community/libesmtp/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/libmilter/PKGBUILD
	community/libpaper/PKGBUILD
	community/libvirt/PKGBUILD
	community/libx86emu/PKGBUILD
	community/libxdg-basedir/PKGBUILD
	community/lightdm-gtk2-greeter/PKGBUILD
	community/lightdm-gtk3-greeter/PKGBUILD
	community/lightdm/PKGBUILD
	community/luakit/PKGBUILD
	community/lxtask/PKGBUILD
	community/marisa/PKGBUILD
	community/megaglest/PKGBUILD
	community/mumble/PKGBUILD
	community/opencolorio/PKGBUILD
	community/openssh-askpass/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/pidgin-toobars/PKGBUILD
	community/powerdns/PKGBUILD
	community/python-numexpr/PKGBUILD
	community/python-pybox2d/PKGBUILD
	community/python-pytables/PKGBUILD
	community/python2-imaging/PKGBUILD
	community/python2-pybluez/PKGBUILD
	community/remmina/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/ruby-iconv/PKGBUILD
	community/scummvm-tools/PKGBUILD
	community/shapelib/PKGBUILD
	community/sshfs/PKGBUILD
	community/subtle/PKGBUILD
	community/teeworlds/PKGBUILD
	community/uget/PKGBUILD
	community/wireshark/PKGBUILD
	community/wxcam/PKGBUILD
	community/wxgtk2.9/PKGBUILD
	community/xchm/PKGBUILD
	community/xdelta3/PKGBUILD
	community/zynaddsubfx/PKGBUILD
	core/gcc/PKGBUILD
	core/gcc/gcc_mips64el_lib.patch
	core/gdbm/PKGBUILD
	core/ldns/PKGBUILD
	core/pth/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	elementary/postler/PKGBUILD
	elementary/vala-010/PKGBUILD
	extra/aubio/PKGBUILD
	extra/audacity/PKGBUILD
	extra/bc/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/chmlib/PKGBUILD
	extra/clamav/PKGBUILD
	extra/clisp/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/cups/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ecore/PKGBUILD
	extra/edje/PKGBUILD
	extra/eet/PKGBUILD
	extra/eeze/PKGBUILD
	extra/efreet/PKGBUILD
	extra/eina/PKGBUILD
	extra/eio/PKGBUILD
	extra/embryo/PKGBUILD
	extra/emotion/PKGBUILD
	extra/enlightenment17/PKGBUILD
	extra/ethumb/PKGBUILD
	extra/evas/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/git/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtkmathview/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/hugin/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/jack/PKGBUILD
	extra/ktorrent/PKGBUILD
	extra/libaccounts-qt/PKGBUILD
	extra/libdvdnav/PKGBUILD
	extra/libdvdread/PKGBUILD
	extra/libetpan/PKGBUILD
	extra/libgadu/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libsecret/PKGBUILD
	extra/libssh/PKGBUILD
	extra/libvorbis/PKGBUILD
	extra/lilv/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/obex-data-server/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/opencv/PKGBUILD
	extra/opengtl/PKGBUILD
	extra/perl-net-dns/PKGBUILD
	extra/perl-socket6/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/qt5/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/shared-mime-info/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v4l-utils/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vim/PKGBUILD
	extra/wildmidi/PKGBUILD
	extra/wxpython/PKGBUILD
	extra/x2goclient/PKGBUILD
	extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zsh/PKGBUILD
	libre-testing/unace-libre/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/audacity-libre/PKGBUILD
	libre/audex-libre/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/bumblebee-libre/PKGBUILD
	libre/crosstool-ng/PKGBUILD
	libre/dvdrip-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/enscript/PKGBUILD
	libre/epdfview-libre/PKGBUILD
	libre/hardinfo/PKGBUILD
	libre/kile-libre/PKGBUILD
	libre/lesspipe-libre/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/linux-libre-tools/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD
	libre/midori-libre/PKGBUILD
	libre/oss-libre/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD
	libre/seamonkey-libre/PKGBUILD
	libre/unzip-libre/PKGBUILD
	libre/xarchiver-libre/PKGBUILD
	libre/xmlstarlet/PKGBUILD
	pcr/a2jmidid/PKGBUILD
	pcr/amsynth/PKGBUILD
	pcr/anyremote/PKGBUILD
	pcr/azr3-jack/PKGBUILD
	pcr/bambus/PKGBUILD
	pcr/bamf2/PKGBUILD
	pcr/barnyard2/PKGBUILD
	pcr/bison++/PKGBUILD
	pcr/bup/PKGBUILD
	pcr/din/PKGBUILD
	pcr/django-tagging/PKGBUILD
	pcr/doxymacs/PKGBUILD
	pcr/emacs-js2-mode/PKGBUILD
	pcr/eterm/PKGBUILD
	pcr/frame/PKGBUILD
	pcr/freeipmi/PKGBUILD
	pcr/geis/PKGBUILD
	pcr/ginn/PKGBUILD
	pcr/grail/PKGBUILD
	pcr/libast/PKGBUILD
	pcr/libdshconfig/PKGBUILD
	pcr/networkmanager-openswan/PKGBUILD
	pcr/networkmanager-strongswan/PKGBUILD
	pcr/openswan/PKGBUILD
	pcr/par/PKGBUILD
	pcr/snort/PKGBUILD
	pcr/strongswan/PKGBUILD
	social/batctl/PKGBUILD
	social/bip/PKGBUILD
	social/bitcoin-daemon/PKGBUILD
	social/dropbear/PKGBUILD
	social/ffingerd/PKGBUILD
	social/haveged/PKGBUILD
	social/inadyn-opendns/PKGBUILD
	social/liblockfile/PKGBUILD
	social/libowfat/PKGBUILD
	social/lockfile-progs/PKGBUILD
	social/netatalk/PKGBUILD
	social/olsrd/PKGBUILD
	social/poco/PKGBUILD
	social/spectrum/PKGBUILD
	social/squirm/PKGBUILD
	social/tokyotyrant/PKGBUILD
	social/tomoyo-tools/PKGBUILD

3 files changed, 0 insertions, 231 deletions

diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
deleted file mode 100644
index 08b0b3c13..000000000
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 79630 2012-11-09 11:59:02Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Aditya Som <icarious@hacari.org>"
-
-_pkgname=sylpheed
-pkgname=sylpheed-nonprism
-pkgver=3.3.0
-pkgrel=1.1
-pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
-arch=('i686' 'x86_64')
-url="http://sylpheed.sraoss.jp/en/"
-license=('GPL')
-depends=('gpgme' 'gtkspell' 'desktop-file-utils' 'compface')
-makedepends=('openssl')
-options=('!libtool')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install="$_pkgname.install"
-source=("http://sylpheed.sraoss.jp/$_pkgname/v3.3/$_pkgname-$pkgver.tar.bz2"
-        'nonprism.patch')
-md5sums=('20442f81dbb4e7c59462360ad0bb1afb'
-         'e1bddc14962e607cdb899ec082660639')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Remove Gmail support
-  patch -Np1 -i "$srcdir/nonprism.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr \
-              --enable-ldap
-  make
-
-  # Build Attachment-Tool Plug-in
-  cd plugin/attachment_tool && make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  # Install Attachment-Tool Plug-in
-  cd plugin/attachment_tool
-  make DESTDIR="$pkgdir/" install-plugin
-}
diff --git a/nonprism/sylpheed-nonprism/nonprism.patch b/nonprism/sylpheed-nonprism/nonprism.patch
deleted file mode 100644
index 50d000634..000000000
--- a/nonprism/sylpheed-nonprism/nonprism.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -Nur a/src/setup.c b/src/setup.c
---- a/src/setup.c	2010-08-19 02:23:28.000000000 -0300
-+++ b/src/setup.c	2013-10-23 15:10:24.439721307 -0200
-@@ -327,10 +327,6 @@
- 	GtkWidget *cancel_btn;
- 	GtkWidget *pop3_radio;
- 	GtkWidget *imap_radio;
--#if USE_SSL
--	GtkWidget *pop3g_radio;
--	GtkWidget *imapg_radio;
--#endif
- 	GtkWidget *name_entry;
- 	GtkWidget *addr_entry;
- 	GtkWidget *id_entry;
-@@ -378,15 +374,8 @@
- {
- 	SETUP_TYPE_POP3,
- 	SETUP_TYPE_IMAP,
--#if USE_SSL
--	SETUP_TYPE_POP3G,
--	SETUP_TYPE_IMAPG
--#endif
- };
- 
--#define GMAIL_POP3_SERVER	"pop.gmail.com"
--#define GMAIL_IMAP_SERVER	"imap.gmail.com"
--#define GMAIL_SMTP_SERVER	"smtp.gmail.com"
- #define POP3_PORT		110
- #define IMAP_PORT		143
- #define SMTP_PORT		25
-@@ -410,14 +399,6 @@
- 	serv = gtk_entry_get_text(GTK_ENTRY(setupac.serv_entry));
- 	smtp = gtk_entry_get_text(GTK_ENTRY(setupac.smtp_entry));
- 
--#if USE_SSL
--	if (setupac.type == SETUP_TYPE_POP3G ||
--	    setupac.type == SETUP_TYPE_IMAPG) {
--		if (GTK_WIDGET(editable) == setupac.addr_entry)
--			gtk_entry_set_text(GTK_ENTRY(setupac.id_entry), addr);
--	}
--#endif
--
- 	if (page == SETUP_PAGE_ADDRESS && name && *name && addr && *addr)
- 		next_enable = TRUE;
- 	else if (page == SETUP_PAGE_ACCOUNT &&
-@@ -436,8 +417,6 @@
- 	p = str = gtk_entry_get_text(GTK_ENTRY(entry));
- 	if (!str || *p == '\0')
- 		return FALSE;
--	if (!strcmp(str, "(username)@gmail.com"))
--		return FALSE;
- 
- 	while (*p) {
- 		c = *p;
-@@ -480,14 +459,6 @@
- 	} else if (response_id == GTK_RESPONSE_ACCEPT) {
- 		if (prev_page == SETUP_PAGE_ADDRESS) {
- 			if (entry_is_valid(setupac.addr_entry)) {
--#if USE_SSL
--				if (setupac.type == SETUP_TYPE_POP3G ||
--				    setupac.type == SETUP_TYPE_IMAPG)
--					gtk_notebook_set_current_page
--						(GTK_NOTEBOOK(setupac.notebook),
--						 SETUP_PAGE_FINISH);
--				else
--#endif
- 					gtk_notebook_set_current_page
- 						(GTK_NOTEBOOK(setupac.notebook), page + 1);
- 			} else
-@@ -508,10 +479,6 @@
- 		if (prev_page == SETUP_PAGE_START) {
- 			setupac.type = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3_radio)) ? SETUP_TYPE_POP3
- 				: gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imap_radio)) ? SETUP_TYPE_IMAP
--#if USE_SSL
--				: gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3g_radio)) ? SETUP_TYPE_POP3G
--				: gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imapg_radio)) ? SETUP_TYPE_IMAPG
--#endif
- 				: SETUP_TYPE_POP3;
- 		}
- 	} else if (response_id == GTK_RESPONSE_REJECT) {
-@@ -539,28 +506,6 @@
- 			gtk_widget_set_sensitive(setupac.serv_entry, TRUE);
- 			gtk_widget_set_sensitive(setupac.smtp_entry, TRUE);
- 			break;
--#if USE_SSL
--		case SETUP_TYPE_POP3G:
--			if (prev_page == SETUP_PAGE_START)
--				gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com");
--			gtk_widget_set_sensitive(setupac.id_entry, FALSE);
--			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("POP3 server:"));
--			gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_POP3_SERVER);
--			gtk_widget_set_sensitive(setupac.serv_entry, FALSE);
--			gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER);
--			gtk_widget_set_sensitive(setupac.smtp_entry, FALSE);
--			break;
--		case SETUP_TYPE_IMAPG:
--			if (prev_page == SETUP_PAGE_START)
--				gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com");
--			gtk_widget_set_sensitive(setupac.id_entry, FALSE);
--			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("IMAP4 server:"));
--			gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_IMAP_SERVER);
--			gtk_widget_set_sensitive(setupac.serv_entry, FALSE);
--			gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER);
--			gtk_widget_set_sensitive(setupac.smtp_entry, FALSE);
--			break;
--#endif /* USE_SSL */
- 		}
- 	} else if (page == SETUP_PAGE_FINISH) {
- 		prev_enable = FALSE;
-@@ -595,24 +540,6 @@
- 			setupac.smtp_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.smtpauth_chkbtn));
- 			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:"));
- 			break;
--#if USE_SSL
--		case SETUP_TYPE_POP3G:
--			setupac.serv_ssl = TRUE;
--			setupac.smtp_ssl = TRUE;
--			setupac.smtp_auth = TRUE;
--			setupac.serv_port = POP3S_PORT;
--			setupac.smtp_port = SMTPS_PORT;
--			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("POP3 server:"));
--			break;
--		case SETUP_TYPE_IMAPG:
--			setupac.serv_ssl = TRUE;
--			setupac.smtp_ssl = TRUE;
--			setupac.smtp_auth = TRUE;
--			setupac.serv_port = IMAPS_PORT;
--			setupac.smtp_port = SMTPS_PORT;
--			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:"));
--			break;
--#endif /* USE_SSL */
- 		}
- 
- 		GET_STR(name, name_entry);
-@@ -756,14 +683,6 @@
- 	setupac.imap_radio = gtk_radio_button_new_with_label_from_widget
- 		(GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4");
- 	gtk_box_pack_start(GTK_BOX(vbox), setupac.imap_radio, FALSE, FALSE, 0);
--#if USE_SSL
--	setupac.pop3g_radio = gtk_radio_button_new_with_label_from_widget
--		(GTK_RADIO_BUTTON(setupac.pop3_radio), "POP3 (Gmail)");
--	gtk_box_pack_start(GTK_BOX(vbox), setupac.pop3g_radio, FALSE, FALSE, 0);
--	setupac.imapg_radio = gtk_radio_button_new_with_label_from_widget
--		(GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4 (Gmail)");
--	gtk_box_pack_start(GTK_BOX(vbox), setupac.imapg_radio, FALSE, FALSE, 0);
--#endif
- 
- 	/* Page 2 */
- 	vbox = gtk_vbox_new(FALSE, 12);
-@@ -991,18 +910,6 @@
- #endif
- 		ac->imapport = setupac.serv_port;
- 		break;
--#if USE_SSL
--	case SETUP_TYPE_POP3G:
--		ac->protocol = A_POP3;
--		ac->ssl_pop = SSL_TUNNEL;
--		ac->popport = setupac.serv_port;
--		break;
--	case SETUP_TYPE_IMAPG:
--		ac->protocol = A_IMAP4;
--		ac->ssl_imap = SSL_TUNNEL;
--		ac->imapport = setupac.serv_port;
--		break;
--#endif /* USE_SSL */
- 	}
- 
- 	g_free(ac->sig_text);
diff --git a/nonprism/sylpheed-nonprism/sylpheed.install b/nonprism/sylpheed-nonprism/sylpheed.install
deleted file mode 100644
index e111ef946..000000000
--- a/nonprism/sylpheed-nonprism/sylpheed.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}