[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit f62460c7801278a9f2cec22a22f3c7de5aedc2fe
Author: Florin Braescu <florin at lunar-linux.org>
Date: Tue, 02 Oct 2012 07:18:42 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/f62460c7801278a9f2cec22a22f3c7de5aedc2fe

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  devel/getdata/CONFIGURE           | +5/-0     
  devel/getdata/DEPENDS             | +5/-0     
  devel/getdata/DETAILS             | +17/-0    
  doc-tools/lilypond/BUILD          | +5/-13    
  doc-tools/lilypond/DETAILS        | +3/-3     
  python/python-poppler-qt4/BUILD   | +2/-0     
  python/python-poppler-qt4/DETAILS | +3/-0     
  science/mapnik/DETAILS            | +4/-5     
  8 files changed

--- /dev/null
+++ b/devel/getdata/CONFIGURE
@@ -0,0 +1,5 @@
+mquery USE_ASSERT "Enable assertions?" n "--enable-assert" "--disable-assert"
+mquery USE_ANSI "Use ANSI C (C89) work-arounds for C99 code?" n "--enable-ansi-c" "--disable-ansi-c"
+mquery USE_CPP "Build the C++ bindings (libgetdata++)?" y "--enable-cplusplus" "--disable-cplusplus"
+mquery USE_FORT "Build the Fortran 77 bindings (libfgetdata)?" y "--enable-fortran" "--disable-fortran"
+mquery USE_FORT95 "Build the Fortran 95 bindings (libf95getdata)?" y "--enable-fortran95" "--disable-fortran95"
--- /dev/null
+++ b/devel/getdata/DEPENDS
@@ -0,0 +1,5 @@
+depends numpy
+
+optional_depends libIDL   "--with-idl"     "--without-idl"     "for CORBA IDL files support"
+optional_depends bzip2    "--with-libbz2"  "--without-libbz2"  "for bzip support"
+optional_depends lzma-sdk "--with-liblzma" "--without-liblzma" "for lzma support"
--- /dev/null
+++ b/devel/getdata/DETAILS
@@ -0,0 +1,17 @@
+          MODULE=getdata
+         VERSION=0.8.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$SFORGE_URL/$MODULE/$VERSION/
+      SOURCE_VFY=sha1:130b4863df2af3b39ee3943cfa9a247fb77e2c21
+        WEB_SITE=http://getdata.sourceforge.net/index.html
+         ENTERED=20101223
+         UPDATED=20121002
+           SHORT="reference implementation of the Dirfile Standards"
+
+cat << EOF
+The GetData Project is the reference implementation of the Dirfile Standards.
+The Dirfile database format is designed to provide a fast, simple format for
+storing and reading binary time-ordered data.  The Dirfile Standards are
+described in detail in three Unix manual pages distributed with this package:
+dirfile(5), dirfile-format(5) and dirfile-encoding(5)
+EOF
--- a/doc-tools/lilypond/BUILD
+++ b/doc-tools/lilypond/BUILD
@@ -2,23 +2,15 @@
 
   # For some reason it has a problem finding the .pfb
   # files provided by urw-fonts.
-  OPTS+=" --with-ncsb-dir=/usr/share/fonts/urw-fonts" &&
+  OPTS+=" --with-ncsb-dir=/usr/share/fonts/urw-fonts --disable-documentation" &&
+
+  ./autogen.sh --noconfigure &&
 
   mkdir build &&
   cd build/ &&
 
-  ../configure --prefix=/usr &&
-
-  make all &&
-  if in_depends $MODULE texi2html; then
-     make doc
-  fi &&
-
-  prepare_install &&
+  ../configure --prefix=/usr $OPTS &&
 
-  make install &&
-  if in_depends $MODULE texi2html; then
-     make install-doc
-  fi
+  default_make
 
 ) > $C_FIFO 2>&1
--- a/doc-tools/lilypond/DETAILS
+++ b/doc-tools/lilypond/DETAILS
@@ -1,11 +1,11 @@
           MODULE=lilypond
-         VERSION=2.16.0
+         VERSION=2.17.3
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://download.linuxaudio.org/lilypond/sources/v${VERSION%.*}/
-      SOURCE_VFY=sha1:b5edfdd1332a5cee94bd31c7b1e8b08909c0a068
+      SOURCE_VFY=sha1:743237ebdd3388dd7e4370518ef4065b45af249e
         WEB_SITE=http://lilypond.org/web/
          ENTERED=20070920
-         UPDATED=20120824
+         UPDATED=20121002
            SHORT="music notation for everyone"
 
 cat << EOF
--- a/python/python-poppler-qt4/BUILD
+++ b/python/python-poppler-qt4/BUILD
@@ -1,5 +1,7 @@
 (
 
+  patch_it $SOURCE2 0 &&
+
   python setup.py build &&
   prepare_install &&
   python setup.py install --prefix /usr
--- a/python/python-poppler-qt4/DETAILS
+++ b/python/python-poppler-qt4/DETAILS
@@ -1,8 +1,11 @@
           MODULE=python-poppler-qt4
          VERSION=0.16.2
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=python-poppler-qt4-0.16.2-poppler020.patch
       SOURCE_URL=http://python-poppler-qt4.googlecode.com/files/
+     SOURCE2_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-python/python-poppler-qt4/files/
       SOURCE_VFY=sha1:48867d203ba83d4e818730f6ddcdbbf567b450cf
+     SOURCE2_VFY=sha1:979d474291af6645e422813ffa1094fd2d7853fa
         WEB_SITE=http://code.google.com/p/python-poppler-qt4/
          ENTERED=20120129
          UPDATED=20120129
--- a/science/mapnik/DETAILS
+++ b/science/mapnik/DETAILS
@@ -1,12 +1,11 @@
           MODULE=mapnik
-         VERSION=2.0.0
+         VERSION=v2.1.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://download.berlios.de/$MODULE/
-   SOURCE_URL[1]=http://download2.berlios.de/$MODULE/
-      SOURCE_VFY=sha1:afa49fc80ea38c7d58c940ae5b9a549ce20f5685
+      SOURCE_URL=https://github.com/downloads/mapnik/mapnik/
+      SOURCE_VFY=sha1:b1c6a138e65a5e20f0f312a559e2ae7185adf5b6
         WEB_SITE=http://www.mapnik.org/
          ENTERED=20100703
-         UPDATED=20111019
+         UPDATED=20121002
            SHORT="Toolkit for developing mapping applications"
 
 cat << EOF