Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre

2 files changed, 9 insertions, 64 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 7f902061d..fd91bd1c2 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,11 +9,11 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabola.nu/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20141128
-_libretools_commit=8b17eaf422ae5bea4c1f2264576a3280d50b66dd
-_devtools_commit=34ac2931234b898d587bffe76ba061082b6c673c
-md5sums=('b21b285b451d8d9a9055401a12f47ba6'
-         'fa2d1e26e5ebf39d37430f903ca0e4d6')
+pkgver=20150104
+_libretools_commit=a420c807d1b7ac3b5c5adbbb18ed99343ca5e6b6
+_devtools_commit=5f4e575914fd597d31e5b9edd203eb6a8aa1306a
+md5sums=('4ae548d11a768eceada91e2e4df96112'
+         '4fbe3aa6e7f87fa720547a8832d3419c')
 
 _packages_url=https://projects.parabola.nu/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -82,6 +82,7 @@ package_libretools() {
   depends=(
     "librelib=$pkgver"
     "xbs=$pkgver" # `createworkdir`, `librestage`
+    'pacman>=4.2.0' 'pacman<4.3.0'
     arch-install-scripts # `mkarchroot` uses `pacstrap`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 35edf68c7..06be95f24 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,72 +1,16 @@
 #!/bin/sh
 
-_edit_code="          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
-_edit_cmnt='#%s # commented out by the libretools post_install script'
-
-_add_cmnt='# The following line is added by the libretools post_install script'
-_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')'
-
-# These lines were installed by previous versions of this script
-_old_code=(
-	'[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
-	'[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
-	'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")'
-)
-
-# has_line $line
-has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
-# add_line $line
-add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
-# del_line $line
-del_line() {
-	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
-	if [[ "${#lineno[@]}" -gt 0 ]]; then
-		sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
-	fi
-}
-# rep_line $orig $replacement_bre
-rep_line() {
-	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
-	if [[ "${#lineno[@]}" == 1 ]]; then
-		sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
-	fi
-}
-
 # arg 1:  the new package version
 post_install() {
-	if grep -q 'librefetch' etc/makepkg.conf; then
-		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
-		local line del=false
-		for line in "${_old_code[@]}"; do
-			if has_line "$line"; then
-				pre_remove
-				post_install
-				return $?
-			fi
-		done
-	else
-		libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
-		rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
-		add_line "$_add_cmnt"
-		add_line "$_add_code"
-	fi
+	librefetch-install install etc/makepkg.conf
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-	post_install
+	librefetch-install install etc/makepkg.conf
 }
 
 pre_remove() {
-	libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-
-	rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
-	del_line "$_add_cmnt"
-	del_line "$_add_code"
-
-	local line
-	for line in "${_old_code[@]}"; do
-		del_line "$line"
-	done
+	librefetch-install remove etc/makepkg.conf
 }