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

20 files changed, 234 insertions, 320 deletions

diff --git a/libre/libclc-git/PKGBUILD b/libre/libclc-git/PKGBUILD
new file mode 100644
index 000000000..432751146
--- /dev/null
+++ b/libre/libclc-git/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+_pkgname=libclc
+pkgname=$_pkgname-git
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgrel=1
+arch=(
+  mips64el
+  x86_64
+  i686
+)
+pkgdesc='Library requirements of the OpenCL C programming language.'
+url=(
+  http://cgit.freedesktop.org/~tstellar/$_pkgname
+  http://libclc.llvm.org/
+)
+license=MIT
+depends=clang
+makedepends=(
+  git
+  python2
+)
+provides=($_pkgname)
+conflicts=$_pkgname
+source=git://people.freedesktop.org/~tstellar/$_pkgname.git
+sha512sums=SKIP
+
+prepare() {
+  sed -i 's|/usr/bin/python|/usr/bin/python2|g;
+         ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py
+}
+
+build() {
+  cd $srcdir/$_pkgname
+  ./configure.py --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$_pkgname
+  make DESTDIR=$pkgdir install
+  install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 2ab0c142e..0a49ce048 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,12 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
-. "${startdir:-.}/helper.sh"
-# provides:
-#  _get_depends
-#  _get_depends_nover (no version requirements)
-
-pkgname=parabolaweb-utils
-pkgver=20130714
+pkgname=(parabolaweb-utils parabolaweb-dev)
+pkgver=20130717
 pkgdesc="Utilities for managing the parabolaweb website application"
 url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
 license=('GPL2')
@@ -14,27 +9,29 @@ license=('GPL2')
 pkgrel=1
 epoch=1
 arch=('any')
-backup=('etc/conf.d/parabolaweb')
 
-if [[ -z $NODEPENDS ]]; then
-	list_depends="${srcdir:-src}/$pkgname-$pkgver/list-depends"
-	if ! [[ -f $list_depends ]]; then
-		NODEPENDS=true makepkg -o
-	fi
-	depends=($(
-		cd "${list_depends%/*}"
-		bash "${list_depends##*/}"
-	))
-fi
-source=("https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2")
+source=(
+  "https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
+  "https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt"
+)
 
-package() {
+build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	install -Dm755 parabolaweb-update    "${pkgdir}/usr/sbin/parabolaweb-update"
-	install -Dm755 parabolaweb-fcgi      "${pkgdir}/usr/sbin/parabolaweb-fcgi"
-	install -Dm755 parabolaweb.rc        "${pkgdir}/etc/rc.d/parabolaweb"
-	install -Dm644 parabolaweb.service   "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
-	install -Dm644 parabolaweb.conf      "${pkgdir}/etc/conf.d/parabolaweb"
+	prod_file="file://${srcdir}/requirements_prod.txt" make
+}
+
+package_parabolaweb-utils() {
+	cd "$srcdir/$pkgbase-$pkgver"
+	depends=($(cat depends.txt))
+	backup=('etc/conf.d/parabolaweb')
+	make install DESTDIR="$pkgdir"
+}
+
+package_parabolaweb-dev() {
+	cd "$srcdir/$pkgbase-$pkgver"
+	pkgdesc="Depends on packages needed to develop parabolaweb"
+	depends=($(sed -r -e 's/\s*#.*//' depends_make.txt))
 }
 
-md5sums=('1c09dd63340cda8bb9ac12273a3b9008')
+md5sums=('a6734335001c7695d5a57fb509f8a745'
+         'c84e52d81683cb3d572571ac19be89ac')
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
deleted file mode 100644
index ce8638e7e..000000000
--- a/libre/parabolaweb-utils/helper.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-_mksource() {
-	pushd "${startdir:-.}" >/dev/null
-	if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then
-		local flags=(-o)
-		(( EUID )) || flags+=(--asroot)
-		_DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}"
-	fi
-	popd >/dev/null
-}
-
-_get_depends() {
-	_mksource 1>&2
-	if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
-		pushd "${srcdir:-src}" >/dev/null
-		< parabolaweb/requirements_prod.txt sed -r \
-			-e 's/.*/\L&/' -e 's/==/>=/' \
-			-e 's/^(python2?-)?/python2-/' \
-			-e 's/python2-django/django/'
-		popd >/dev/null
-	fi
-}
-
-_get_depends_nover() {
-	_get_depends | sed 's/[<>=].*//'
-}
diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download
deleted file mode 100644
index e124295d4..000000000
--- a/libre/parabolaweb-utils/parabolaweb-download
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/parabolaweb
-. /usr/bin/libremessages
-
-dir=$WEBDIR
-repo=$GITURL
-ref=$GITREF
-
-cd_safe() {
-	if ! cd "$1"; then
-		error "$(gettext "Failed to change to directory %s")" "$1"
-		plain "$(gettext "Aborting...")"
-		exit 1
-	fi
-}
-
-download_git() {
-	if [[ ! -d "$dir/.git" ]] ; then
-		msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
-		if ! git clone "$repo" "$dir"; then
-			error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"
-			plain "$(gettext "Aborting...")"
-			exit 1
-		fi
-	else
-		cd_safe "$dir"
-		# Make sure we are fetching the right repo
-		if [[ "$repo" != "$(git config --get remote.origin.url)"  ]] ; then
-			error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
-			plain "$(gettext "Aborting...")"
-			exit 1
-		fi
-		msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
-		if ! git pull origin "$ref"; then
-			# only warn on failure to allow offline builds
-			warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git"
-		fi
-	fi
-}
-
-main() {
-	[[ -d "${dir%/*}" ]] || mkdir -p "${dir%/*}"
-	download_git
-}
-
-main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi
deleted file mode 100644
index e42aec3cd..000000000
--- a/libre/parabolaweb-utils/parabolaweb-fcgi
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-. /etc/conf.d/parabolaweb
-
-[[ -e ${WEBDIR}/manage.py ]]
-
-sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \
-	host=${HOST} \
-	port=${PORT} \
-	--settings=settings \
-	"$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
deleted file mode 100644
index 2da9eea8a..000000000
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-set -e
-
-. /etc/conf.d/parabolaweb
-. /usr/bin/libremessages
-
-find_makefiles() {
-	pushd "$WEBDIR" > /dev/null
-	echo ./sitestatic
-	find . -name static -type d | while read dir; do
-		if [[ -e "$WEBDIR/$dir/Makefile" ]]; then
-			printf '%s\n' "$dir"
-		fi
-	done
-}
-
-clean() {
-	cd "$WEBDIR"
-	msg "Purging old .pyc files..."
-	find . -name '*.pyc' -delete
-	msg "Purging old GNU Make generated files..."
-	for dir in `find_makefiles`; do
-		make -C "$WEBDIR/$dir" clean
-	done
-}
-
-configure() {
-	cd "$WEBDIR"
-	msg "Checking configuration..."
-	if [[ ! -f local_settings.py ]]; then
-		msg2 "Configuration file missing, opening editor..."
-		cp local_settings.py.example local_settings.tmp.$$.py
-		if "$EDITOR" local_settings.tmp.$$.py; then
-			mv local_settings.tmp.$$.py local_settings.py
-		else
-			rm local_settings.tmp.$$.py
-			msg "Failed to configure, exiting"
-			exit 1
-		fi
-		msg2 "Creating database..."
-		./manage.py syncdb
-	else
-		msg2 "Current configuration checks out"
-	fi
-}
-
-update-database() {
-	cd "$WEBDIR"
-	msg "Updating database..."
-	msg2 "Running migrations..."
-	./manage.py migrate
-	if [[ -f devel/management/commands/update_types_permissions.py ]]; then
-		msg2 "Updating permissions..."
-		./manage.py update_types_permissions
-	fi
-	msg2 "Loading fixtures..."
-	./manage.py loaddata */fixtures/*.json
-}
-
-update-filesystem() {
-	msg "Updating filesystem..."
-	for dir in `find_makefiles`; do
-		msg2 "Updating $dir with GNU Make..."
-		make -C "$WEBDIR/$dir"
-	done
-	cd "$WEBDIR"
-	msg2 "Collecting static files..."
-	echo yes | ./manage.py collectstatic -l
-}
-
-main() {
-	if [[ -z "$EDITOR" ]]; then
-		error 'Please set the $EDITOR variable'
-		exit 1
-	fi
-
-	if [[ -d "$WEBDIR" ]]; then
-		clean
-	fi
-	parabolaweb-download
-	configure
-	update-database
-	update-filesystem
-}
-
-main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf
deleted file mode 100644
index 5363479b3..000000000
--- a/libre/parabolaweb-utils/parabolaweb.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-HOST=127.0.0.1
-PORT=8090 # 80 is nginx
-WEBDIR=/srv/http/web
-WEBUSER=nobody
-GITURL=git://parabolagnulinux.org/parabolaweb.git
-GITREF=master
diff --git a/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc
deleted file mode 100644
index 5e310b01d..000000000
--- a/libre/parabolaweb-utils/parabolaweb.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/run/web/parabolaweb.pid
-
-case $1 in
-start)
-	stat_busy "Starting ParabolaWeb"
-	install -dm777 ${PIDFILE%/*}
-	if parabolaweb-fcgi pidfile=${PIDFILE}; then
-		add_daemon parabolaweb
-		stat_done
-		exit 0
-	else
-		stat_fail
-		exit 1
-	fi
-	;;
-
-stop)
-	stat_busy "Stopping ParabolaWeb"
-	if [[ -f ${PIDFILE} ]]; then
-		pid=$(cat ${PIDFILE})
-		kill ${pid}
-		rm_daemon parabolaweb
-		stat_done
-	else
-		stat_fail
-		exit 1
-	fi
-	;;
-
-restart)
-	$0 stop
-	$0 start
-	;;
-
-*)
-	echo "Usage: $0 {start|stop|restart}" >&2
-	exit 1
-
-esac
diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service
deleted file mode 100644
index a59d58512..000000000
--- a/libre/parabolaweb-utils/parabolaweb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Requires=postgresql.service
-After=postgresql.service
-Description=ParabolaWeb
-
-[Service]
-Type=forking
-PIDFile=/run/web/parabolaweb.pid
-ExecStartPre=/usr/bin/install -dm777 /run/web
-ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD
index 4a55012f6..2f2841e11 100644
--- a/pcr/drumkv1/PKGBUILD
+++ b/pcr/drumkv1/PKGBUILD
@@ -1,17 +1,16 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=drumkv1
-pkgver=0.3.3
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="An old-school drum-kit sampler"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
 groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4')
+depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('d7c7270fdd01552b74eead36dd638ea4')
+md5sums=('d94b9c5b21bfdbf0f57cf811273b1fcd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install
index 029294d67..ec1a84bbb 100644
--- a/pcr/drumkv1/drumkv1.install
+++ b/pcr/drumkv1/drumkv1.install
@@ -1,5 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-mime-database usr/share/mime
   update-desktop-database -q
 }
 
diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD
index e2258a88b..33be54edf 100644
--- a/pcr/samplv1/PKGBUILD
+++ b/pcr/samplv1/PKGBUILD
@@ -1,17 +1,16 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=samplv1
-pkgver=0.3.3
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="Polyphonic sampler synthesizer with stereo fx"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
 groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4')
+depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('2540ab3ef3da39bd4da8a1ab8ff9334d')
+md5sums=('32e920ff8457bb94f301a657d55f90a8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/samplv1/samplv1.install b/pcr/samplv1/samplv1.install
index 029294d67..ec1a84bbb 100644
--- a/pcr/samplv1/samplv1.install
+++ b/pcr/samplv1/samplv1.install
@@ -1,5 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-mime-database usr/share/mime
   update-desktop-database -q
 }
 
diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD
index 1a96b84f8..2cce2ef0b 100644
--- a/pcr/synthv1/PKGBUILD
+++ b/pcr/synthv1/PKGBUILD
@@ -1,17 +1,16 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=synthv1
-pkgver=0.3.3
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
 groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4')
+depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('18bd21921ee65b718b2feb1d0ab03ac7')
+md5sums=('63ca2f7961bbc708928d2f792e32d166')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install
index 029294d67..ec1a84bbb 100644
--- a/pcr/synthv1/synthv1.install
+++ b/pcr/synthv1/synthv1.install
@@ -1,5 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-mime-database usr/share/mime
   update-desktop-database -q
 }
 
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index bb79e9cc4..1fb918903 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=2013.07.12
+pkgver=2013.07.17.1
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('5549a8be5054eaf02470da8955b838a0'
+md5sums=('689d7d2507a0a452e53c2c40957220dc'
           'SKIP')
 
 prepare() {
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
index cb84cae3a..e1a8985f3 100644
--- a/~coadde/cross-binutils/PKGBUILD
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -13,8 +13,7 @@
 # | *           | mipsel      | mipsel      | unknown  | elf                              | no        | bin/sys |
 # | *           | mips        | mips        | unknown  | elf                              | no        | bin/sys |
 # | x86_64      | x86_64      | x86_64      | unknown  | linux-gnu|gnu<|elf               | yes       | bin/sys |
-# | i[5-7]86    | i[5-7]86    | i[5-7]86    | pc       | linux-gnu|gnu|elf                | no        | bin/sys |
-# | *           | i486        | i486        | unknown  | elf                              | no        | bin/sys |
+# | i[5-7]86    | i[5-7]86    | i[5-7]86    | pc       | linux-gnu|gnu|                   | no        | bin/sys |
 # | *           | i386        | i386        | unknown  | elf                              | no        | bin/sys |
 # | armv8-a     | aarch64     | aarch64     | unknown  | linux-gnu|elf                    | yes       | -       |
 # | armv8-a     | aarch64_be  | aarch64_be  | unknown  | linux-gnu|elf                    | yes       | -       |
@@ -45,6 +44,17 @@
 # | -           | or32        | or32        | unknown  | linux-gnu<|elf<                  | no        | bin/sys |
 # +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
 
+# For "DOSBox"
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | *           | i386        | i386        | pc       | msdosdjgpp                       | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
+# For "Wine"
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | *           | x86_64      | x86_64      | unknown  | mingw64                          | yes       | bin/sys |
+# | *           | i386        | i386        | unknown  | mingw32                          | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
 # * : Any supported by architecture.
 # - : None.
 # @ : bin/sys (Only sh4 and sh4l support)
@@ -57,47 +67,64 @@ _multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'i
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-_pkgname="binutils"
-
 ### Base FLAGS: ###
-_CARCH="x86_64"
+# For custom name.
+_pkgname="binutils"
+_pkgver="2.23.2"
+_pkgrel="2"
+# For binutils-common ("${_pkgname}-common${_pkgflag}${_verflag}") release.
+_pkgrelb="2"
+# For _target-binutils ("${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}") release.
+_pkgrelc="2"
+# For older version.
+_add_version_name="no"
+# For custom pkg.
+_pkgflag=""
+
+### Architecture FLAGS: ###
+# CARCH flag 
+_CARCH="mips64"
+# CHOST flags
 _host="${_CARCH}"
 _machine="unknown"
 _system="linux-gnu"
-_multilib="no"
+# Multilib flag
+_multilib="yes"
 
 ### Patch FLAGS: ###
 _patch_ath9k_htc_fw="no"
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-_target="${_host}-${_machine}-${_system}"
+# For older version.
+[[ ${_add_version_name} == yes ]] && _verflag="-v${_pkgver}"
 
-# For "_multilib"
-[[ ${_multilib} == "yes" ]] && {
-  _multilib_name="-multilib"
-  _multilib_desc=" for multilib"
-}
-for _arch_multilib in ${_multilib_list[@]}; do
-  [[ ${_CARCH} != ${_arch_multilib} ]] && _multilib="no"
-done
+# For Architecture.
+_target="${_host}-${_machine}-${_system}"
 
 # For "_patch_ath9k_htc_fw"
+[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no"
 [[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
   _ath9k_htc_name="-ath9k-htc"
   _ath9k_htc_desc=" adapted for ath9k-htc firmware"
   _multilib="no"
 }
-[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no"
+
+# For "_multilib"
+[[ ${_CARCH} != $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]] && _multilib="no"
+[[ ${_multilib} == "yes" ]] && {
+  _multilib_name="-multilib"
+  _multilib_desc=" for multilib"
+}
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
 pkgname=(
-  "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}"
-  "${_pkgname}-common"
+  "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}"
+  "${_pkgname}-common${_pkgflag}${_verflag}"
 )
-pkgver=2.23.2
-pkgrel=2
+pkgver=${_pkgver}
+pkgrel=${_pkgrel}
 arch=("${_carch_list[@]}")
 url="http://www.gnu.org/software/${_pkgname}/"
 license=('GPL2')
@@ -142,13 +169,11 @@ build() {
   cd ${srcdir}/${_pkgname}-build
 
   [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}"
-  for _arch_multilib2 in ${_multilib_list[@]}; do
-    if [[ ${_CARCH} == ${_arch_multilib2} ]]; then
-      _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32"
-    else
-      _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib"
-    fi
-  done
+  if [[ ${_CARCH} == $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]]; then
+    _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32"
+  else
+    _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib"
+  fi
 
   if [[ ${_multilib} == "yes" ]]; then
     _MULTILIB='--enable-multilib'
@@ -156,7 +181,7 @@ build() {
     _MULTILIB='--disable-multilib'
   fi
 
-  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]}/${pkgver} \
+  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]/${_verflag}/}/${pkgver} \
     $_TARGET $_LIB_PATH \
     --program-prefix=${_target}- \
     --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \
@@ -171,7 +196,7 @@ build() {
   msg "Check the host environment and makes sure all the necessary tools are available"
   make configure-host
 
-  make tooldir=/opt/${pkgname[0]}/${pkgver}
+  make tooldir=/opt/${pkgname[0]/${_verflag}/}/${pkgver}
 }
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
@@ -187,7 +212,7 @@ check() {
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
 _target-binutils() {
-  pkgrel=$pkgrel
+  pkgrel=${_pkgrelc}
   pkgdesc="A set of programs to assemble and manipulate binary and object files${_multilib_desc}${_ath9k_htc_desc}. (${_target} architecture)"
   depends=('glibc>=2.17' 'zlib' "${_pkgname}-common")
   [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}")
@@ -200,7 +225,7 @@ _target-binutils() {
   install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install"
 
   cd ${srcdir}/${_pkgname}-build
-  make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
+  make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install
 
   # temp #
   msg "!!! Move 'bin', 'include' and 'share' dir to /usr, !!!"
@@ -215,8 +240,8 @@ _target-binutils() {
 
   [[ $CARCH != ${_CARCH} ]] && {
     msg "Move 'lib' files and directories, and remove architecture directories"
-    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/lib/*,lib}
-    rmdir -v ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST/{${_target}/{lib,},}
+    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/lib/*,lib}
+    rmdir -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST/{${_target}/{lib,},}
   }
 
   msg "Change lib-path on ldscripts files"
@@ -224,7 +249,7 @@ _target-binutils() {
           /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g;
-         " ${pkgdir}/opt/${pkgname}/${pkgver}/lib/ldscripts/*
+         " ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib/ldscripts/*
 
   _removebin=(ar as nm objcopy objdump ranlib strip)
   for _rbin in ${_removebin[@]}; do
@@ -235,10 +260,10 @@ _target-binutils() {
   msg "Create links for libraries"
   install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d}
   ln -vs ../lib ${pkgdir}/usr/${_target}/lib
-  echo /opt/${pkgname}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
+  echo /opt/${pkgname/${_verflag}/}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
 
   msg "Install PIC libiberty.a"
-  install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname[0]}/${pkgver}/lib
+  install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib
 
   msg "Remove unnecessaries manuals and create links for manuals"
   _man=$(ls -1A ${pkgdir}/usr/share/man/man1)
@@ -348,34 +373,34 @@ package_or32-unknown-elf-binutils() { _target-binutils; }
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
 package_binutils-common() {
-  pkgrel=$pkgrel
+  pkgrel=${_pkgrelb}
   pkgdesc="A set of programs to assemble and manipulate binary and object files. (headers, docs and locales files only)"
   arch=('any')
   depends=('linktools')
   install="${_pkgname}.install"
 
   cd ${srcdir}/${_pkgname}-build
-  make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
+  make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install
 
   [[ $CARCH != ${_CARCH} ]] && {
     msg "Move 'include' files and directories"
-    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/include,}
+    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/include,}
   }
 
   msg "Add some useful headers"
-  install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname}/${pkgver}/include
+  install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/include
 
   msg "Remove unnecessaries files and directories"
-  rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/{bin,lib}
+  rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{bin,lib}
   [[ $CARCH != ${_CARCH} ]] && {
-    rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST
+    rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST
   }
 
   msg "Rename manuals"
-  _man=$(ls -1A ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1)
+  _man=$(ls -1A ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1)
   for _man_stage1 in ${_man[@]}; do
     _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/}
     _manuals=${_man_stage2/${_target}-/}
-    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}}
+    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}}
   done
 }
diff --git a/~smv/sword-svn/PKGBUILD b/~smv/sword-svn/PKGBUILD
new file mode 100644
index 000000000..b5ddc53f4
--- /dev/null
+++ b/~smv/sword-svn/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@ceata.org>
+pkgname=sword-svn
+pkgver=2904
+pkgrel=1
+pkgdesc="Libraries for Bible programs -- svn version"
+arch=('i686' 'x86_64')
+url="http://www.crosswire.org/sword/"
+license=('GPL')
+depends=('curl' 'clucene' 'swig')
+makedepends=('subversion')
+provides=('sword')
+conflicts=('sword')
+source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/')
+md5sums=('SKIP')
+options=('!makeflags')
+_svnmod=sword
+
+pkgver() {
+  cd $SRCDEST/${_svnmod}
+  svnversion
+}
+
+build() {
+  cd "$srcdir/$_svnmod"  
+  ./autogen.sh
+  CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$_svnmod"
+  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" install_config
+}
diff --git a/~smv/xiphos-svn/PKGBUILD b/~smv/xiphos-svn/PKGBUILD
new file mode 100644
index 000000000..699990fec
--- /dev/null
+++ b/~smv/xiphos-svn/PKGBUILD
@@ -0,0 +1,35 @@
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@ceata.org>
+pkgname=xiphos-svn
+pkgver=4482
+pkgrel=1
+pkgdesc="A Bible study tool -- svn version"
+arch=('i686' 'x86_64')
+url="http://xiphos.org"
+license=('GPL')
+depends=('webkitgtk' 'libgsf' 'gconf' 'sword-svn' 'gtkhtml4')
+makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'subversion')
+provides=('gnomesword' 'xiphos')
+conflicts=('gnomesword' 'xiphos')
+install=xiphos-svn.install
+source=('xiphos::svn://svn.code.sf.net/p/gnomesword/code/trunk')
+md5sums=('SKIP')
+_svnmod=xiphos
+
+pkgver() {
+  cd $SRCDEST/${_svnmod}
+  svnversion
+}
+
+build() {
+  cd "$srcdir/$_svnmod"
+  sed -i 's+/usr/bin/env python+/usr/bin/env python2+' waf
+
+  ./waf --prefix=/usr --gtk=3 configure 
+  ./waf --prefix=/usr build 
+}
+
+package() {
+  cd "$srcdir/$_svnmod"
+  ./waf --destdir=$pkgdir --no-post-install install 
+}
diff --git a/~smv/xiphos-svn/xiphos-svn.install b/~smv/xiphos-svn/xiphos-svn.install
new file mode 100644
index 000000000..0cbac7465
--- /dev/null
+++ b/~smv/xiphos-svn/xiphos-svn.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}