Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

43 files changed, 20 insertions, 14 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem-parabola/PKGBUILD
index 74e507fce..b4dba77c0 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem-parabola/PKGBUILD
@@ -3,7 +3,8 @@
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-pkgname=filesystem
+_pkgname=filesystem
+pkgname=filesystem-parabola
 pkgver=2014.07
 pkgrel=1
 pkgdesc='Base filesystem (Parabola rebranded)'
@@ -14,6 +15,9 @@ groups=('base')
 install='filesystem.install'
 makedepends=('asciidoc')
 depends=('iana-etc')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname=$pkgver)
 backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
diff --git a/libre/filesystem/crypttab b/libre/filesystem-parabola/crypttab
index 195945a74..195945a74 100644
--- a/libre/filesystem/crypttab
+++ b/libre/filesystem-parabola/crypttab
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem-parabola/filesystem.install
index 065a79d6c..065a79d6c 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem-parabola/filesystem.install
diff --git a/libre/filesystem/fstab b/libre/filesystem-parabola/fstab
index b6716c14a..b6716c14a 100644
--- a/libre/filesystem/fstab
+++ b/libre/filesystem-parabola/fstab
diff --git a/libre/filesystem/group b/libre/filesystem-parabola/group
index ebfb87169..ebfb87169 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem-parabola/group
diff --git a/libre/filesystem/gshadow b/libre/filesystem-parabola/gshadow
index 1fcb075bc..1fcb075bc 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem-parabola/gshadow
diff --git a/libre/filesystem/host.conf b/libre/filesystem-parabola/host.conf
index cf52fe561..cf52fe561 100644
--- a/libre/filesystem/host.conf
+++ b/libre/filesystem-parabola/host.conf
diff --git a/libre/filesystem/hosts b/libre/filesystem-parabola/hosts
index 1747f9196..1747f9196 100644
--- a/libre/filesystem/hosts
+++ b/libre/filesystem-parabola/hosts
diff --git a/libre/filesystem/issue b/libre/filesystem-parabola/issue
index b001c55dd..b001c55dd 100644
--- a/libre/filesystem/issue
+++ b/libre/filesystem-parabola/issue
diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem-parabola/ld.so.conf
index dfac45683..dfac45683 100644
--- a/libre/filesystem/ld.so.conf
+++ b/libre/filesystem-parabola/ld.so.conf
diff --git a/libre/filesystem/locale.sh b/libre/filesystem-parabola/locale.sh
index 3cfc89c1b..3cfc89c1b 100644
--- a/libre/filesystem/locale.sh
+++ b/libre/filesystem-parabola/locale.sh
diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first
index 947379411..947379411 100644
--- a/libre/filesystem/modprobe.d.usb-load-ehci-first
+++ b/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first
diff --git a/libre/filesystem/motd b/libre/filesystem-parabola/motd
index e69de29bb..e69de29bb 100644
--- a/libre/filesystem/motd
+++ b/libre/filesystem-parabola/motd
diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem-parabola/nsswitch.conf
index 4a4f5770d..4a4f5770d 100644
--- a/libre/filesystem/nsswitch.conf
+++ b/libre/filesystem-parabola/nsswitch.conf
diff --git a/libre/filesystem/os-release b/libre/filesystem-parabola/os-release
index fe5f20b4f..fe5f20b4f 100644
--- a/libre/filesystem/os-release
+++ b/libre/filesystem-parabola/os-release
diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem-parabola/parabola.7.txt
index 60e1121e0..60e1121e0 100644
--- a/libre/filesystem/parabola.7.txt
+++ b/libre/filesystem-parabola/parabola.7.txt
diff --git a/libre/filesystem/passwd b/libre/filesystem-parabola/passwd
index b3e79eb9d..b3e79eb9d 100644
--- a/libre/filesystem/passwd
+++ b/libre/filesystem-parabola/passwd
diff --git a/libre/filesystem/profile b/libre/filesystem-parabola/profile
index 59d0abc83..59d0abc83 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem-parabola/profile
diff --git a/libre/filesystem/resolv.conf b/libre/filesystem-parabola/resolv.conf
index cecafba03..cecafba03 100644
--- a/libre/filesystem/resolv.conf
+++ b/libre/filesystem-parabola/resolv.conf
diff --git a/libre/filesystem/securetty b/libre/filesystem-parabola/securetty
index 5a2235ce7..5a2235ce7 100644
--- a/libre/filesystem/securetty
+++ b/libre/filesystem-parabola/securetty
diff --git a/libre/filesystem/shadow b/libre/filesystem-parabola/shadow
index 4c6e3d18f..4c6e3d18f 100644
--- a/libre/filesystem/shadow
+++ b/libre/filesystem-parabola/shadow
diff --git a/libre/filesystem/shells b/libre/filesystem-parabola/shells
index 18c1aeffa..18c1aeffa 100644
--- a/libre/filesystem/shells
+++ b/libre/filesystem-parabola/shells
diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
index e043633af..e043633af 100644
--- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+++ b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
diff --git a/libre/grub/09_parabola b/libre/grub-parabola/09_parabola
index 90a9062a3..90a9062a3 100644
--- a/libre/grub/09_parabola
+++ b/libre/grub-parabola/09_parabola
diff --git a/libre/grub/60_memtest86+ b/libre/grub-parabola/60_memtest86+
index 086f0cc84..086f0cc84 100644
--- a/libre/grub/60_memtest86+
+++ b/libre/grub-parabola/60_memtest86+
diff --git a/libre/grub/PKGBUILD b/libre/grub-parabola/PKGBUILD
index 213e7dee0..a4c4bfb9f 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub-parabola/PKGBUILD
@@ -21,7 +21,8 @@ _UNIFONT_VER="6.3.20131217"
 [[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64"
 [[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
 
-pkgname="grub"
+_pkgname="grub"
+pkgname="grub-parabola"
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.02.beta2
 pkgrel=4
@@ -30,12 +31,12 @@ url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
 license=('GPL3')
 backup=('etc/default/grub' 'etc/grub.d/40_custom')
-install="${pkgname}.install"
+install="${_pkgname}.install"
 options=('!makeflags')
 
-conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
-replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
-provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
+conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub')
+replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub')
+provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" "grub=$pkgver")
 
 makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
              'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch
index 18d9d520c..18d9d520c 100644
--- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
+++ b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch
diff --git a/libre/grub/grub-10_linux-rebrand-free-distros.patch b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch
index 7edb22a1f..7edb22a1f 100644
--- a/libre/grub/grub-10_linux-rebrand-free-distros.patch
+++ b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch
diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub-parabola/grub-2.00-fix-docs.patch
index 0aa481154..0aa481154 100644
--- a/libre/grub/grub-2.00-fix-docs.patch
+++ b/libre/grub-parabola/grub-2.00-fix-docs.patch
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch
index 1af848fa3..1af848fa3 100644
--- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch
+++ b/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch
diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch
index 9a2eb3ff7..9a2eb3ff7 100644
--- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
+++ b/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch
diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch
index c113a81d5..c113a81d5 100644
--- a/libre/grub/grub-add-GRUB_COLOR_variables.patch
+++ b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch
diff --git a/libre/grub/grub.default b/libre/grub-parabola/grub.default
index 56585a47d..56585a47d 100644
--- a/libre/grub/grub.default
+++ b/libre/grub-parabola/grub.default
diff --git a/libre/grub/grub.install b/libre/grub-parabola/grub.install
index 9188b357a..9188b357a 100644
--- a/libre/grub/grub.install
+++ b/libre/grub-parabola/grub.install
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch
index 6e3a524f0..6e3a524f0 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch
diff --git a/libre/pacman/PKGBUILD b/libre/pacman-parabola/PKGBUILD
index 774d45321..06f0737c8 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman-parabola/PKGBUILD
@@ -3,7 +3,8 @@
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 
-pkgname=pacman
+_pkgname=pacman
+pkgname=pacman-parabola
 pkgver=4.1.2
 pkgrel=6.1
 pkgdesc="A library-based package manager with dependency support"
@@ -15,12 +16,12 @@ depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'cacert-dot-org')
 checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
+provides=('pacman-contrib' "$_pkgname=$pkgver")
+conflicts=('pacman-contrib' "$_pkgname")
+replaces=('pacman-contrib' "$_pkgname")
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.i686
         pacman.conf.x86_64
         pacman.conf.mips64el
@@ -39,7 +40,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
          '093f0779ac55ae781ba028ad74b95f84')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc \
@@ -50,11 +51,11 @@ build() {
 }
 
 check() {
-  make -C "$pkgname-$pkgver" check
+  make -C "$_pkgname-$pkgver" check
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C contrib install
diff --git a/libre/pacman/gpg.conf b/libre/pacman-parabola/gpg.conf
index 7fc6fc661..7fc6fc661 100644
--- a/libre/pacman/gpg.conf
+++ b/libre/pacman-parabola/gpg.conf
diff --git a/libre/pacman/makepkg.conf b/libre/pacman-parabola/makepkg.conf
index 758d7d029..758d7d029 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman-parabola/makepkg.conf
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman-parabola/pacman.conf.i686
index 84cec630c..84cec630c 100644
--- a/libre/pacman/pacman.conf.i686
+++ b/libre/pacman-parabola/pacman.conf.i686
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman-parabola/pacman.conf.mips64el
index 604040640..604040640 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman-parabola/pacman.conf.mips64el
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman-parabola/pacman.conf.x86_64
index 03a8cf3a6..03a8cf3a6 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman-parabola/pacman.conf.x86_64
diff --git a/libre/pacman/refresh-pacman-keys b/libre/pacman-parabola/refresh-pacman-keys
index e96dc34e5..e96dc34e5 100644
--- a/libre/pacman/refresh-pacman-keys
+++ b/libre/pacman-parabola/refresh-pacman-keys
diff --git a/libre/pacman/sks-keyservers.netCA.pem b/libre/pacman-parabola/sks-keyservers.netCA.pem
index 24a2ad2e8..24a2ad2e8 100644
--- a/libre/pacman/sks-keyservers.netCA.pem
+++ b/libre/pacman-parabola/sks-keyservers.netCA.pem