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

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 8 insertions, 9 deletions

diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index b1747f65e..68a44139d 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 162825 2012-07-01 07:46:57Z andrea $
+# $Id: PKGBUILD 188538 2013-06-15 10:09:55Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=ortp
-pkgver=0.20.0.20120701
-pkgrel=1.1
+pkgver=0.22.0
+pkgrel=1
 pkgdesc="A Real-time Transport Protocol (RTP) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng/code_review/ortp"
 license=('GPL3')
 depends=('libzrtpcpp' 'libsrtp')
 options=('!libtool')
-#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('91b66787c6ac3e8d4d43946beb7611ce')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha1sums=('3f4712307ceba27c6498abd2090f411e02084dbd'
+          'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-  ./autogen.sh
   ./configure --prefix=/usr \
     --enable-zrtp \
     --disable-strict
@@ -28,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }