Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

2 files changed, 38 insertions, 10 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index a522dd39c..fd3ea4063 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,21 +1,23 @@
 # Maintainer: Joshua Haase <hahj87@gmail.com
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 
-pkgname=libretools
-pkgver=$(date +%Y%m%d)
+pkgbase=libretools
+pkgname=(libretools libretools-pr libretools-mips64el)
+pkgver=$(date -u +%Y%m%d)
 pkgrel=1
 pkgdesc="Scripts for easing Parabola's tasks"
 arch=('any')
-url="https://parabolagnulinux.org"
+url="http://parabolagnulinux.org"
 license=('GPL3+')
-depends=(devtools git wget)
+depends=(openssh rsync git wget)
+optdepends=(devtools)
 makedepends=(git)
 backup=(etc/libretools.conf)
 install=libretools.install
 source=()
 md5sums=()
 
-_gitroot="https://projects.parabolagnulinux.org/libretools.git"
+_gitroot="http://projects.parabolagnulinux.org/libretools.git"
 _gitname="libretools"
 
 build() {
@@ -33,7 +35,7 @@ build() {
  ## Build
 }
 
-package() {
+package_libretools() {
 
   install -d ${pkgdir}/etc
   install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
@@ -43,11 +45,13 @@ package() {
 
   install -d ${pkgdir}/usr/bin
   install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin
   install -m755 ${_gitname}/aur ${pkgdir}/usr/bin
   install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin
   install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin
   install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/lb ${pkgdir}/usr/bin
   install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/
@@ -55,6 +59,7 @@ package() {
   install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
   install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/
+  install -m755 ${_gitname}/mipsrelease ${pkgdir}/usr/bin
   install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
@@ -62,4 +67,24 @@ package() {
   install -d ${pkgdir}/usr/sbin
   install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
   
-} 
+  install -d ${pkgdir}/usr/share/pacman
+  install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
+}
+
+package_libretools-pr() {
+  install -d ${pkgdir}/etc/libretools.d
+  install -m644 ${_gitname}/prtools.conf ${pkgdir}/etc/libretools.d
+
+  install -d ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/prfullpkg ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/prmipsrelease ${pkgdir}/usr/bin
+}
+
+package_libretools-mips64el() {
+  install -d ${pkgdir}/etc/libretools.d
+  install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
+
+  install -d ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/mips64el/mips-add ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/mips64el/mipsrelease ${pkgdir}/usr/bin
+}
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index f8f447e2f..6f8c09d5c 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,8 +1,12 @@
 # arg 1:  the new package version
 post_install() {
   cat <<EOF
-Please check http://wiki.parabolagnulinux.org/hacking:packagers
+Please check http://wiki.parabolagnulinux.org/Package_maintainer_guide
 and follow instructions there before using libretools.
+
+If you plan using fullpkg you should read http://wiki.parabolagnulinux.org/fullpkg
+and install libretools-$arch if avaliable
+
 EOF
 }
 
@@ -12,8 +16,7 @@ post_upgrade() {
   cat <<EOF
 Check your /etc/libretools.conf
 
-Your REPOS array if using fullpkg should be:
-'core' 'extra' 'community' 'libre'
+If using fullpkg, you should install libretools-$arch if avaliable
 
 EOF
 }