Merge branch 'master' of gitpar:abslibre-mips64el

Conflicts:
	extra/seahorse/PKGBUILD

2 files changed, 0 insertions, 68 deletions

diff --git a/extra/x2x/LICENSE b/extra/x2x/LICENSE
deleted file mode 100644
index 99ff948f8..000000000
--- a/extra/x2x/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * x2x: Uses the XTEST extension to forward keystrokes from a window on
- *      one display to another display.  Useful for desks
- *      with multiple keyboards.
- *
- * Copyright (c) 1997
- * Digital Equipment Corporation.  All rights reserved.
- * 
- * By downloading, installing, using, modifying or distributing this
- * software, you agree to the following:
- * 
- * 1. CONDITIONS. Subject to the following conditions, you may download,
- * install, use, modify and distribute this software in source and binary
- * forms:
- * 
- * a) Any source code, binary code and associated documentation
- * (including the online manual) used, modified or distributed must
- * reproduce and retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * 
- * b) No right is granted to use any trade name, trademark or logo of
- * Digital Equipment Corporation.  Neither the "Digital Equipment
- * Corporation" name nor any trademark or logo of Digital Equipment
- * Corporation may be used to endorse or promote products derived from
- * this software without the prior written permission of Digital
- * Equipment Corporation.
- * 
- * 2.  DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY DIGITAL "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD
deleted file mode 100644
index 01bc0520f..000000000
--- a/extra/x2x/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 128494 2011-06-24 05:31:20Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=x2x
-pkgver=1.27
-pkgrel=6.1
-pkgdesc="Control one X display from another"
-arch=(i686 x86_64 'mips64el')
-url="https://github.com/dottedmag/x2x"
-license=('custom')
-depends=('libxtst')
-makedepends=('imake')
-source=(https://github.com/downloads/dottedmag/x2x/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0'
-         '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mv x2x.1 x2x.man 
-  xmkmf 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" MANPATH=/usr/share/man install install.man
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}