Merge branch 'testing' of ssh://git.chakraos.org:22/platform into testing

apache/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=apache
-pkgver=2.4.12
+pkgver=2.4.16
-pkgrel=2
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -21,13 +21,12 @@ optdepends=(
     'lynx: apachectl status'
 )
 install=${pkgname}.install
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         httpd.logrotate
         chakra.layout
         httpd.service
         httpd-tmpfile.conf)
-md5sums=('b8dc8367a57a8d548a9b4ce16d264a13'
+md5sums=('2b19cd338fd526dd5a63c57b1e9bfee2'
-         'SKIP'
          '13dbaaf949c5bc36cfcf5718b95cb020'
          'a53ea863aab5714e39ebc8bbce6218ca'
          '3494dece165bda4f207135e53655a9ec'

cups-filters/PKGBUILD

@@ -1,8 +1,8 @@
 #Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/cups-filters
 
 pkgname=cups-filters
-pkgver=1.0.66
+pkgver=1.0.71
-pkgrel=2
+pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -19,8 +19,8 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
-source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
+source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
-md5sums=('9142ffff8b973500fb7d8cb974cfc54f')
+md5sums=('f1e11dfe5fa52eb65aa0bdd3a7ee0117')
 
 build() {
   cd $pkgname-$pkgver

frameworkintegration/PKGBUILD

@@ -4,12 +4,13 @@ source ../frameworks.conf
 
 pkgname=frameworkintegration
 pkgver=${KFVersion}
-pkgrel=1
+pkgrel=3
 pkgdesc='Framework providing components to allow applications to integrate with a KDE Workspace'
 arch=('x86_64')
 url='https://projects.kde.org/projects/frameworks/frameworkintegration'
 license=('LGPL')
-depends=('kio' 'ttf-oxygen') #should replace this with oxygen-fonts once plasma5 hits stable
+depends=('python3' 'kio' 'ttf-oxygen') #should replace this with oxygen-fonts once plasma5 hits 
+stable
 makedepends=("extra-cmake-modules>=${KFECMVersion}")
 options=("debug")
 groups=('kf5')

libmwaw/PKGBUILD

@@ -1,13 +1,13 @@
 # Maintainer: Fabian Kosmale <inkane@chakra-project.org>
 pkgname=libmwaw
-pkgver=0.3.4
+pkgver=0.3.5
 pkgrel=1
 pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet."
 arch=('x86_64')
 depends=('libwpd' 'libwpg' 'librevenge')
 license=('LGPLv2')
 source=(http://downloads.sourceforge.net/libmwaw/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('edb8a92a4b6746efbd45bde5006f71b9')
+md5sums=('bdc58bbf89aaaf6d29b3516d96830a06')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"

os-prober/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=os-prober
-pkgver=1.65
+pkgver=1.66
 pkgrel=1
 pkgdesc="Utility to detect other OSes on a set of drives"
 url="http://joey.kitenet.net/code/os-prober/"
@@ -8,7 +8,7 @@ license=('GPL3')
 depends=('sh')
 source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz
 	os-prober-util-linux-2.24.patch)
-sha256sums=('c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84'
+sha256sums=('ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057'
             '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
 
 prepare() {

python-pip/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=('python3-pip' 'python2-pip')
-pkgver=7.0.3
+pkgver=7.1.0
 pkgrel=1
 pkgdesc="An easy_install replacement for installing pypi python packages"
 url="http://www.pip-installer.org/"
@@ -7,7 +7,7 @@ arch=('any')
 license=('MIT')
 makedepends=('python3' 'python3-setuptools' 'python2' 'python2-setuptools')
 source=(http://pypi.python.org/packages/source/p/pip/pip-${pkgver}.tar.gz)
-md5sums=('54cbf5ae000fb3af3367345f5d299d1c')
+md5sums=('d935ee9146074b1d3f26c5f0acfd120e')
 
 package_python3-pip() {
     depends=('python3' 'python3-setuptools')

python-pygments/PKGBUILD

@@ -1,52 +1,25 @@
-#
-# Software packages for Chakra, part of www.chakra-project.org
-#
-# Maintainer:   H W Tovetjärn (totte) <totte@tott.es>
-# Contributors: R Biegelmeyer (RenanBS) <renan.biegel@gmail.com>
-#               Evangelos Foutras <evangelos@foutrelis.com>
-#               T Preetz <timm@preetz.us>
-
 pkgbase=python-pygments
-pkgname=('python3-pygments' 'python2-pygments')
+pkgname=('python3-pygments' 'python2-pygments' 'pygmentize')
-pkgver=1.6
+pkgver=2.0.2
-pkgrel=4
+pkgrel=1
 pkgdesc="Python syntax highlighter"
 arch=('any')
 url="http://pygments.org/"
 license=('BSD')
 makedepends=('python3-setuptools' 'python2-setuptools')
 options=(!emptydirs)
-source=(http://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz
+source=(https://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz)
-        make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch)
+md5sums=('238587a1370d62405edabd0794b3ec4a')
-md5sums=('a18feedf6ffd0b0cc8c8b0fbdb2027b1'
-         '417f20255f7410065e73269b52497f1f')
-
-prepare() {
-  cd "$srcdir/Pygments-$pkgver"
-
-  patch -Np1 -i "$srcdir/make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch"
-}
-
-build() {
-  cd "$srcdir"
-
-  rm -rf python{2,3}-build
-  for builddir in python{2,3}-build; do
-    cp -r Pygments-$pkgver $builddir
-    pushd $builddir
-    ${builddir%-build} setup.py build
-    popd
-  done
-}
 
 package_python3-pygments() {
   depends=('python3-setuptools')
+  install=python3-pygments.install
 
-  cd "$srcdir/python3-build"
+  cd "$srcdir/Pygments-$pkgver"
 
   python3 setup.py install --root="$pkgdir" -O1
 
-  # pygmentize has been moved to the python2-pygments package
+  # pygmentize is shipped in its own package
   rm "$pkgdir/usr/bin/pygmentize"
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -54,14 +27,28 @@ package_python3-pygments() {
 
 package_python2-pygments() {
   depends=('python2-setuptools')
-  conflicts=('pygments')
+  install=python2-pygments.install
-  replaces=('pygments')
-  provides=('python-pygments' 'pygments')
 
-  cd "$srcdir/python2-build"
+  cd "$srcdir/Pygments-$pkgver"
 
   python2 setup.py install --root="$pkgdir" -O1
 
+  # pygmentize is shipped in its own package
+  rm "$pkgdir/usr/bin/pygmentize"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_pygmentize() {
+  depends=('python3-pygments')
+
+  cd "$srcdir/Pygments-$pkgver"
+
+  python3 setup.py install --root="$pkgdir" -O1
+
+  # Remove all files except for usr/bin/pygmentize
+  find "$pkgdir" -type f -not -name pygmentize -delete
+
   install -Dm644 external/pygments.bashcomp \
     "$pkgdir/usr/share/bash-completion/completions/pygmentize"
 

python-pygments/make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch

@@ -1,29 +0,0 @@
-# HG changeset patch
-# User goodwillcoding <goodwillcoding@webhippo.net>
-# Date 1376769053 25200
-# Node ID c31841d2fd2171419134f30e815dcafb1e8c7eee
-# Parent  7304e4759ae65343d89a51359ca538912519cc31
-Make pygments.lexers.guess_lexer_for_filename py3 compatible.
-Background:
-In py3 one can longer sort classes by class names
-the fix addes a custome sorting function that works
-the same in py2 and py3
-
-diff --git a/pygments/lexers/__init__.py b/pygments/lexers/__init__.py
---- a/pygments/lexers/__init__.py
-+++ b/pygments/lexers/__init__.py
-@@ -188,7 +188,13 @@
-         if rv == 1.0:
-             return lexer(**options)
-         result.append((rv, lexer))
--    result.sort()
-+
-+    # since py3 can no longer sort by class name by default, here is the
-+    # sorting function that works in both
-+    def type_sort(type_):
-+        return (type_[0], type_[1].__name__)
-+    result.sort(key=type_sort)
-+
-     if not result[-1][0] and primary is not None:
-         return primary(**options)
-     return result[-1][1](**options)

python-pygments/python2-pygments.install

@@ -0,0 +1,5 @@
+post_upgrade() {
+  if (($(vercmp $2 2.0.2-1) < 0)); then
+    echo ':: /usr/bin/pygmentize has been moved to the pygmentize package'
+  fi
+}

python-pygments/python3-pygments.install

@@ -0,0 +1,5 @@
+post_upgrade() {
+  if (($(vercmp $2 2.0.2-1) < 0)); then
+    echo ':: /usr/bin/pygmentize has been moved to the pygmentize package'
+  fi
+}

qca/PKGBUILD

@@ -5,15 +5,19 @@
 pkgbase=qca-qt5
 pkgname=("qca" "qca-qt5")
 pkgver=2.1.0.3
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 makedepends=('qt' 'qt5-base' 'cmake' 'git' 'nss')
-source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz")
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz"
-md5sums=('e29cc1d8f0292eb28e20b216f52d60fc')
+        "qt-5.5.patch::http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=7207e6285e932044cd66d49d0dc484666cfb0092&o=plain")
+md5sums=('e29cc1d8f0292eb28e20b216f52d60fc'
+         '5ea7bcb072e72b28e37b1a1d897c9362')
 
 prepare(){
+  cd ${pkgbase}-${pkgver}
+  patch -Np1 -i ../qt-5.5.patch
   mkdir $srcdir/build
   mkdir $srcdir/build-qt5
 }

qpdf/PKGBUILD

@@ -1,7 +1,5 @@
-# maintainer: almack@chakraos.org
-
 pkgname=qpdf
-pkgver=5.1.2
+pkgver=5.1.3
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
 arch=('x86_64')
@@ -10,7 +8,7 @@ license=('custom:Artistic-2.0')
 depends=('pcre' 'perl')
 makedepends=('make')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0bd15ef5eea5f628951ab456c84e78ec')
+md5sums=('aafbf3950230f84d7998b700b12428f4')
 
 build() {
   cd "${pkgname}-${pkgver}"
@@ -21,7 +19,7 @@ build() {
 
 check() {
   cd $pkgname-$pkgver
-  make check # passes all
+  make check
 }
 
 package() {

ttf-indic-otf/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=ttf-indic-otf
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Indic Opentype Fonts collection'
 url='http://www.indlinux.org/wiki/index.php/Downloads'
 license=('GPL')
@@ -14,4 +14,12 @@ package() {
 	cd "${srcdir}"/indic/OpenType
 	install -d "${pkgdir}"/usr/share/fonts/TTF
 	install -m644 *.ttf "${pkgdir}"/usr/share/fonts/TTF
+	
+	# Remove those fonts are already included in ttf-indic-fonts.
+	rm -f ${pkgdir}/usr/share/fonts/TTF/LikhanNormal.ttf
+	rm -f ${pkgdir}/usr/share/fonts/TTF/MuktiNarrow.ttf
+	rm -f ${pkgdir}/usr/share/fonts/TTF/MuktiNarrowBold.ttf
+	rm -f ${pkgdir}/usr/share/fonts/TTF/Pothana2000.ttf
+	rm -f ${pkgdir}/usr/share/fonts/TTF/ani.ttf
+	rm -f ${pkgdir}/usr/share/fonts/TTF/padmaa-Medium-0.5.ttf
 }

ttf-oxygen/PKGBUILD

@@ -1,39 +0,0 @@
-#
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
-
-pkgname=ttf-oxygen
-pkgver=5.1.95
-pkgrel=1
-pkgdesc='The Oxygen font family. A desktop/gui font family for integrated use with the KDE desktop'
-url='https://projects.kde.org/projects/kde/workspace/oxygen-fonts'
-arch=('any')
-license=('custom:OFL' 'GPL' 'custom:GPL+FE')
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-makedepends=('extra-cmake-modules' 'qt5-base' 'fontforge')
-provides=('ttf-font')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/plasma/${pkgver}/oxygen-fonts-${pkgver}.tar.xz")
-md5sums=('ed714712a1f0ce48968283df586ed213')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../oxygen-fonts-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 "${srcdir}"/oxygen-fonts-${pkgver}/COPYING-{GPL+FE.txt,OFL} \
-    "${pkgdir}"/usr/share/licenses/${pkgname}
-}

ttf-oxygen/ttf-oxygen.install

@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/truetype/oxygen
-  mkfontdir /usr/share/fonts/truetype/oxygen
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

ttf-vlgothic/PKGBUILD

@@ -1,12 +1,5 @@
-#
-# Platform Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-# contributor Julien Humbert <julroy67@gmail.com>
-
 pkgname=ttf-vlgothic
-pkgver=20120905
+pkgver=20141206
 pkgrel=1
 pkgdesc="Japanese TrueType fonts from Vine Linux"
 arch=('any')
@@ -14,8 +7,8 @@ url="http://vlgothic.dicey.org/"
 license=('custom')
 depends=('fontconfig' 'xorg-font-utils')
 install=$pkgname.install
-source=("http://dl.sourceforge.jp/vlgothic/56782/VLGothic-${pkgver}.tar.bz2")
+source=("http://jaist.dl.sourceforge.jp/vlgothic/62375/VLGothic-${pkgver}.tar.xz")
-sha256sums=('f0739d485720749e2067aac5743c4834724a36ef9e34a5e84cc19dd3562d67ea')
+sha256sums=('982040db2f9cb73d7c6ab7d9d163f2ed46d1180f330c9ba2fae303649bf8102d')
 
 package() {
   cd "${srcdir}/VLGothic"