Wed Sep 14 23:14:41 UTC 2011

1 files changed, 46 insertions, 63 deletions

diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 0bc1fcd14..b90bfdfed 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,93 +1,76 @@
-# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $
+# $Id: PKGBUILD 55503 2011-09-13 16:34:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20110823
+pkgver=20110913
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm')
-makedepends=('git' 'pkgconfig'
+optdepends=('libxinerama' 'libxrandr')
+makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 	     'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
-conflicts=('ion3')
 provides=('libtu' 'libextl')
-
-_gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion"
-_gitname="notion"
-_gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu"
-_gitname2="libtu"
-_gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl"
-_gitname3="libextl"
-_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
-_gitname4="notion-doc"
-
-source=(doc-build-fix.patch)
-md5sums=('68b348427d0531d2679a8a8d97d51c7d')
+_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion"
+	   "git://notion.git.sourceforge.net/gitroot/notion/libtu"
+	   "git://notion.git.sourceforge.net/gitroot/notion/libextl"
+	   "git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
+	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
+	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
+	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr")
 
 build() {
-    cd ${srcdir}
+  cd ${srcdir}
 
+  # git clone
+  for _gitroot in ${_gitroots[@]}; do
     msg "Connecting to the git repository..."
+    _gitname=`basename ${_gitroot}`
     if [ -d ${srcdir}/${_gitname} ]; then
-        cd ${_gitname}
+        pushd ${srcdir}/${_gitname}
         git pull origin
+        popd
     else
         git clone --depth 1 ${_gitroot}
-        cd ${_gitname}
     fi
-
-    if [ -d ${srcdir}/${_gitname}/${_gitname2} ]; then
-    echo
-        git pull origin
-    else
-        git clone --depth 1 ${_gitroot2}
-      echo
-    fi
-
-    if [ -d ${srcdir}/${_gitname}/${_gitname3} ]; then
-    echo
-        git pull origin
-    else
-        git clone --depth 1 ${_gitroot3}
-    echo
-    fi
-
-    if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then
-    echo
-        git pull origin
-    else
-        git clone --depth 1 ${_gitroot4}
-    echo
-    fi
-
     msg "GIT checkout done or server timeout"
+  done
 
-    rm -rf ${srcdir}/${_gitname}-build
-    cp -r  ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
-
-    cd ${srcdir}/${_gitname}-build
-
-    msg "Starting make..."
+  # copy to notion-build
+  rm -rf ${srcdir}/notion-build
+  cp -r  ${srcdir}/notion ${srcdir}/notion-build
+  for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
+    cp -r  ${srcdir}/$i ${srcdir}/notion-build/
+  done
 
-    sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
-        -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
-        -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
-        -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
-        -i system.mk
+  # build
+  cd ${srcdir}/notion-build
+  msg "Starting make..."
+  sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
+	-e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
+	-e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
+	-e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
+	-i system.mk
+  make INCLUDES=-I${srcdir}/notion-build
 
-    make INCLUDES=-I${srcdir}/${_gitname}-build
-    (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch)
-    (cd notion-doc && make -j1 TOPDIR=.. all)
+  for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do
+    (cd $i && make _exports_doc)
+  done
+  for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
+    (cd $i && make -j1 TOPDIR=.. all)
+  done
 }
 
 package() {
-    cd ${srcdir}/${_gitname}-build
-    make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
-    (cd notion-doc && make  PREFIX=${pkgdir}/usr TOPDIR=.. install)
-    mkdir -p ${pkgdir}/usr/share/licenses/notion
-    cp LICENSE ${pkgdir}/usr/share/licenses/notion
+  cd ${srcdir}/notion-build
+  make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
+  for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
+    (cd $i && make  PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install)
+  done
+  mkdir -p ${pkgdir}/usr/share/licenses/notion
+  cp LICENSE ${pkgdir}/usr/share/licenses/notion
 }