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

5 files changed, 9 insertions, 38 deletions

diff --git a/config b/config
index 42842de..6c652a7 100644
--- a/config
+++ b/config
@@ -8,9 +8,9 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib')
 # Official Parabola repos
 OURREPOS=('libre' 'libre-testing')
 # User repos
-USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde')
+USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde')
 # Community project repos
-PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence')
+PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism')
 # Remote repos
 RMTREPOS=('connos' 'connos-extra')
 PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]})
@@ -45,7 +45,7 @@ OURARCHES=(mips64el)
 ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
-PKGEXT=".pkg.tar.?z"
+PKGEXT=".pkg.tar.xz"
 SRCEXT=".src.tar.gz"
 
 MAKEPKGCONF="~/.makepkg.conf"
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 5e228fc..5644268 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -60,32 +60,3 @@ for repo in ${PKGREPOS[@]}; do
     popd >/dev/null
 
 done # end repos
-
-# Cleanup old source packages
-cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort"
-cat "${WORKDIR}/available-src-pkgs" | sort -u > "${WORKDIR}/available-src-pkgs.sort"
-old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-src-pkgs.sort"))
-
-if [ ${#old_pkgs[@]} -ge 1 ]; then
-	msg "Removing old source packages..."
-	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
-	for old_pkg in ${old_pkgs[@]}; do
-		msg2 "${old_pkg}"
-		if ! ${SOURCE_CLEANUP_DRYRUN}; then
-			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
-			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
-		fi
-	done
-fi
-
-old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
-if [ ${#old_pkgs[@]} -ge 1 ]; then
-	msg "Removing old source packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
-		msg2 "${old_pkg}"
-		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
-	done
-fi
-
-script_unlock
-
diff --git a/db-check-nonfree b/db-check-nonfree
index ab6491d..ecad3b9 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -33,7 +33,7 @@ for repo in ${ARCHREPOS[@]}; do
 	    fi
 	done
 	if [ ${#cleanpkgs[@]} -ge 1 ]; then
-        msg2 "Unfree: ${cleanpkgs[@]}"
+        msg2 "Nonfree: ${cleanpkgs[@]}"
 	    arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]}
 	fi
     done
diff --git a/yf/PKGBUILD b/yf/PKGBUILD
index cc6f07b..e737482 100644
--- a/yf/PKGBUILD
+++ b/yf/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=your-freedom
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
 pkgrel=1
-pkgdesc="This package conflicts with every unfree package known to date."
+pkgdesc="This package conflicts with every nonfree package known to date."
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL')
diff --git a/yf/your-freedom.install b/yf/your-freedom.install
index 49ae045..731a575 100644
--- a/yf/your-freedom.install
+++ b/yf/your-freedom.install
@@ -3,18 +3,18 @@ pre_install() {
   cat <<EOM
   == IMPORTANT NOTICE ==
 
-  This package will help you identify unfree packages that are installed
+  This package will help you identify nonfree packages that are installed
   on your system at the time of it's installation, as well as protecting
   you from (accidentally) installing them.
 
-  Also, if any other unfree package is identified, later updates will ask
+  Also, if any other nonfree package is identified, later updates will ask
   you for it's removal.
 
-  Have in mind that, if you want to retain certain unfree packages
+  Have in mind that, if you want to retain certain nonfree packages
   installed on your system, you'll have to remove your-freedom :)
 
   If you find out any of the following:
-  * Cascade package removal due to unfree dependencies,
+  * Cascade package removal due to nonfree dependencies,
   * Your-freedom conflicting with a *-libre package,
   * Etc.