Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

10 files changed, 337 insertions, 33 deletions

diff --git a/pcr/arduino/PKGBUILD b/pcr/arduino/PKGBUILD
new file mode 100644
index 000000000..fd4a0eb20
--- /dev/null
+++ b/pcr/arduino/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor: Niels Martignène <niels.martignene@gmail.com>
+# Contributor: PyroPeter <googlemail.com@abi1789>
+# Contributor: darkapex <me@jailuthra.in>
+# Contributor: tty0 <vt.tty0[d0t]gmail.com>
+
+pkgname=arduino
+epoch=1
+pkgver=1.6.0
+pkgrel=1
+pkgdesc="Arduino prototyping platform SDK"
+arch=('i686' 'x86_64')
+url="http://arduino.cc/en/Main/Software"
+options=(!strip staticlibs)
+license=('GPL' 'LGPL')
+depends=('gtk2' 'libusb-compat' 'java-runtime' 'desktop-file-utils')
+makedepends=('icoutils')
+conflicts=('arduino-toolchain')
+install="arduino.install"
+source=('arduino.desktop'
+        'arduino.xml')
+
+source_i686+=("http://arduino.cc/download_handler.php?f=/arduino-${pkgver}-linux32.tar.xz")
+source_x86_64+=("http://arduino.cc/download_handler.php?f=/arduino-${pkgver}-linux64.tar.xz")
+
+build() {
+  cd "arduino-${pkgver}"
+
+  icotool -x -o .. lib/arduino_icon.ico
+}
+
+package() {
+  cd "arduino-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/bin"
+  mkdir -p "${pkgdir}/usr/share/"{doc,applications,mime/packages}
+
+  # copy the whole SDK to /usr/share/arduino/
+  cp -a . "${pkgdir}/usr/share/arduino"
+
+  # at least support the FHS a little bit
+  ln -s /usr/share/arduino/arduino "${pkgdir}/usr/bin/arduino"
+  ln -s /usr/share/arduino/reference "${pkgdir}/usr/share/doc/arduino"
+
+  # fix avrdude's broken dependency on libtinfo.so.5
+  ln -s /usr/lib/libncurses.so.5 "${pkgdir}/usr/share/arduino/hardware/tools/avr/lib/libtinfo.so.5"
+
+  # desktop icon
+  for size in 16 32 48 256; do
+    install -Dm644 ../arduino_icon_*_${size}x${size}x32.png \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/arduino.png"
+  done
+
+  # desktop and mimetype files
+  install -m644 "${srcdir}/arduino.desktop" "${pkgdir}/usr/share/applications/"
+  install -m644 "${srcdir}/arduino.xml" "${pkgdir}/usr/share/mime/packages/"
+}
diff --git a/pcr/arduino/arduino-fix-arguments.patch b/pcr/arduino/arduino-fix-arguments.patch
new file mode 100644
index 000000000..1cafeedde
--- /dev/null
+++ b/pcr/arduino/arduino-fix-arguments.patch
@@ -0,0 +1,25 @@
+--- a/arduino	2013-04-11 13:31:37.000000000 +0200
++++ b/arduino	2014-01-12 15:18:46.159694131 +0100
+@@ -2,6 +2,16 @@
+  
+ APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
+ 
++args=()
++for arg in "$@"
++do
++    if [[ "$arg" == -* ]]; then
++        args+=("$arg")
++    else
++        args+=("$(realpath "$arg")")
++    fi
++done
++
+ cd "$APPDIR"
+  
+ for LIB in \
+@@ -19,4 +29,4 @@
+ 
+ export PATH="${APPDIR}/java/bin:${PATH}"
+ 
+-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base "$@"
++java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base "${args[@]}"
diff --git a/pcr/arduino/arduino.desktop b/pcr/arduino/arduino.desktop
new file mode 100644
index 000000000..180dea615
--- /dev/null
+++ b/pcr/arduino/arduino.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Arduino
+GenericName=Arduino IDE
+Comment=The open-source Arduino environment
+TryExec=arduino
+Exec=arduino %U
+Icon=arduino
+Type=Application
+Terminal=false
+MimeType=text/x-arduino;
+Categories=Development;
diff --git a/pcr/arduino/arduino.install b/pcr/arduino/arduino.install
new file mode 100644
index 000000000..b4c07efb7
--- /dev/null
+++ b/pcr/arduino/arduino.install
@@ -0,0 +1,15 @@
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database /usr/share/mime >/dev/null
+}
+
+post_install() {
+  post_upgrade
+
+  echo "Don't forget to add yourself to the uucp and lock groups: gpasswd -a <user> uucp && gpasswd -a <user> lock (execute as root)"
+}
+
+post_remove() {
+  post_upgrade
+}
diff --git a/pcr/arduino/arduino.xml b/pcr/arduino/arduino.xml
new file mode 100644
index 000000000..166b5a245
--- /dev/null
+++ b/pcr/arduino/arduino.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Copied from the Ubuntu package -->
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="text/x-arduino">
+        <comment>Arduino source code</comment>
+        <comment xml:lang="ara">شفرة مصدر Arduino</comment>
+        <comment xml:lang="be@latin">Kryničny kod Arduino</comment>
+        <comment xml:lang="bg">Изходен код на Arduino</comment>
+        <comment xml:lang="ca">codi font en Arduino</comment>
+        <comment xml:lang="da">Arduinokildekode</comment>
+        <comment xml:lang="de">Arduino-Quelltext</comment>
+        <comment xml:lang="el">πηγαίος κώδικας Arduino</comment>
+        <comment xml:lang="en_GB">Arduino source code</comment>
+        <comment xml:lang="eo">Arduino-fontkodo</comment>
+        <comment xml:lang="es">código fuente en Arduino</comment>
+        <comment xml:lang="eu">Arduino iturburu-kodea</comment>
+        <comment xml:lang="fi">Arduino-lähdekoodi</comment>
+        <comment xml:lang="fr">code source Arduino</comment>
+        <comment xml:lang="ga">cód foinseach Arduino</comment>
+        <comment xml:lang="hu">Arduino-forráskód</comment>
+        <comment xml:lang="id">Kode program Arduino</comment>
+        <comment xml:lang="it">Codice sorgente Arduino</comment>
+        <comment xml:lang="ja">Arduino ソースコード</comment>
+        <comment xml:lang="lt">Arduino pradinis kodas</comment>
+        <comment xml:lang="lv">Arduino pirmkods</comment>
+        <comment xml:lang="ms">Kod sumber Arduino</comment>
+        <comment xml:lang="nb">Arduino-kildekode</comment>
+        <comment xml:lang="nl">Arduino-broncode</comment>
+        <comment xml:lang="nn">Arduino-kjeldekode</comment>
+        <comment xml:lang="pl">Kod źródłowy Arduino</comment>
+        <comment xml:lang="pt">código fonte Arduino</comment>
+        <comment xml:lang="pt_BR">Código fonte Arduino</comment>
+        <comment xml:lang="ru">исходный код Arduino</comment>
+        <comment xml:lang="sq">Kod burues Arduino</comment>
+        <comment xml:lang="sv">Arduino-källkod</comment>
+        <comment xml:lang="uk">Вихідний код на мові Arduino</comment>
+        <comment xml:lang="vi">Mã nguồn Arduino</comment>
+        <comment xml:lang="zh_CN">Arduino 源代码</comment>
+        <comment xml:lang="zh_TW">Arduino 源代碼</comment>
+        <sub-class-of type="text/x-c++src"/>
+        <glob pattern="*.ino"/>
+        <glob pattern="*.pde"/>
+    </mime-type>
+</mime-info>
diff --git a/pcr/armory/PKGBUILD b/pcr/armory/PKGBUILD
index adb60a766..0b0482797 100644
--- a/pcr/armory/PKGBUILD
+++ b/pcr/armory/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>
-# Contributor: portals <portals at riseup.net>
-#Base on work of: 2bluesc <2bluesc at gmail.com> and mazzolino <maze+aur at strahlungsfrei.de>
-# Contributor: Pieter Kokx <pieter@kokx.nl>
+# Maintainer  : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor : 2bluesc <2bluesc at gmail.com>
+# Contributor : mazzolino <maze+aur at strahlungsfrei.de>
+# Contributor : Pieter Kokx <pieter@kokx.nl>
 
 pkgname=armory
 _pkgname=BitcoinArmory
diff --git a/pcr/django-tagging/CHANGELOG.txt b/pcr/django-tagging/CHANGELOG.txt
new file mode 100644
index 000000000..56060df92
--- /dev/null
+++ b/pcr/django-tagging/CHANGELOG.txt
@@ -0,0 +1,112 @@
+========================
+Django Tagging Changelog
+========================
+
+Version 0.3.1, 22nd January 2010:
+---------------------------------
+
+* Fixed Django 1.2 support (did not add anything new)
+* Fixed #95 — tagging.register won't stomp on model attributes
+
+Version 0.3.0, 22nd August 2009:
+--------------------------------
+
+* Fixes for Django 1.0 compatibility.
+
+* Added a ``tagging.generic`` module for working with list of objects
+  which have generic relations, containing a ``fetch_content_objects``
+  function for retrieving content objects for a list of ``TaggedItem``s
+  using ``number_of_content_types + 1`` queries rather than the
+  ``number_of_tagged_items * 2`` queries you'd get by iterating over the
+  list and accessing each item's ``object`` attribute.
+
+* Added a ``usage`` method to ``ModelTagManager``.
+
+* ``TaggedItemManager``'s methods now accept a ``QuerySet`` or a
+  ``Model`` class. If a ``QuerySet`` is given, it will be used as the
+  basis for the ``QuerySet``s the methods return, so can be used to
+  restrict results to a subset of a model's instances. The 
+  `tagged_object_list`` generic view and ModelTaggedItemManager``
+  manager have been updated accordingly.
+
+* Removed ``tagging\tests\runtests.py``, as tests can be run with
+  ``django-admin.py test --settings=tagging.tests.settings``.
+
+* A ``tagging.TagDescriptor`` is now added to models when registered.
+  This returns a ``tagging.managers.ModelTagManager`` when accessed on a
+  model class, and provide access to and control over tags when used on
+  an instance.
+
+* Added ``tagging.register`` to register models with the tagging app.
+  Initially, a ``tagging.managers.ModelTaggedItemManager`` is added for
+  convenient access to tagged items.
+
+* Moved ``TagManager`` and ``TaggedItemManager`` to ``models.py`` - gets
+  rid of some import related silliness, as ``TagManager`` needs access
+  to ``TaggedItem``.
+
+Version 0.2.1, 16th Jan 2008:
+-----------------------------
+
+* Fixed a bug with space-delimited tag input handling - duplicates
+  weren't being removed and the list of tag names wasn't sorted.
+
+Version 0.2, 12th Jan 2008:
+---------------------------
+
+Packaged from revision 122 in Subversion; download at
+http://django-tagging.googlecode.com/files/tagging-0.2.zip
+
+* Added a ``tag_cloud_for_model`` template tag.
+
+* Added a ``MAX_TAG_LENGTH`` setting.
+
+* Multi-word tags are here - simple space-delimited input still works.
+  Double quotes and/or commas are used to delineate multi- word tags.
+  As far as valid tag contents - anything goes, at least initially.
+
+* BACKWARDS-INCOMPATIBLE CHANGE - ``django.utils.get_tag_name_list`` and
+  related regular expressions have been removed in favour of a new tag
+  input parsing function, ``django.utils.parse_tag_input``.
+
+* BACKWARDS-INCOMPATIBLE CHANGE - ``Tag`` and ``TaggedItem`` no longer
+  declare an explicit ``db_table``. If you can't rename your tables,
+  you'll have to put these back in manually.
+
+* Fixed a bug in calculation of logarithmic tag clouds - ``font_size``
+  attributes were not being set in some cases when the least used tag in
+  the cloud had been used more than once.
+
+* For consistency of return type, ``TaggedItemManager.get_by_model`` now
+  returns an empty ``QuerySet`` instead of an empty ``list`` if
+  non-existent tags were given.
+
+* Fixed a bug caused by ``cloud_for_model`` not passing its
+  ``distribution`` argument to ``calculate_cloud``.
+
+* Added ``TaggedItemManager.get_union_by_model`` for looking up items
+  tagged with any one of a list of tags.
+
+* Added ``TagManager.add_tag`` for adding a single extra tag to an
+  object.
+
+* Tag names can now be forced to lowercase before they are saved to the
+  database by adding the appropriate ``FORCE_LOWERCASE_TAGS`` setting to
+  your project's settings module. This feature defaults to being off.
+
+* Fixed a bug where passing non-existent tag names to
+  ``TaggedItemManager.get_by_model`` caused database errors with some
+  backends.
+
+* Added ``tagged_object_list`` generic view for displaying paginated
+  lists of objects for a given model which have a given tag, and
+  optionally related tags for that model.
+
+
+Version 0.1, 30th May 2007:
+---------------------------
+
+Packaged from revision 79 in Subversion; download at
+http://django-tagging.googlecode.com/files/tagging-0.1.zip
+
+* First packaged version using distutils.
diff --git a/pcr/django-tagging/PKGBUILD b/pcr/django-tagging/PKGBUILD
index 1ed13533e..915c8f6b1 100644
--- a/pcr/django-tagging/PKGBUILD
+++ b/pcr/django-tagging/PKGBUILD
@@ -1,20 +1,27 @@
-# Contributor (Arch): Ryan Coyner <rcoyner@gmail.com>
-# Contributor (Arch): James Pearson <james.m.pearson+arch@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
+# Maintainer : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor: Andrey Mivrenik <gim at fastmail dot fm>
+# Contributor: Ryan Coyner <rcoyner@gmail.com>
+# Contributor: James Pearson <james.m.pearson+arch@gmail.com>
 
 pkgname=django-tagging
 pkgver=0.3.1
-pkgrel=2
+pkgrel=4
 pkgdesc="A generic tagging application for Django projects"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/django-tagging/"
+arch=('any')
+url='http://code.google.com/p/django-tagging/'
 license=('MIT')
 depends=('python2')
-source=(http://django-tagging.googlecode.com/files/django-tagging-$pkgver.tar.gz)
+makedepends=('python2-setuptools')
+changelog='CHANGELOG.txt'
+source=("https://django-tagging.googlecode.com/files/django-tagging-${pkgver}.tar.gz")
 
 build() { 
-    cd $srcdir/django-tagging-$pkgver
-    python2 setup.py build || return 1
-    python2 setup.py install --root=$pkgdir || return 1
-    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  cd "$srcdir/django-tagging-$pkgver"
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/django-tagging-$pkgver"
+  python2 setup.py install --root=$pkgdir --optimize=1
+  install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/pcr/ocaml-camomile/0002-Install-missing-camomileLibrary.a.patch b/pcr/ocaml-camomile/0002-Install-missing-camomileLibrary.a.patch
new file mode 100644
index 000000000..23d300d1b
--- /dev/null
+++ b/pcr/ocaml-camomile/0002-Install-missing-camomileLibrary.a.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 29 Jul 2011 19:46:45 +0200
+Subject: Install missing camomileLibrary.a
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e1fc579..45dc0ac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -406,7 +406,7 @@ install-with-ocamlfind:
+ 	files= &&\
+ 	if [ -f camomileLibrary.cmx ]; then files=camomileLibrary.cmx; fi && \
+ 	if [ -f camomileLibrary.cma ]; then files="camomileLibrary.cma $$files"; fi && \
+-	if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa $$files"; fi && \
++	if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa camomileLibrary.a $$files"; fi && \
+ 	if [ -f camomileLibraryDefault.cmx ]; then files="camomileLibraryDefault.cmx $$files"; fi && \
+ 	if [ -f camomileLibraryDyn.cmx ]; then files="camomileLibraryDyn.cmx $$files"; fi && \
+ 	if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \
+-- 
diff --git a/pcr/ocaml-camomile/PKGBUILD b/pcr/ocaml-camomile/PKGBUILD
index 555211fbf..5537b4af0 100644
--- a/pcr/ocaml-camomile/PKGBUILD
+++ b/pcr/ocaml-camomile/PKGBUILD
@@ -1,28 +1,38 @@
-# Contributor (Arch): Serge Zirukin <ftrvxmtrx@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
+# Maintainer : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor: Marek Kubica <marek@xivilization.net>
+# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
 pkgname=ocaml-camomile
-pkgver=0.8.4
-pkgrel=2
+pkgver=0.8.5
+pkgrel=5
 pkgdesc="Comprehensive Unicode library for OCaml"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="https://github.com/yoriyuki/Camomile"
 license=('LGPL')
-depends=('ocaml' 'ocaml-findlib>=1.2.3')
-install=
-source=(https://github.com/downloads/yoriyuki/${pkgname/ocaml-}/${pkgname/ocaml-/}-$pkgver.tar.bz2)
-md5sums=('389f1a7e5c2a634fbb3ea6f764d77bd3')
-options=(!strip !makeflags)
+makedepends=('ocaml' 'camlp4' 'ocaml-findlib>=1.2.3')
+source=(https://github.com/yoriyuki/${pkgname/ocaml-}/releases/download/rel-$pkgver/${pkgname/ocaml-/}-$pkgver.tar.bz2
+        0002-Install-missing-camomileLibrary.a.patch)
+options=(!strip !makeflags staticlibs)
+
+prepare() {
+  cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
+  # Patch from Debian, Slackware to add camomileLibrary.a which is required
+  # for some code to build
+  patch -Np1 -i ../0002-Install-missing-camomileLibrary.a.patch
+}
 
 build() {
-  cd "$srcdir/${pkgname/ocaml-/}-$pkgver"
+  cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
 
   ./configure --prefix=/usr
-  mkdir -p $pkgdir$(ocamlfind printconf destdir) || return 1
-  mkdir -p $pkgdir/usr/bin
-  sed -i -e 's|ocamlfind install|ocamlfind install -destdir '$pkgdir$(ocamlfind printconf destdir)'|' Makefile || return 1
-  make || return 1
-  make DATADIR="$pkgdir/usr/share" BINDIR="$pkgdir/usr/bin" install
-  install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  sed -i -e 's|ocamlfind install|ocamlfind install -destdir '${pkgdir}$(ocamlfind printconf destdir)'|' Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
+
+  mkdir -p "${pkgdir}$(ocamlfind printconf destdir)"
+  make DATADIR="${pkgdir}/usr/share" install
+  install -Dm 644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }