summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-09-15 14:07:54 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-09-15 14:07:54 -0300
commit700e1a87e62fb2c3f9a2dc3720c4e16a46fc9447 (patch)
tree50edd95a4cd0531f5aa01edba21884b6cb4b1d09
parentbcf0a4b9d88797f3e4c556a8af95e098b88712e6 (diff)
parentb785facb316445443ae061e7ae9fec65054cbc17 (diff)
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/libretools/PKGBUILD27
-rw-r--r--libre/libretools/libretools.install2
2 files changed, 19 insertions, 10 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index ea427333b..953cd18b1 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,14 +4,14 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgbase=libretools
-pkgname=(libretools libretools-mips64el librelib)
+pkgname=(libretools libretools-mips64el librelib libregit)
pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20130812
-_libretools_commit=42f606f4fe3c2df5db876098cda9eba9d0e7f1c7
-_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
+pkgver=20130914
+_libretools_commit=ab8dc8d4204d198f01e1fc7f59498a2794df829f
+_devtools_commit=6fbdc4eb481302541cf8fa282fb3453e4c5d0d16
_packages_url=https://projects.parabolagnulinux.org/packages
source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -32,7 +32,7 @@ build() {
check() {
cd "$srcdir/$pkgbase-$_libretools_commit"
- make check TESTENVFLAGS='--no-network --no-sudo'
+ SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
}
package_librelib() {
@@ -45,6 +45,13 @@ package_librelib() {
make install-librelib DESTDIR="$pkgdir"
}
+package_libregit() {
+ depends=("librelib=$pkgver" git)
+
+ cd "$srcdir/$pkgbase-$_libretools_commit"
+ make install-libregit DESTDIR="$pkgdir"
+}
+
package_libretools() {
backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
install=libretools.install
@@ -54,7 +61,7 @@ package_libretools() {
depends=(
"librelib=$pkgver"
arch-install-scripts # `archroot` uses `pacstrap`
- git # `createworkdir` and `libregit` (also mips-add in -mips64el)
+ git # `createworkdir`
openssh # `librerelease`
rsync # `librerelease` and `makechrootpkg.sh`
subversion # `diff-unfree`
@@ -68,11 +75,13 @@ package_libretools() {
package_libretools-mips64el() {
pkgdesc="Scripts for Parabola development (for mips64el architecture)"
- depends=("$pkgbase=$pkgver")
+ depends=("$pkgbase=$pkgver"
+ git # mips-add
+ )
cd "$srcdir/$pkgbase-$_libretools_commit"
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('12d470d89f05730b0481030526361ddb'
- 'b28b1492fda205be7c577fc03cbc3399')
+md5sums=('91b1d56254bd61f1266ee2cb20e671a3'
+ 'f44ca55997ab9598b7f1a8aeb2379b52')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index ff6a238fe..d46990da8 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -21,7 +21,7 @@ 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'
+ sed -i '/libre::/d' etc/makepkg.conf
else
libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
fi