summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-07-15 07:49:21 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-07-15 07:49:21 -0300
commit97ecf9349c86a16eb67488e38be71e7acab651e2 (patch)
tree79bce6484dae93c616a7514c1dede98e59f9031b /libre
parent594346c73fb352d9e7d9f11decace09f8aca447f (diff)
parent33a03f53dfc38d5d2e68dc429573098afb3ba456 (diff)
downloadabslibre-97ecf9349c86a16eb67488e38be71e7acab651e2.tar.gz
abslibre-97ecf9349c86a16eb67488e38be71e7acab651e2.tar.bz2
abslibre-97ecf9349c86a16eb67488e38be71e7acab651e2.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/libretools/PKGBUILD8
-rw-r--r--libre/parabolaweb-utils/PKGBUILD55
2 files changed, 20 insertions, 43 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 562692e48..231268930 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20130706
-_libretools_commit=de47a853ef515db2b9a775c235239efacd16041b
+pkgver=20130714
+_libretools_commit=bb42528084058af8dc42c315d5f013af05741bb1
_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
_packages_url=https://projects.parabolagnulinux.org/packages
@@ -54,7 +54,7 @@ package_libretools() {
depends=(
"librelib=$pkgver"
arch-install-scripts # `archroot` uses `pacstrap`
- git # `createworkdir` (also mips-add in -mips64el)
+ git # `createworkdir` and `libregit` (also mips-add in -mips64el)
openssh # `librerelease`
rsync # `librerelease` and `makechrootpkg.sh`
subversion # `diff-unfree`
@@ -74,5 +74,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('f30fbc4011acdd9065310f8295267bdd'
+md5sums=('a8c4c3552bde5185dec637471b890256'
'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 4220394dc..2ab0c142e 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -6,47 +6,30 @@
# _get_depends_nover (no version requirements)
pkgname=parabolaweb-utils
-pkgver=20120425.0657
-pkgdesc="Utils for the Parabola website"
-url="https://projects.parabolagnulinux.org/parabolaweb.git/"
+pkgver=20130714
+pkgdesc="Utilities for managing the parabolaweb website application"
+url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
license=('GPL2')
pkgrel=1
epoch=1
arch=('any')
-depends=(
- 'python2' # duh
- 'python2-flup' # for fcgi
- 'postgresql' # for database
- 'git' # used in parabolaweb-download
- 'libretools' # used in parabolaweb-{download,update} (libremessages)
- `_get_depends`)
-conflicts=('django>=1.5') # hold it at 1.4
-makedepends=(makepkg-git)
backup=('etc/conf.d/parabolaweb')
-source=(git://parabolagnulinux.org/parabolaweb.git
- parabolaweb-download
- parabolaweb-update
- parabolaweb-fcgi
- parabolaweb.rc
- parabolaweb.service
- parabolaweb.conf)
-
-pkgver() {
- cd "$srcdir/parabolaweb"
- # get the date requirements_prod.txt was last modified
- gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
- date -u +%Y%m%d.%H%M -d "$gitdate"
-}
-
-build() {
- :
-}
+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")
package() {
- cd "${srcdir}"
- install -Dm755 parabolaweb-download "${pkgdir}/usr/sbin/parabolaweb-download"
+ 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"
@@ -54,10 +37,4 @@ package() {
install -Dm644 parabolaweb.conf "${pkgdir}/etc/conf.d/parabolaweb"
}
-md5sums=('SKIP'
- 'f162c2ce49b4cafe0a14bd4767dfea04'
- '7c212024c134fdd0d0318b52a5448ddb'
- 'd5294495f42df29d29519ebd0a8f6093'
- 'cc15e153f99fba82e7bb032896f655c2'
- 'a468016a7155b5da46521dcfc6428384'
- 'ffd37a19b1a72fbac2c58504aa17b355')
+md5sums=('1c09dd63340cda8bb9ac12273a3b9008')