[arch-commits] Commit in rrdtool/repos (8 files)

2015-05-09 Thread Eric Bélanger
Date: Saturday, May 9, 2015 @ 23:17:54
  Author: eric
Revision: 238774

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  rrdtool/repos/extra-i686/PKGBUILD
(from rev 238773, rrdtool/trunk/PKGBUILD)
  rrdtool/repos/extra-x86_64/PKGBUILD
(from rev 238773, rrdtool/trunk/PKGBUILD)
Deleted:
  rrdtool/repos/extra-i686/PKGBUILD
  rrdtool/repos/extra-i686/rrdtool-pangofont.patch
  rrdtool/repos/extra-i686/rrdtool-systemd.patch
  rrdtool/repos/extra-x86_64/PKGBUILD
  rrdtool/repos/extra-x86_64/rrdtool-pangofont.patch
  rrdtool/repos/extra-x86_64/rrdtool-systemd.patch

--+
 /PKGBUILD|   88 
 extra-i686/PKGBUILD  |   48 ---
 extra-i686/rrdtool-pangofont.patch   |   38 
 extra-i686/rrdtool-systemd.patch |  140 -
 extra-x86_64/PKGBUILD|   48 ---
 extra-x86_64/rrdtool-pangofont.patch |   38 
 extra-x86_64/rrdtool-systemd.patch   |  140 -
 7 files changed, 88 insertions(+), 452 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-05-09 21:15:00 UTC (rev 238773)
+++ extra-i686/PKGBUILD 2015-05-09 21:17:54 UTC (rev 238774)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=rrdtool
-pkgver=1.4.9
-pkgrel=1
-pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
-url="http://www.rrdtool.org";
-license=('GPL' 'custom')
-depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
-optdepends=('tcl: to use corresponding binding' \
-'python2: to use corresponding binding' \
-'ruby: to use corresponding binding' \
-'lua51: to use corresponding binding')
-options=('!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
-rrdtool-pangofont.patch rrdtool-systemd.patch)
-sha1sums=('c83b158b4aaadbf28b15823fa863db1672700d3b'
-  '6594d5e53d649753eefefc4e29db79e19745f66d'
-  '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
-  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am
-  patch -p1 -i "${srcdir}/rrdtool-pangofont.patch"
-  patch -p1 -i "${srcdir}/rrdtool-systemd.patch"
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  autoreconf
-  PYTHON=python2 LUA=/usr/bin/lua5.1 \
-LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" 
LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
-./configure --prefix=/usr --localstatedir=/var --disable-rpath \
---enable-perl --enable-perl-site-install 
--with-perl-options='INSTALLDIRS=vendor' \
---enable-ruby --enable-ruby-site-install --enable-python \
---enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
-  make LIBS+="-lglib-2.0"
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" includedir=/usr/include install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: rrdtool/repos/extra-i686/PKGBUILD (from rev 238773, 
rrdtool/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-09 21:17:54 UTC (rev 238774)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=rrdtool
+pkgver=1.5.3
+pkgrel=1
+pkgdesc="Data logging and graphing application"
+arch=('i686' 'x86_64')
+url="http://www.rrdtool.org";
+license=('GPL' 'custom')
+depends=('libxml2' 'pango' 'ttf-dejavu')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
+optdepends=('tcl: to use corresponding binding' \
+'python2: to use corresponding binding' \
+'ruby: to use corresponding binding' \
+'lua51: to use corresponding binding')
+options=('!emptydirs' '!makeflags')
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
+sha1sums=('38e7e8a382f7937c4344fce33dc15a88e9b2e48a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i 
bindings/Makefile.am
+  aclocal
+  automake
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" 
LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
+./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+--enable-perl --enable-perl-site-install 
--with-perl-options='INSTALLDIRS=vendor' \
+--enable-ruby --enable-ruby-site-install --enable-python \
+--enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
+  make LIBS+="-lglib-2.0"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
+  in

[arch-commits] Commit in rrdtool/repos (8 files)

2014-12-29 Thread Evangelos Foutras
Date: Monday, December 29, 2014 @ 15:10:26
  Author: foutrelis
Revision: 228140

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  rrdtool/repos/staging-i686/
  rrdtool/repos/staging-i686/PKGBUILD
(from rev 228139, rrdtool/trunk/PKGBUILD)
  rrdtool/repos/staging-i686/rrdtool-pangofont.patch
(from rev 228139, rrdtool/trunk/rrdtool-pangofont.patch)
  rrdtool/repos/staging-i686/rrdtool-systemd.patch
(from rev 228139, rrdtool/trunk/rrdtool-systemd.patch)
  rrdtool/repos/staging-x86_64/
  rrdtool/repos/staging-x86_64/PKGBUILD
(from rev 228139, rrdtool/trunk/PKGBUILD)
  rrdtool/repos/staging-x86_64/rrdtool-pangofont.patch
(from rev 228139, rrdtool/trunk/rrdtool-pangofont.patch)
  rrdtool/repos/staging-x86_64/rrdtool-systemd.patch
(from rev 228139, rrdtool/trunk/rrdtool-systemd.patch)

+
 staging-i686/PKGBUILD  |   48 ++
 staging-i686/rrdtool-pangofont.patch   |   39 
 staging-i686/rrdtool-systemd.patch |  140 +++
 staging-x86_64/PKGBUILD|   48 ++
 staging-x86_64/rrdtool-pangofont.patch |   39 
 staging-x86_64/rrdtool-systemd.patch   |  140 +++
 6 files changed, 454 insertions(+)

Copied: rrdtool/repos/staging-i686/PKGBUILD (from rev 228139, 
rrdtool/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-12-29 14:10:26 UTC (rev 228140)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=rrdtool
+pkgver=1.4.8
+pkgrel=5
+pkgdesc="Data logging and graphing application"
+arch=('i686' 'x86_64')
+url="http://www.rrdtool.org";
+license=('GPL' 'custom')
+depends=('libxml2' 'pango' 'ttf-dejavu')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
+optdepends=('tcl: to use corresponding binding' \
+'python2: to use corresponding binding' \
+'ruby: to use corresponding binding' \
+'lua51: to use corresponding binding')
+options=('!emptydirs' '!makeflags')
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
+rrdtool-pangofont.patch rrdtool-systemd.patch)
+sha1sums=('56d68857f39e70bfa32360947614d8220702ed02'
+  '8c600285bdab7776c1d5301df7cf486d69eae048'
+  '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am
+  patch -p1 -i "${srcdir}/rrdtool-pangofont.patch"
+  patch -p1 -i "${srcdir}/rrdtool-systemd.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  autoreconf
+  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" 
LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
+./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+--enable-perl --enable-perl-site-install 
--with-perl-options='INSTALLDIRS=vendor' \
+--enable-ruby --enable-ruby-site-install --enable-python \
+--enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
+  make LIBS+="-lglib-2.0"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: rrdtool/repos/staging-i686/rrdtool-pangofont.patch (from rev 228139, 
rrdtool/trunk/rrdtool-pangofont.patch)
===
--- staging-i686/rrdtool-pangofont.patch(rev 0)
+++ staging-i686/rrdtool-pangofont.patch2014-12-29 14:10:26 UTC (rev 
228140)
@@ -0,0 +1,39 @@
+From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker 
+Date: Wed, 24 Apr 2013 23:49:28 +0200
+Subject: [PATCH] move to non-deprecated pango_font_map_create_context
+
+---
+ configure.ac| 2 +-
+ src/rrd_graph.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f9e395..d6b2722 100644
+--- a/configure.ac
 b/configure.ac
+@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo,  cairo_font_options_create, 
cairo.h,
+ EX_CHECK_ALL(cairo,  cairo_svg_surface_create,  cairo-svg.h,  
  cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,  cairo_pdf_surface_create,  cairo-pdf.h,  
  cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,  cairo_ps_surface_create,   cairo-ps.h,   
  cairo-ps,1.10.2,  http://cairographics.org/releases/, "")
+-EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  
pango/pango.h,  pangocairo,  1.28.4,
http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
++EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h, 

[arch-commits] Commit in rrdtool/repos (8 files)

2014-01-08 Thread Eric Bélanger
Date: Thursday, January 9, 2014 @ 01:26:47
  Author: eric
Revision: 203378

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  rrdtool/repos/staging-i686/
  rrdtool/repos/staging-i686/PKGBUILD
(from rev 203377, rrdtool/trunk/PKGBUILD)
  rrdtool/repos/staging-i686/rrdtool-pangofont.patch
(from rev 203377, rrdtool/trunk/rrdtool-pangofont.patch)
  rrdtool/repos/staging-i686/rrdtool-systemd.patch
(from rev 203377, rrdtool/trunk/rrdtool-systemd.patch)
  rrdtool/repos/staging-x86_64/
  rrdtool/repos/staging-x86_64/PKGBUILD
(from rev 203377, rrdtool/trunk/PKGBUILD)
  rrdtool/repos/staging-x86_64/rrdtool-pangofont.patch
(from rev 203377, rrdtool/trunk/rrdtool-pangofont.patch)
  rrdtool/repos/staging-x86_64/rrdtool-systemd.patch
(from rev 203377, rrdtool/trunk/rrdtool-systemd.patch)

+
 staging-i686/PKGBUILD  |   48 ++
 staging-i686/rrdtool-pangofont.patch   |   39 
 staging-i686/rrdtool-systemd.patch |  140 +++
 staging-x86_64/PKGBUILD|   48 ++
 staging-x86_64/rrdtool-pangofont.patch |   39 
 staging-x86_64/rrdtool-systemd.patch   |  140 +++
 6 files changed, 454 insertions(+)

Copied: rrdtool/repos/staging-i686/PKGBUILD (from rev 203377, 
rrdtool/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-01-09 00:26:47 UTC (rev 203378)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=rrdtool
+pkgver=1.4.8
+pkgrel=3
+pkgdesc="Data logging and graphing application"
+arch=('i686' 'x86_64')
+url="http://www.rrdtool.org";
+license=('GPL' 'custom')
+depends=('libxml2' 'pango' 'ttf-dejavu')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
+optdepends=('tcl: to use corresponding binding' \
+'python2: to use corresponding binding' \
+'ruby: to use corresponding binding' \
+'lua51: to use corresponding binding')
+options=('!emptydirs' '!makeflags')
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
+rrdtool-pangofont.patch rrdtool-systemd.patch)
+sha1sums=('56d68857f39e70bfa32360947614d8220702ed02'
+  '8c600285bdab7776c1d5301df7cf486d69eae048'
+  '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am
+  patch -p1 -i "${srcdir}/rrdtool-pangofont.patch"
+  patch -p1 -i "${srcdir}/rrdtool-systemd.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  autoreconf
+  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" 
LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
+./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+--enable-perl --enable-perl-site-install 
--with-perl-options='INSTALLDIRS=vendor' \
+--enable-ruby --enable-ruby-site-install --enable-python \
+--enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
+  make LIBS+="-lglib-2.0"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: rrdtool/repos/staging-i686/rrdtool-pangofont.patch (from rev 203377, 
rrdtool/trunk/rrdtool-pangofont.patch)
===
--- staging-i686/rrdtool-pangofont.patch(rev 0)
+++ staging-i686/rrdtool-pangofont.patch2014-01-09 00:26:47 UTC (rev 
203378)
@@ -0,0 +1,39 @@
+From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker 
+Date: Wed, 24 Apr 2013 23:49:28 +0200
+Subject: [PATCH] move to non-deprecated pango_font_map_create_context
+
+---
+ configure.ac| 2 +-
+ src/rrd_graph.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f9e395..d6b2722 100644
+--- a/configure.ac
 b/configure.ac
+@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo,  cairo_font_options_create, 
cairo.h,
+ EX_CHECK_ALL(cairo,  cairo_svg_surface_create,  cairo-svg.h,  
  cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,  cairo_pdf_surface_create,  cairo-pdf.h,  
  cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,  cairo_ps_surface_create,   cairo-ps.h,   
  cairo-ps,1.10.2,  http://cairographics.org/releases/, "")
+-EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  
pango/pango.h,  pangocairo,  1.28.4,
http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
++EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h,  
pan