From 259debb981a976da83ba1c9b93fb6e9ec1a68fe8 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Mon, 26 Dec 2011 18:57:25 +0100
Subject: Remove PKGBUILD-less directories and fix unmerged PKGBUILDs.

---
 libre/pacman/PKGBUILD | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'libre/pacman')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index dd0ff5fda..e6f53188a 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -3,11 +3,7 @@
 
 pkgname=pacman
 pkgver=3.5.4
-<<<<<<< HEAD
 pkgrel=4.2
-=======
-pkgrel=4
->>>>>>> libre/master
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -25,15 +21,12 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf.mips64el
         makepkg.conf
         0001-makepkg-fix-removing-symbolic-link.patch)
-<<<<<<< HEAD
-=======
 md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
          'ba85525fe868f030bef209b0487dd5a5'
          '7aaccf24479f396d4a5987c8ccd2f3a2'
          '150a2854816cd67b1608e00f99701c1c'
          'be10d3d2e533515a0470237761415568'
          '749a4ddc6d8418d8d031f1c9b4e09d6f')
->>>>>>> libre/master
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -74,11 +67,7 @@ package() {
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
       myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-<<<<<<< HEAD
       myldflags="-Wl,--as-needed"
-=======
-      myldflags=""
->>>>>>> libre/master
       ;;
   esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
@@ -97,9 +86,3 @@ package() {
 }
 
 # vim: set ts=2 sw=2 et:
-md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
-         'ba85525fe868f030bef209b0487dd5a5'
-         '7aaccf24479f396d4a5987c8ccd2f3a2'
-         '150a2854816cd67b1608e00f99701c1c'
-         'be10d3d2e533515a0470237761415568'
-         '749a4ddc6d8418d8d031f1c9b4e09d6f')
-- 
cgit v1.2.3-54-g00ecf