[arch-commits] Commit in r/repos (16 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Fri Sep 8 12:41:30 UTC 2017
Date: Friday, September 8, 2017 @ 12:41:28
Author: bpiotrowski
Revision: 305069
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
r/repos/testing-i686/PKGBUILD
(from rev 305068, r/trunk/PKGBUILD)
r/repos/testing-i686/R.conf
(from rev 305068, r/trunk/R.conf)
r/repos/testing-i686/r.desktop
(from rev 305068, r/trunk/r.desktop)
r/repos/testing-i686/r.png
(from rev 305068, r/trunk/r.png)
r/repos/testing-x86_64/PKGBUILD
(from rev 305068, r/trunk/PKGBUILD)
r/repos/testing-x86_64/R.conf
(from rev 305068, r/trunk/R.conf)
r/repos/testing-x86_64/r.desktop
(from rev 305068, r/trunk/r.desktop)
r/repos/testing-x86_64/r.png
(from rev 305068, r/trunk/r.png)
Deleted:
r/repos/testing-i686/PKGBUILD
r/repos/testing-i686/R.conf
r/repos/testing-i686/r.desktop
r/repos/testing-i686/r.png
r/repos/testing-x86_64/PKGBUILD
r/repos/testing-x86_64/R.conf
r/repos/testing-x86_64/r.desktop
r/repos/testing-x86_64/r.png
--------------------------+
/PKGBUILD | 178 +++++++++++++++++++++++++++++++++++++++++++++
/R.conf | 4 +
/r.desktop | 22 +++++
testing-i686/PKGBUILD | 90 ----------------------
testing-i686/R.conf | 2
testing-i686/r.desktop | 11 --
testing-x86_64/PKGBUILD | 90 ----------------------
testing-x86_64/R.conf | 2
testing-x86_64/r.desktop | 11 --
9 files changed, 204 insertions(+), 206 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-09-08 12:41:08 UTC (rev 305068)
+++ testing-i686/PKGBUILD 2017-09-08 12:41:28 UTC (rev 305069)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Contributor: K. Piche <kpiche at rogers.com>
-
-pkgname=r
-pkgver=3.4.1
-pkgrel=2
-pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.r-project.org/'
-depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff'
- 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
- 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip')
-makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
-optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files' 'gcc-fortran: needed to compile some CRAN packages')
-backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
-options=('!makeflags' '!emptydirs')
-source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
- 'r.desktop'
- 'r.png'
- 'R.conf')
-sha1sums=('7ce8abccf61f3dc39c40f474060f2c8f00004d62'
- 'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
- 'a69a07ec363440efc18ce0a7f2af103375dea978'
- '43668da6cfd1b4455a99f23e79e2059294dddac9')
-
-prepare() {
- cd R-${pkgver}
- # set texmf dir correctly in makefile
- sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
- # fix for texinfo 5.X
- sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
-}
-
-build() {
- cd R-${pkgver}
- export LDFLAGS="${LDFLAGS/--as-needed,/}"
- ./configure --prefix=/usr \
- --libdir=/usr/lib \
- --sysconfdir=/etc/R \
- --datarootdir=/usr/share \
- rsharedir=/usr/share/R/ \
- rincludedir=/usr/include/R/ \
- rdocdir=/usr/share/doc/R/ \
- --with-x \
- --enable-R-shlib \
- --with-lapack \
- --with-blas \
- F77=gfortran \
- LIBnn=lib
- make
-
-# make libRmath.so
- cd src/nmath/standalone
- make shared
-}
-
-package() {
- cd R-${pkgver}
- make DESTDIR="${pkgdir}" install
-
-# install libRmath.so
- cd src/nmath/standalone
- make DESTDIR="${pkgdir}" install
-
- # Fixup R wrapper scripts.
- sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
- rm "${pkgdir}/usr/lib/R/bin/R"
- cd "${pkgdir}/usr/lib/R/bin"
- ln -s ../../../bin/R
-
- # install some freedesktop.org compatibility
- install -Dm644 "${srcdir}/r.desktop" \
- "${pkgdir}/usr/share/applications/r.desktop"
- install -Dm644 "${srcdir}/r.png" \
- "${pkgdir}/usr/share/pixmaps/r.png"
-
- # move the config directory to /etc and create symlinks
- install -d "${pkgdir}/etc/R"
- cd "${pkgdir}/usr/lib/R/etc"
- for i in *; do
- mv -f ${i} "${pkgdir}/etc/R"
- ln -s /etc/R/${i} ${i}
- done
-
- # Install ld.so.conf.d file to ensure other applications access the shared lib
- install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
-}
Copied: r/repos/testing-i686/PKGBUILD (from rev 305068, r/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-09-08 12:41:28 UTC (rev 305069)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: K. Piche <kpiche at rogers.com>
+
+pkgname=r
+pkgver=3.4.1
+pkgrel=3
+pkgdesc="Language and environment for statistical computing and graphics"
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.r-project.org/'
+depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff'
+ 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
+ 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip')
+makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
+optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files' 'gcc-fortran: needed to compile some CRAN packages')
+backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
+options=('!makeflags' '!emptydirs')
+source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
+ 'r.desktop'
+ 'r.png'
+ 'R.conf')
+sha1sums=('7ce8abccf61f3dc39c40f474060f2c8f00004d62'
+ 'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
+ 'a69a07ec363440efc18ce0a7f2af103375dea978'
+ '43668da6cfd1b4455a99f23e79e2059294dddac9')
+
+prepare() {
+ cd R-${pkgver}
+ # set texmf dir correctly in makefile
+ sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
+ # fix for texinfo 5.X
+ sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+}
+
+build() {
+ cd R-${pkgver}
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc/R \
+ --datarootdir=/usr/share \
+ rsharedir=/usr/share/R/ \
+ rincludedir=/usr/include/R/ \
+ rdocdir=/usr/share/doc/R/ \
+ --with-x \
+ --enable-R-shlib \
+ --with-lapack \
+ --with-blas \
+ F77=gfortran \
+ LIBnn=lib
+ make
+
+# make libRmath.so
+ cd src/nmath/standalone
+ make shared
+}
+
+package() {
+ cd R-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+# install libRmath.so
+ cd src/nmath/standalone
+ make DESTDIR="${pkgdir}" install
+
+ # Fixup R wrapper scripts.
+ sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+ rm "${pkgdir}/usr/lib/R/bin/R"
+ cd "${pkgdir}/usr/lib/R/bin"
+ ln -s ../../../bin/R
+
+ # install some freedesktop.org compatibility
+ install -Dm644 "${srcdir}/r.desktop" \
+ "${pkgdir}/usr/share/applications/r.desktop"
+ install -Dm644 "${srcdir}/r.png" \
+ "${pkgdir}/usr/share/pixmaps/r.png"
+
+ # move the config directory to /etc and create symlinks
+ install -d "${pkgdir}/etc/R"
+ cd "${pkgdir}/usr/lib/R/etc"
+ for i in *; do
+ mv -f ${i} "${pkgdir}/etc/R"
+ ln -s /etc/R/${i} ${i}
+ done
+
+ # Install ld.so.conf.d file to ensure other applications access the shared lib
+ install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
+}
Deleted: testing-i686/R.conf
===================================================================
--- testing-i686/R.conf 2017-09-08 12:41:08 UTC (rev 305068)
+++ testing-i686/R.conf 2017-09-08 12:41:28 UTC (rev 305069)
@@ -1,2 +0,0 @@
-/usr/lib/R/lib
-
Copied: r/repos/testing-i686/R.conf (from rev 305068, r/trunk/R.conf)
===================================================================
--- testing-i686/R.conf (rev 0)
+++ testing-i686/R.conf 2017-09-08 12:41:28 UTC (rev 305069)
@@ -0,0 +1,2 @@
+/usr/lib/R/lib
+
Deleted: testing-i686/r.desktop
===================================================================
--- testing-i686/r.desktop 2017-09-08 12:41:08 UTC (rev 305068)
+++ testing-i686/r.desktop 2017-09-08 12:41:28 UTC (rev 305069)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=R
-GenericName=environment for statistical computing
-Comment=language and environment for statistical computing and graphics
-Exec=R
-Icon=/usr/share/pixmaps/r.png
-DocPath=/usr/lib/R/doc/html/index.html
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;
Copied: r/repos/testing-i686/r.desktop (from rev 305068, r/trunk/r.desktop)
===================================================================
--- testing-i686/r.desktop (rev 0)
+++ testing-i686/r.desktop 2017-09-08 12:41:28 UTC (rev 305069)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=R
+GenericName=environment for statistical computing
+Comment=language and environment for statistical computing and graphics
+Exec=R
+Icon=/usr/share/pixmaps/r.png
+DocPath=/usr/lib/R/doc/html/index.html
+StartupNotify=true
+Terminal=true
+Type=Application
+Categories=Science;
Deleted: testing-i686/r.png
===================================================================
(Binary files differ)
Copied: r/repos/testing-i686/r.png (from rev 305068, r/trunk/r.png)
===================================================================
(Binary files differ)
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-09-08 12:41:08 UTC (rev 305068)
+++ testing-x86_64/PKGBUILD 2017-09-08 12:41:28 UTC (rev 305069)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Contributor: K. Piche <kpiche at rogers.com>
-
-pkgname=r
-pkgver=3.4.1
-pkgrel=2
-pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.r-project.org/'
-depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff'
- 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
- 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip')
-makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
-optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files' 'gcc-fortran: needed to compile some CRAN packages')
-backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
-options=('!makeflags' '!emptydirs')
-source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
- 'r.desktop'
- 'r.png'
- 'R.conf')
-sha1sums=('7ce8abccf61f3dc39c40f474060f2c8f00004d62'
- 'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
- 'a69a07ec363440efc18ce0a7f2af103375dea978'
- '43668da6cfd1b4455a99f23e79e2059294dddac9')
-
-prepare() {
- cd R-${pkgver}
- # set texmf dir correctly in makefile
- sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
- # fix for texinfo 5.X
- sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
-}
-
-build() {
- cd R-${pkgver}
- export LDFLAGS="${LDFLAGS/--as-needed,/}"
- ./configure --prefix=/usr \
- --libdir=/usr/lib \
- --sysconfdir=/etc/R \
- --datarootdir=/usr/share \
- rsharedir=/usr/share/R/ \
- rincludedir=/usr/include/R/ \
- rdocdir=/usr/share/doc/R/ \
- --with-x \
- --enable-R-shlib \
- --with-lapack \
- --with-blas \
- F77=gfortran \
- LIBnn=lib
- make
-
-# make libRmath.so
- cd src/nmath/standalone
- make shared
-}
-
-package() {
- cd R-${pkgver}
- make DESTDIR="${pkgdir}" install
-
-# install libRmath.so
- cd src/nmath/standalone
- make DESTDIR="${pkgdir}" install
-
- # Fixup R wrapper scripts.
- sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
- rm "${pkgdir}/usr/lib/R/bin/R"
- cd "${pkgdir}/usr/lib/R/bin"
- ln -s ../../../bin/R
-
- # install some freedesktop.org compatibility
- install -Dm644 "${srcdir}/r.desktop" \
- "${pkgdir}/usr/share/applications/r.desktop"
- install -Dm644 "${srcdir}/r.png" \
- "${pkgdir}/usr/share/pixmaps/r.png"
-
- # move the config directory to /etc and create symlinks
- install -d "${pkgdir}/etc/R"
- cd "${pkgdir}/usr/lib/R/etc"
- for i in *; do
- mv -f ${i} "${pkgdir}/etc/R"
- ln -s /etc/R/${i} ${i}
- done
-
- # Install ld.so.conf.d file to ensure other applications access the shared lib
- install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
-}
Copied: r/repos/testing-x86_64/PKGBUILD (from rev 305068, r/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-09-08 12:41:28 UTC (rev 305069)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: K. Piche <kpiche at rogers.com>
+
+pkgname=r
+pkgver=3.4.1
+pkgrel=3
+pkgdesc="Language and environment for statistical computing and graphics"
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.r-project.org/'
+depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff'
+ 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
+ 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip')
+makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
+optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files' 'gcc-fortran: needed to compile some CRAN packages')
+backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
+options=('!makeflags' '!emptydirs')
+source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
+ 'r.desktop'
+ 'r.png'
+ 'R.conf')
+sha1sums=('7ce8abccf61f3dc39c40f474060f2c8f00004d62'
+ 'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
+ 'a69a07ec363440efc18ce0a7f2af103375dea978'
+ '43668da6cfd1b4455a99f23e79e2059294dddac9')
+
+prepare() {
+ cd R-${pkgver}
+ # set texmf dir correctly in makefile
+ sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
+ # fix for texinfo 5.X
+ sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+}
+
+build() {
+ cd R-${pkgver}
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc/R \
+ --datarootdir=/usr/share \
+ rsharedir=/usr/share/R/ \
+ rincludedir=/usr/include/R/ \
+ rdocdir=/usr/share/doc/R/ \
+ --with-x \
+ --enable-R-shlib \
+ --with-lapack \
+ --with-blas \
+ F77=gfortran \
+ LIBnn=lib
+ make
+
+# make libRmath.so
+ cd src/nmath/standalone
+ make shared
+}
+
+package() {
+ cd R-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+# install libRmath.so
+ cd src/nmath/standalone
+ make DESTDIR="${pkgdir}" install
+
+ # Fixup R wrapper scripts.
+ sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+ rm "${pkgdir}/usr/lib/R/bin/R"
+ cd "${pkgdir}/usr/lib/R/bin"
+ ln -s ../../../bin/R
+
+ # install some freedesktop.org compatibility
+ install -Dm644 "${srcdir}/r.desktop" \
+ "${pkgdir}/usr/share/applications/r.desktop"
+ install -Dm644 "${srcdir}/r.png" \
+ "${pkgdir}/usr/share/pixmaps/r.png"
+
+ # move the config directory to /etc and create symlinks
+ install -d "${pkgdir}/etc/R"
+ cd "${pkgdir}/usr/lib/R/etc"
+ for i in *; do
+ mv -f ${i} "${pkgdir}/etc/R"
+ ln -s /etc/R/${i} ${i}
+ done
+
+ # Install ld.so.conf.d file to ensure other applications access the shared lib
+ install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
+}
Deleted: testing-x86_64/R.conf
===================================================================
--- testing-x86_64/R.conf 2017-09-08 12:41:08 UTC (rev 305068)
+++ testing-x86_64/R.conf 2017-09-08 12:41:28 UTC (rev 305069)
@@ -1,2 +0,0 @@
-/usr/lib/R/lib
-
Copied: r/repos/testing-x86_64/R.conf (from rev 305068, r/trunk/R.conf)
===================================================================
--- testing-x86_64/R.conf (rev 0)
+++ testing-x86_64/R.conf 2017-09-08 12:41:28 UTC (rev 305069)
@@ -0,0 +1,2 @@
+/usr/lib/R/lib
+
Deleted: testing-x86_64/r.desktop
===================================================================
--- testing-x86_64/r.desktop 2017-09-08 12:41:08 UTC (rev 305068)
+++ testing-x86_64/r.desktop 2017-09-08 12:41:28 UTC (rev 305069)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=R
-GenericName=environment for statistical computing
-Comment=language and environment for statistical computing and graphics
-Exec=R
-Icon=/usr/share/pixmaps/r.png
-DocPath=/usr/lib/R/doc/html/index.html
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;
Copied: r/repos/testing-x86_64/r.desktop (from rev 305068, r/trunk/r.desktop)
===================================================================
--- testing-x86_64/r.desktop (rev 0)
+++ testing-x86_64/r.desktop 2017-09-08 12:41:28 UTC (rev 305069)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=R
+GenericName=environment for statistical computing
+Comment=language and environment for statistical computing and graphics
+Exec=R
+Icon=/usr/share/pixmaps/r.png
+DocPath=/usr/lib/R/doc/html/index.html
+StartupNotify=true
+Terminal=true
+Type=Application
+Categories=Science;
Deleted: testing-x86_64/r.png
===================================================================
(Binary files differ)
Copied: r/repos/testing-x86_64/r.png (from rev 305068, r/trunk/r.png)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list