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

4 files changed, 2 insertions, 158 deletions

diff --git a/libre/devtools-legacy/PKGBUILD b/libre/devtools-legacy/PKGBUILD
deleted file mode 100644
index 2ff4cbc42..000000000
--- a/libre/devtools-legacy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=devtools-legacy
-_pkgname=devtools
-pkgver=20130408
-pkgrel=1
-pkgdesc='Tools for Arch Linux package maintainers (legacy)'
-arch=('any')
-license=('GPL')
-url='http://projects.archlinux.org/devtools.git/'
-depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
-conflicts=$_pkgname
-source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('12b42b429744af6517ae789f728e9f63'
-         'SKIP')
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	make PREFIX=/usr
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	make PREFIX=/usr DESTDIR=${pkgdir} install
-}
-
diff --git a/libre/libretools-legacy/PKGBUILD b/libre/libretools-legacy/PKGBUILD
deleted file mode 100644
index 59e383449..000000000
--- a/libre/libretools-legacy/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: Joshua Haase <hahj87@gmail.com
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-
-pkgbase=libretools
-pkgname=(libretools-legacy libretools-legacy-pr libretools-legacy-mips64el)
-pkgver=20120924
-pkgrel=1
-pkgdesc="Programs for Parabola development (legacy)"
-arch=('any')
-url="http://parabolagnulinux.org"
-license=('GPL3+')
-depends=(openssh rsync git wget devtools-legacy)
-install=libretools-legacy.install
-source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-v$pkgver.tar)
-md5sums=(dfb8cb24d3deda29178d0fdc20b0e4bd)
-conflicts=libretools
-
-package_libretools-legacy() {
-  backup=(etc/libretools.conf)
-
-  cd $srcdir/$pkgbase-v$pkgver
-
-  # fixing librebasebuilder librechroot libremakepkg !!!NEED MORE PATCH for makechrootpkg -d and mkarchroot -n!!!
-  # more info in:
-  # https://projects.archlinux.org/devtools.git/commit/?id=abba9f07a6d703cd97fc2d2bbd397072d5bf796d
-  # https://projects.archlinux.org/devtools.git/commit/?id=453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1
-  #sed -i 's|makechrootpkg -d -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|makechrootpkg -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|;
-  #        s|mkarchroot -n|mkarchroot|;
-  #        s|mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "/clean"|;
-  #        s|mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "bash"|;
-  #        s|mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" pacman -Syu --noconfirm|;
-  #       ' librebasebuilder librechroot libremakepkg
-
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 libretools.conf ${pkgdir}/etc/
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 abslibre-commit        ${pkgdir}/usr/bin
-  install -m755 add-mips64el           ${pkgdir}/usr/bin
-  install -m755 aur                    ${pkgdir}/usr/bin
-  install -m755 buildenv               ${pkgdir}/usr/bin
-  install -m755 chcleanup              ${pkgdir}/usr/bin
-  install -m755 createworkdir          ${pkgdir}/usr/bin
-  install -m755 diff-unfree            ${pkgdir}/usr/bin
-  install -m755 fullpkg                ${pkgdir}/usr/bin
-  install -m755 fullpkg-build          ${pkgdir}/usr/bin
-  install -m755 fullpkg-find           ${pkgdir}/usr/bin
-  install -m755 is_built               ${pkgdir}/usr/bin
-  install -m755 is_unfree              ${pkgdir}/usr/bin
-  install -m755 lb                     ${pkgdir}/usr/bin
-  install -m755 libreaddiff            ${pkgdir}/usr/bin
-  install -m755 librebasebuilder       ${pkgdir}/usr/bin
-  install -m755 librechroot            ${pkgdir}/usr/bin
-  install -m755 librecommit            ${pkgdir}/usr/bin
-  install -m755 librediff              ${pkgdir}/usr/bin
-  install -m755 libremakepkg           ${pkgdir}/usr/bin
-  install -m755 libremessages          ${pkgdir}/usr/bin
-  install -m755 libremkchroot          ${pkgdir}/usr/bin
-  install -m755 librerelease           ${pkgdir}/usr/bin
-  install -m755 librerepkg             ${pkgdir}/usr/bin
-  install -m755 librestage             ${pkgdir}/usr/bin
-  install -m755 pkgbuild-check-nonfree ${pkgdir}/usr/bin
-  install -m755 toru                   ${pkgdir}/usr/bin
-  install -m755 toru-path              ${pkgdir}/usr/bin
-  install -m755 toru-utils             ${pkgdir}/usr/bin
-  install -m755 toru-where             ${pkgdir}/usr/bin
-  install -m755 updateabslibre         ${pkgdir}/usr/bin
-  install -m755 update-cleansystem     ${pkgdir}/usr/bin
-  
-  install -d ${pkgdir}/usr/share/pacman
-  install -m755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman
-}
-
-package_libretools-legacy-pr() {
-  backup=('etc/libretools.d/prtools.conf')
-
-  cd $srcdir/$pkgbase-v$pkgver
-
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 prtools/prtools.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 prtools/prfullpkg ${pkgdir}/usr/bin
-  install -m755 prtools/prmipsrelease ${pkgdir}/usr/bin
-  install -m755 prtools/prtoru ${pkgdir}/usr/bin
-}
-
-package_libretools-legacy-mips64el() {
-  backup=('etc/libretools.d/mips64el.conf')
-
-  cd $srcdir/$pkgbase-v$pkgver
-
-  install -d ${pkgdir}/etc/libretools.d
-  install -m755 mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 mips64el/mips-add ${pkgdir}/usr/bin
-  install -m755 mips64el/mipsrelease ${pkgdir}/usr/bin
-}
diff --git a/libre/libretools-legacy/libretools-legacy.install b/libre/libretools-legacy/libretools-legacy.install
deleted file mode 100644
index 3ede1f904..000000000
--- a/libre/libretools-legacy/libretools-legacy.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  cat <<EOF
-Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide
-and follow instructions there before using libretools.
-
-If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg
-and install libretools-\$arch if avaliable
-
-EOF
-  update-cleansystem
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  cat <<EOF
-Check your /etc/libretools.conf, it has changed substantially.
-
-If using fullpkg, you should install libretools-\$arch if avaliable
-
-EOF
-  update-cleansystem
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 747641dcc..f2d7f83b0 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -14,7 +14,7 @@ _adddat=20130320
 _addrev=40
 _bldep=8
 _pyver=3.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
   i686
@@ -118,7 +118,7 @@ package_blender-addon-mitsuba() {
   cd $srcdir/$_addname
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
-  b=$pkgdir/usr/share/licenses/$_pkgname
+  b=$pkgdir/usr/share/licenses/$pkgname
   c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
   install -d $a && cp -a $_pkgname $a