moved r-dichromat as optional dependency

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 024d42289383..6ac029e320dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = r-scales
 	pkgdesc = Tools for Splitting, Applying and Combining Data
 	pkgver = 1.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://cran.r-project.org/web/packages/scales/index.html
 	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = r
+	depends = r>=3.1
 	depends = r-rcolorbrewer
-	depends = r-dichromat
 	depends = r-plyr
-	depends = r-munsell
+	depends = r-munsell>=0.5
 	depends = r-labeling
 	depends = r-rcpp
 	depends = r-r6
 	depends = r-viridislite
+	optdepends = r-dichromat
 	provides = r-cran-scales
 	conflicts = r-cran-scales
 	replaces = r-cran-scales
diff --git a/PKGBUILD b/PKGBUILD
index 229835d19d4c..dd8414511e79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@ _cranname=scales
 _cranver=1.0.0
 pkgname=r-$_cranname
 pkgver=${_cranver}
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools for Splitting, Applying and Combining Data"
 url="http://cran.r-project.org/web/packages/${_cranname}/index.html"
 arch=('i686' 'x86_64')
 license=('MIT')
-depends=('r' 'r-rcolorbrewer' 'r-dichromat' 'r-plyr'
-             'r-munsell' 'r-labeling' 'r-rcpp' 'r-r6' 'r-viridislite')
+depends=('r>=3.1' 'r-rcolorbrewer' 'r-plyr'
+             'r-munsell>=0.5' 'r-labeling' 'r-rcpp' 'r-r6' 'r-viridislite')
+optdepends=('r-dichromat')
 provides=("r-cran-${_cranname}")
 conflicts=("r-cran-${_cranname}")
 replaces=("r-cran-${_cranname}")