fix: follow upstream

CMakeLists.txt

@@ -21,8 +21,7 @@ install_build_script(bioarchlinux-i686-build)
 install_build_script(bioarchlinux-x86_64-build)
 install_build_script(bioarchlinux-testing-x86_64-build)
 install_build_script(bioarchlinux-staging-x86_64-build)
-install_build_script(bioarchlinux-kde-unstable-x86_64-build)
+install_build_script(bioarchlinux-multilib-build)
-install_build_script(multilib-bioarchlinux-build)
 
 foreach(CARCH arm armv6h armv7h aarch64)
   install_build_script("bioarchlinux-${CARCH}-build")
@@ -30,7 +29,7 @@ foreach(CARCH arm armv6h armv7h aarch64)
     "pacman-bioarchlinux-${CARCH}.conf" @ONLY)
   install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/pacman-bioarchlinux-${CARCH}.conf"
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/")
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/pacman.conf.d/")
 endforeach()
 
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmds/"
@@ -39,6 +38,5 @@ install(FILES
   "pacman-bioarchlinux.conf"
   "pacman-bioarchlinux-testing.conf"
   "pacman-bioarchlinux-staging.conf"
-  "pacman-bioarchlinux-kde-unstable.conf"
+  "pacman-bioarchlinux-multilib.conf"
-  "pacman-multilib-bioarchlinux.conf"
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/pacman.conf.d/")
-  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/")

pacman-bioarchlinux-arm.conf.in

@@ -33,7 +33,7 @@ Architecture = @CARCH@
 #Color
 #TotalDownload
 # We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring

pacman-bioarchlinux-kde-unstable.conf

@@ -1,98 +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/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-# We cannot check disk space from within a chroot environment
-#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    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# 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 bioarchlinux`.
-
-#
-# 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.
-#
-
-[bioarchlinux]
-Server = http://repo.bioarchlinux.org/$arch
-
-# 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.
-
-[kde-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[testing]
-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]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

pacman-bioarchlinux-multilib.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 # We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -73,19 +73,16 @@ Server = http://repo.bioarchlinux.org/$arch
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[testing]
+#[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+#[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

pacman-bioarchlinux-staging.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 # We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -73,25 +73,22 @@ Server = http://repo.bioarchlinux.org/$arch
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[staging]
+[core-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
+[extra-staging]
+Include = /etc/pacman.d/mirrorlist
+
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-[community-staging]
+[multilib-staging]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[multilib]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

pacman-bioarchlinux-testing.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 # We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -73,19 +73,22 @@ Server = http://repo.bioarchlinux.org/$arch
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[testing]
+[core-testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
+[extra-testing]
+Include = /etc/pacman.d/mirrorlist
+
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-[community-testing]
+[multilib-testing]
 Include = /etc/pacman.d/mirrorlist
 
-[community]
+[multilib]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

pacman-bioarchlinux.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 # We cannot check disk space from within a chroot environment
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -73,20 +73,26 @@ Server = http://repo.bioarchlinux.org/$arch
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[testing]
+#[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
+#[extra-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-#[community-testing]
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+#[multilib]
-Include = /etc/pacman.d/mirrorlist
+#Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.