Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

22 files changed, 156 insertions, 548 deletions

diff --git a/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch
new file mode 120000
index 000000000..ea3e7b047
--- /dev/null
+++ b/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch
@@ -0,0 +1 @@
+../../libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch b/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch
new file mode 120000
index 000000000..9efbca3c0
--- /dev/null
+++ b/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch
@@ -0,0 +1 @@
+../../libre/pacman/0002-Check-empty-subdirectory-ownership.patch
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/PKGBUILD b/java/pacman-makepkg-git/PKGBUILD
new file mode 100644
index 000000000..0c72f03e9
--- /dev/null
+++ b/java/pacman-makepkg-git/PKGBUILD
@@ -0,0 +1,116 @@
+# vim: set ts=2 sw=2 et:
+# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Dave Reisner <dave@archlinux.org>
+
+_pkgname=pacman
+pkgname=$_pkgname-makepkg-git
+_relver=4.0.3
+_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
+pkgver=${_relver}.git
+
+provides=($_pkgname=$pkgver)
+replaces=($_pkgname)
+conflicts=($_pkgname)
+
+pkgrel=1
+
+pkgdesc="A library-based package manager with dependency support (with makepkg from git)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.archlinux.org/pacman/"
+license=('GPL')
+#groups=('base')
+depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
+         'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$_relver.tar.gz{,.sig}
+        https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz
+        0001-Add-conflict-for-replacing-owned-empty-directory.patch
+        0002-Check-empty-subdirectory-ownership.patch
+        pacman.conf
+        pacman.conf.x86_64
+        pacman.conf.mips64el
+        makepkg.conf)
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+         '1a70392526c8768470da678b31905a6e'
+         '4013517cf9016c920b525611bd63d6dc'
+         '1a9b79788640907a2b34e8671cacc94a'
+         'a9ddd43891bed364e1e97d27b2887bf1'
+         '080d9f76f56e135cc62205874636aa0f'
+         'ce9943fc8086d491890565e91ea1a0d8'
+         'eb8dba9bd0b315230fbf0e5dc0a7335b'
+         'debc512689a1aa8c124fe0ccf27f5758')
+
+build() {
+  cd $srcdir/$_pkgname-$_relver
+
+  patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+  patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --enable-doc
+  make
+
+  cd $srcdir/$_pkgname-$_gitver
+
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --enable-doc
+  make
+}
+
+check() {
+  make -C "$_pkgname-$_relver" check
+  make -C "$_pkgname-$_gitver" check
+}
+
+package() {
+  cd $srcdir/$_pkgname-$_relver
+  make DESTDIR=$pkgdir install
+  install $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case "$CARCH" in
+    i686)
+      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+      mycarch="i686"
+      mychost="i686-pc-linux-gnu"
+      myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
+      ;;
+    x86_64)
+      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+      mycarch="x86_64"
+      mychost="x86_64-unknown-linux-gnu"
+      myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
+      ;;
+    mips64el)
+      install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
+      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"
+      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+      ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # set things correctly in the default conf file
+  sed -i $pkgdir/etc/makepkg.conf \
+    -e "s|@CARCH[@]|$mycarch|g" \
+    -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@LDFLAGS[@]|$myldflags|g" \
+    -e "s|@CARCHFLAGS[@]|$myflags|g"
+
+  # install completion files
+  install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
+  for f in makepkg pacman-key; do
+    ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
+  done
+
+  install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
+}
diff --git a/java/pacman-makepkg-git/PKGBUILD.orig b/java/pacman-makepkg-git/PKGBUILD.orig
new file mode 120000
index 000000000..448b40973
--- /dev/null
+++ b/java/pacman-makepkg-git/PKGBUILD.orig
@@ -0,0 +1 @@
+../../libre/pacman/PKGBUILD
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/makepkg.conf b/java/pacman-makepkg-git/makepkg.conf
new file mode 120000
index 000000000..2d1108635
--- /dev/null
+++ b/java/pacman-makepkg-git/makepkg.conf
@@ -0,0 +1 @@
+../../libre/pacman/makepkg.conf
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf b/java/pacman-makepkg-git/pacman.conf
new file mode 120000
index 000000000..c75a6eed0
--- /dev/null
+++ b/java/pacman-makepkg-git/pacman.conf
@@ -0,0 +1 @@
+../../libre/pacman/pacman.conf
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf.mips64el b/java/pacman-makepkg-git/pacman.conf.mips64el
new file mode 120000
index 000000000..01fb857d8
--- /dev/null
+++ b/java/pacman-makepkg-git/pacman.conf.mips64el
@@ -0,0 +1 @@
+../../libre/pacman/pacman.conf.mips64el
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf.x86_64 b/java/pacman-makepkg-git/pacman.conf.x86_64
new file mode 120000
index 000000000..1be1966fd
--- /dev/null
+++ b/java/pacman-makepkg-git/pacman.conf.x86_64
@@ -0,0 +1 @@
+../../libre/pacman/pacman.conf.x86_64
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.install b/java/pacman-makepkg-git/pacman.install
new file mode 120000
index 000000000..0b1fee98c
--- /dev/null
+++ b/java/pacman-makepkg-git/pacman.install
@@ -0,0 +1 @@
+../../libre/pacman/pacman.install
\ No newline at end of file
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index c1beccdf9..e0b70ba1a 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=parabolaweb-utils
 pkgver=`_get_pkgver`
-pkgrel=4
+pkgrel=5
 pkgdesc="Utils for the Parabola website"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
diff --git a/~lukeshu/pacman-lukeshu/makepkg.conf b/~lukeshu/pacman-lukeshu/makepkg.conf
deleted file mode 100644
index 08a44167b..000000000
--- a/~lukeshu/pacman-lukeshu/makepkg.conf
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="@CARCH@"
-CHOST="@CHOST@"
-
-#-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@"
-CXXFLAGS="@CARCHFLAGS@"
-LDFLAGS="@LDFLAGS@"
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
-#  A negated environment option will do the opposite of the comments below.
-#
-#-- fakeroot: Allow building packages as a non-root user
-#-- distcc:   Use the Distributed C/C++/ObjC compiler
-#-- color:    Colorize output messages
-#-- ccache:   Use ccache to cache compilation
-#-- check:    Run the check() function if present in the PKGBUILD
-#-- sign:     Generate PGP signature file
-#
-BUILDENV=(fakeroot !distcc color !ccache check !sign)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-#
-#-- Specify a directory for package building.
-#BUILDDIR=/tmp/makepkg
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#   These are default values for the options=() settings
-#########################################################################
-#
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
-#  A negated option will do the opposite of the comments below.
-#
-#-- strip:     Strip symbols from binaries/libraries
-#-- docs:      Save doc directories specified by DOC_DIRS
-#-- libtool:   Leave libtool (.la) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:     Remove files specified by PURGE_TARGETS
-#-- upx:       Compress binary executable files using UPX
-#
-OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
-#-- Specify a key to use for package signing
-#GPGKEY=""
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-# WARNING: Do NOT modify these variables unless you know what you are
-#          doing.
-#
-PKGEXT='.pkg.tar.xz'
-SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:
diff --git a/~lukeshu/pacman-lukeshu/pacman.conf b/~lukeshu/pacman-lukeshu/pacman.conf
deleted file mode 100644
index 115217b59..000000000
--- a/~lukeshu/pacman-lukeshu/pacman.conf
+++ /dev/null
@@ -1,106 +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
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#UseDelta
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# 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]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-# Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
diff --git a/~lukeshu/pacman-lukeshu/pacman.conf.mips64el b/~lukeshu/pacman-lukeshu/pacman.conf.mips64el
deleted file mode 100644
index f286c3290..000000000
--- a/~lukeshu/pacman-lukeshu/pacman.conf.mips64el
+++ /dev/null
@@ -1,106 +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
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = mips64el
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#UseDelta
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# 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]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-# Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
diff --git a/~lukeshu/pacman-lukeshu/pacman.conf.x86_64 b/~lukeshu/pacman-lukeshu/pacman.conf.x86_64
deleted file mode 100644
index 4c67b089f..000000000
--- a/~lukeshu/pacman-lukeshu/pacman.conf.x86_64
+++ /dev/null
@@ -1,117 +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
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#UseDelta
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# 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]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#SigLevel = PackageRequired
-#Include = /etc/pacman.d/mirrorlist
-
-# Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
diff --git a/~lukeshu/pacman-lukeshu/pacman.install b/~lukeshu/pacman-lukeshu/pacman.install
deleted file mode 100644
index 5dc55c0c2..000000000
--- a/~lukeshu/pacman-lukeshu/pacman.install
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    # one time stuff for md5sum issue with older pacman versions
-    if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
-        _resetbackups
-    fi
-    if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
-        _warnupgrade
-    fi
-    if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
-        _check_pubring
-    fi
-}
-
-post_install() {
-    _check_pubring
-}
-
-_check_pubring() {
-    echo " >>> Run  \`pacman-key --init; pacman-key --populate archlinux\`"
-    echo " >>> And  \`pacman-key --populate parabola\`"
-    echo " >>> to import the data required by pacman for package verification."
-    echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
-}
-
-_warnupgrade() {
-    echo ">>> The pacman database format has changed as of pacman 3.5.0."
-    echo ">>> You will need to run \`pacman-db-upgrade\` as root."
-    echo ">>>"
-}
-
-_resetbackups() {
-    echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
-    echo ">>> you are able to remove all NoUpgrade lines of already protected"
-    echo ">>> files from pacman.conf."
-    echo ">>>"
-
-    # path variables
-    pacconf="/etc/pacman.conf"
-    dbpath="/var/lib/pacman/local"
-
-    # get a list of NoUpgrade files from the user's pacman.conf
-    echo ">>> Retrieving pacman.conf NoUpgrade list..."
-    config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
-    # add the standard list of files, even if they are already above
-    config="$config \
-    etc/passwd etc/group etc/shadow etc/sudoers \
-    etc/fstab etc/raidtab etc/ld.so.conf \
-    etc/rc.conf etc/rc.local \
-    etc/modprobe.conf etc/modules.conf \
-    etc/lilo.conf boot/grub/menu.lst"
-
-    # blank md5sum for use in sed expression
-    zeroes='00000000000000000000000000000000'
-
-    for file in $config; do
-        echo ">>> -> finding owner of /$file..."
-        line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
-        # if file is owned by a package, go find its incorrectly stored sum
-        if [ ! -z "$line" ]; then
-            # get the name and version of the package owning file
-            name=$(echo $line | awk '{print $5}')
-            version=$(echo $line | awk '{print $6}')
-            # set the path to the backup array holding the md5sum
-            path="$dbpath/$name-$version/files"
-            # run a sed on the path to reset the line containing $file
-            # NOTE: literal tab characters in sed expression after $file
-            echo ">>> -> resetting sum of /$file..."
-            sed -i "s#$file [0-9a-fA-F]*#$file  $zeroes#" $path
-        else
-            echo ">>> -> $file is unowned."
-        fi
-    done
-}
diff --git a/~lukeshu/pacman-lukeshu/PKGBUILD b/~lukeshu/pacman-vcsget/PKGBUILD
index caf53e96c..c23eabd3a 100644
--- a/~lukeshu/pacman-lukeshu/PKGBUILD
+++ b/~lukeshu/pacman-vcsget/PKGBUILD
@@ -3,20 +3,24 @@
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dave@archlinux.org>
 
-_pkgname=parabola-pacman
-pkgname=pacman-lukeshu
-_pkgver=f8fc16f
-pkgver=4.0.3
-pkgrel=3.2
+_pkgname=pacman
+_basepath=parabola-pacman
+pkgname=$_pkgname-vcsget
+_relver=4.0.3
+#_gitver=f8fc16f
+_gitver=6082ed9d
+pkgver=${_relver}.git
+provides=($_pkgname=$pkgver)
+replaces=($_pkgname pacman-lukeshu)
+conflicts=($_pkgname pacman-lukeshu)
 
-provides=(pacman=$pkgver)
-conflicts=(pacman)
+pkgrel=1
 
-pkgdesc="A library-based package manager with dependency support, with vcsget"
+pkgdesc="A library-based package manager with dependency support (with vcsget)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
-groups=('base')
+#groups=('base')
 depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
 makedepends=('asciidoc')
@@ -24,16 +28,21 @@ optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
-source=(${_pkgname}-${_pkgver}.tar.gz::https://gitorious.org/parabola/pacman/archive-tarball/${_pkgver}
+source=(${_basepath}-${_gitver}.tar.gz::http://gitorious.org/parabola/pacman/archive-tarball/${_gitver}
         pacman.conf
         pacman.conf.x86_64
-        pacman.conf.mips64el)
+        pacman.conf.mips64el
+        makepkg.conf)
+md5sums=('8c328c8f148f283656309fd4e2103178'
+         '080d9f76f56e135cc62205874636aa0f'
+         'ce9943fc8086d491890565e91ea1a0d8'
+         'eb8dba9bd0b315230fbf0e5dc0a7335b'
+         'debc512689a1aa8c124fe0ccf27f5758')
 
 build() {
-  cd $srcdir/$_pkgname
+  cd $srcdir/$_basepath
 
   ./autogen.sh
-
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc
   make
@@ -41,11 +50,11 @@ build() {
 }
 
 check() {
-  make -C "$srcdir/$_pkgname" check
+  make -C "$srcdir/$_basepath" check
 }
 
 package() {
-  cd $srcdir/$_pkgname
+  cd $srcdir/$_basepath
   make DESTDIR=$pkgdir install
 
   # install Arch specific stuff
@@ -73,7 +82,7 @@ package() {
       myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
       ;;
   esac
-  #install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
   # set things correctly in the default conf file
   sed -i $pkgdir/etc/makepkg.conf \
     -e "s|@CARCH[@]|$mycarch|g" \
@@ -89,8 +98,3 @@ package() {
 
   install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
 }
-
-md5sums=('49cec981a8cdc8e8b61843a8747e4f1d'
-         '080d9f76f56e135cc62205874636aa0f'
-         'ce9943fc8086d491890565e91ea1a0d8'
-         'eb8dba9bd0b315230fbf0e5dc0a7335b')
diff --git a/~lukeshu/pacman-vcsget/PKGBUILD.orig b/~lukeshu/pacman-vcsget/PKGBUILD.orig
new file mode 120000
index 000000000..448b40973
--- /dev/null
+++ b/~lukeshu/pacman-vcsget/PKGBUILD.orig
@@ -0,0 +1 @@
+../../libre/pacman/PKGBUILD
\ No newline at end of file
diff --git a/~lukeshu/pacman-vcsget/makepkg.conf b/~lukeshu/pacman-vcsget/makepkg.conf
new file mode 120000
index 000000000..2d1108635
--- /dev/null
+++ b/~lukeshu/pacman-vcsget/makepkg.conf
@@ -0,0 +1 @@
+../../libre/pacman/makepkg.conf
\ No newline at end of file
diff --git a/~lukeshu/pacman-vcsget/pacman.conf b/~lukeshu/pacman-vcsget/pacman.conf
new file mode 120000
index 000000000..c75a6eed0
--- /dev/null
+++ b/~lukeshu/pacman-vcsget/pacman.conf
@@ -0,0 +1 @@
+../../libre/pacman/pacman.conf
\ No newline at end of file
diff --git a/~lukeshu/pacman-vcsget/pacman.conf.mips64el b/~lukeshu/pacman-vcsget/pacman.conf.mips64el
new file mode 120000
index 000000000..01fb857d8
--- /dev/null
+++ b/~lukeshu/pacman-vcsget/pacman.conf.mips64el
@@ -0,0 +1 @@
+../../libre/pacman/pacman.conf.mips64el
\ No newline at end of file
diff --git a/~lukeshu/pacman-vcsget/pacman.conf.x86_64 b/~lukeshu/pacman-vcsget/pacman.conf.x86_64
new file mode 120000
index 000000000..1be1966fd
--- /dev/null
+++ b/~lukeshu/pacman-vcsget/pacman.conf.x86_64
@@ -0,0 +1 @@
+../../libre/pacman/pacman.conf.x86_64
\ No newline at end of file
diff --git a/~lukeshu/pacman-vcsget/pacman.install b/~lukeshu/pacman-vcsget/pacman.install
new file mode 120000
index 000000000..0b1fee98c
--- /dev/null
+++ b/~lukeshu/pacman-vcsget/pacman.install
@@ -0,0 +1 @@
+../../libre/pacman/pacman.install
\ No newline at end of file