Remove PKGBUILD-less directories and fix unmerged PKGBUILDs.

7 files changed, 0 insertions, 163 deletions

diff --git a/core/pacman/pacman.conf.mips64el b/core/pacman/pacman.conf.mips64el
deleted file mode 100644
index 09a5c8d5a..000000000
--- a/core/pacman/pacman.conf.mips64el
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#CleanMethod = KeepInstalled
-Architecture = mips64el
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options (all disabled by default)
-#UseSyslog
-#ShowSize
-#UseDelta
-#TotalDownload
-#CheckSpace
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[libre-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#Server = file:///home/custompkgs
-
diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/extra/abiword/abiword-2.8.6-no-undefined.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/extra/abiword/abiword.install b/extra/abiword/abiword.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/abiword/abiword.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index e45da8749..05507bbaa 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -83,11 +83,8 @@ build() {
   #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
   #patch -Np1 -i "$srcdir/firefox-version.patch"
 
-<<<<<<< HEAD
   [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig
 
-=======
->>>>>>> libre/master
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
       browser/base/Makefile.in
diff --git a/libre/kernel26-libre/Kbuild b/libre/kernel26-libre/Kbuild
deleted file mode 100644
index 8a9d7dceb..000000000
--- a/libre/kernel26-libre/Kbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fail on warnings - also for files referenced in subdirs
-# -Werror can be disabled for specific files using:
-# CFLAGS_<file.o> := -Wno-error
-subdir-ccflags-y := -Wno-error
-
-# platform specific definitions
-include arch/mips/Kbuild.platforms
-obj-y := $(platform-y)
-
-# make clean traverses $(obj-) without having included .config, so
-# everything ends up here
-obj- := $(platform-)
-
-# mips object files
-# The object files are linked as core-y files would be linked
-
-obj-y += kernel/
-obj-y += mm/
-obj-y += math-emu/
diff --git a/libre/kernel26-libre/Kbuild.platforms b/libre/kernel26-libre/Kbuild.platforms
deleted file mode 100644
index 90a226888..000000000
--- a/libre/kernel26-libre/Kbuild.platforms
+++ /dev/null
@@ -1,6 +0,0 @@
-# All platforms listed in alphabetic order
-
-platforms += loongson
-
-# include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
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')