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

Conflicts:
	community/abuse/PKGBUILD
	community/cppunit/PKGBUILD
	community/icon-slicer/PKGBUILD

7 files changed, 0 insertions, 123 deletions

diff --git a/community/abuse/PKGBUILD b/community/abuse/PKGBUILD
deleted file mode 100644
index 705a4c446..000000000
--- a/community/abuse/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 46622 2011-05-10 10:00:25Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=abuse
-pkgver=0.8
-pkgrel=1
-pkgdesc='A side-scroller action game that pits you against ruthless alien killers.'
-arch=('i686' 'x86_64')
-url='http://abuse.zoy.org/'
-license=('GPL' 'custom')
-depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
-install='abuse.install'
-source=("http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ec678b8dc8d00e0382d8c805c6438489')
->>>>>>> 8867b1d4d0601b21618d44d015460739590ca01d
-
-build() {
-  cd "${srcdir}/abuse-${pkgver}"
-
-  ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
-  make
-}
-
-package() {
-  cd "${srcdir}/abuse-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/usr/share/licenses/abuse"
-  sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
-}
diff --git a/community/abuse/abuse.install b/community/abuse/abuse.install
deleted file mode 100644
index 4d28ebacd..000000000
--- a/community/abuse/abuse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-#  echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse"
-   echo "Abuse uses the original game levels by default.  To use the frabs levels"
-   echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
diff --git a/community/cppunit/PKGBUILD b/community/cppunit/PKGBUILD
deleted file mode 100644
index 44dfad9b1..000000000
--- a/community/cppunit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 16187 2010-04-26 10:05:11Z andrea $
-# Maintainer:
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-
-pkgname=cppunit
-pkgver=1.12.1
-pkgrel=2
-pkgdesc="A C++ unit testing framework"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cppunit.sourceforge.net"
-license=('LGPL')
-depends=('sh' 'gcc-libs')
-makedepends=('gcc')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-	'gcc4.5.patch')
-md5sums=('bd30e9cf5523cdfc019b94f5e1d7fd19'
-	'7f4e3b50fa1ee8bc854ab431848dddec')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/gcc4.5.patch
-  autoreconf
-  libtoolize -f
-  ./configure --prefix=/usr
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/community/cppunit/gcc4.5.patch b/community/cppunit/gcc4.5.patch
deleted file mode 100644
index 86d4a424d..000000000
--- a/community/cppunit/gcc4.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cppunit-1.12.1.orig/src/cppunit/Makefile.am
-+++ cppunit-1.12.1/src/cppunit/Makefile.am
-@@ -63,5 +63,11 @@
- 
- libcppunit_la_LDFLAGS= \
-  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) @LIBADD_DL@
- 
-+TESTS = t_link
-+
-+check_PROGRAMS = t_link
-+
-+t_link_SOURCES = t_link.cpp
-+t_link_LDADD = libcppunit.la
diff --git a/community/icon-slicer/PKGBUILD b/community/icon-slicer/PKGBUILD
deleted file mode 100644
index fc29352af..000000000
--- a/community/icon-slicer/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 5685 2009-11-14 10:50:07Z ibiru $
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=icon-slicer
-pkgver=0.3
-pkgrel=3
-pkgdesc="A utility for generating icon themes and libXcursor cursor themes"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://freedesktop.org/wiki/Software/icon-slicer"
-license=("GPL")
-depends=('gtk2' 'popt')
-source=(http://freedesktop.org/software/$pkgname/releases/icon-slicer-$pkgver.tar.gz)
-md5sums=('5c5374d4f265b0abe4daef1d03f87104')
-
-build() {
-  cd $startdir/src/icon-slicer-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/community/naev/naev.desktop b/community/naev/naev.desktop
deleted file mode 100644
index b66c906d0..000000000
--- a/community/naev/naev.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=naev
-Comment=2D action/rpg space game
-Exec=naev
-Icon=naev.png
-Terminal=false
-Type=Application
-Categories=Application;Game;
-GenericName=
diff --git a/community/naev/naev.png b/community/naev/naev.png
deleted file mode 100644
index f683c3dfb..000000000
--- a/community/naev/naev.png
+++ /dev/null