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

4 files changed, 96 insertions, 18 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 569706f80..7daf4c071 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20131112
-_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
-_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
+pkgver=20140106.1
+_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651
+_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -64,8 +64,8 @@ package_libretools() {
 
   depends=(
     "librelib=$pkgver"
+    "gitget=$pkgver" # `createworkdir`
     arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
@@ -87,5 +87,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
-         '656008e8e35e6adba527b7bfc367b9f7')
+md5sums=('246274cf5974d6adee536edbdb2447c0'
+         'ec69dffa68829f063224de19bbd55fa9')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index d46990da8..a451add36 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,14 +1,49 @@
 #!/bin/sh
 
-_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+_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='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
+
+# This line was installed by previous versions of this script
+_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$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 'libre::' etc/makepkg.conf; then
+	if grep -q 'librefetch' etc/makepkg.conf; then
 		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+		if has_line "$_old_code"; then
+			libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf"
+			del_line "$_old_code"
+			post_install
+		else
+			return 0
+		fi
 	else
-		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
-		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
+		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
 }
 
@@ -19,10 +54,11 @@ post_upgrade() {
 }
 
 pre_remove() {
-	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
-		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-		sed -i '/libre::/d' etc/makepkg.conf
-	else
-		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
-	fi
+	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"
+
+	del_line "$_old_code"
 }
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 7ca493453..7beeb5918 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2014.01.03
+pkgver=2014.01.05.6
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,5 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('676179e05b8c83d63e5aa21a92faaa32'
+md5sums=('f3c0d49ace716b01079f96abd962c763'
          'SKIP')
diff --git a/~lukeshu/dunst-lukeshu-git/PKGBUILD b/~lukeshu/dunst-lukeshu-git/PKGBUILD
new file mode 100644
index 000000000..31037e113
--- /dev/null
+++ b/~lukeshu/dunst-lukeshu-git/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $
+# Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: feuri
+
+_pkgname=dunst
+_pkgver=1.0.0
+conflicts=("$_pkgname")
+
+pkgname=$_pkgname-lukeshu-git
+pkgver=20130918
+_gitver='commit=67b259b98ac1895bf47c877f216307a174deeb3d'
+pkgrel=1
+pkgdesc="A dmenu-ish notification system"
+arch=('i686' 'x86_64')
+url="http://www.knopwob.org/dunst/"
+license=(BSD3)
+depends=(libxinerama libxss libxdg-basedir pango)
+optdepends=("libnotify: notify-send"
+            "dbus: start dunst on demand")
+makedepends=(libnotify dbus perl)
+provides=(notification-daemon "$_pkgname=$_pkgver")
+
+source=("https://repo.parabolagnulinux.org/other/~lukeshu/$pkgname/$pkgname-$pkgver.tar.gz")
+mksource=("$pkgname-$pkgver::git://github.com/LukeShu/dunst.git#${_gitver}")
+mkmd5sums=('SKIP')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="${pkgdir}" PREFIX=/usr install
+	install -Dm644 LICENSE  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm755 dunstify "${pkgdir}/usr/bin/dunstify"
+	cp docs/* "${pkgdir}/usr/share/dunst/"
+}
+
+md5sums=('720b643b2c7a710fabcc7dc1953318bf')