Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 4 insertions, 62 deletions

diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD
deleted file mode 100644
index 976316dc4..000000000
--- a/pcr/chiliproject/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=chiliproject
-pkgver=3.3.0
-pkgrel=1
-pkgdesc="Chiliproject is a fork of Redmine, a flexible project management web application written using Ruby on Rails."
-arch=('any')
-url="https://www.chiliproject.org"
-license=('GPL2')
-depends=('ruby' 'ruby-bundler' 'mysql' 'libxml2' 'libxslt' 'imagemagick' 'pkg-config')
-provides=('chiliproject')
-backup=('var/lib/chiliproject/config/database.yml'
-       'var/lib/chiliproject/config/configuration.yml')
-makedepends=('glibc')
-optdepends=('git: Git repository browsing'
-            'subversion>=1.3.0: Subversion repository browsing'
-            'darcs: Darcs repository browsing'
-            'bzr: Bazaar repository browsing'
-            'mercurial: Mercurial repository browsing')
-options=()
-install=chiliproject.install
-source=("https://www.chiliproject.org/attachments/download/360/chiliproject-$pkgver.tar.gz")
-md5sums=('4fa4a825cf0cd91d7495180a19bc4c11')
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$srcdir/chiliproject-$pkgver"
-
-	# install in /var/lib
-	_instdir="$pkgdir/var/lib/chiliproject"
-	mkdir -p ${_instdir}
-	cp -ra . ${_instdir}
-
-	# create required directories
-	mkdir -p "${_instdir}/public/plugin_assets"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/pcr/chiliproject/chiliproject.install b/pcr/chiliproject/chiliproject.install
deleted file mode 100644
index cb4622f09..000000000
--- a/pcr/chiliproject/chiliproject.install
+++ /dev/null
@@ -1,17 +0,0 @@
-adjust_perms(){
-  chown -R http:http "/var/lib/chiliproject" 1>/dev/null
-  for dir in /var/lib/chiliproject/{files,log,tmp,public/plugin_assets}; do
-    chown -R http:http "$dir" 1>/dev/null
-    chmod -R 755 "$dir" 1>/dev/null
-  done
-}
-
-post_install() {
-  adjust_perms
-  echo 'take a look at https://wiki.archlinux.org/index.php?title=Chiliproject for further setup instructions.'
-}
-
-post_upgrade() {
-  adjust_perms
-  echo 'take a look at https://wiki.archlinux.org/index.php?title=Chiliproject for further setup instructions.'
-}
diff --git a/pcr/ruby1/PKGBUILD b/pcr/ruby1/PKGBUILD
index c20b8720a..4a441bc1c 100644
--- a/pcr/ruby1/PKGBUILD
+++ b/pcr/ruby1/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=ruby
 pkgname=("${_pkgname}1" "${_pkgname}1-docs")
 pkgver=1.9.3_p448
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
@@ -52,7 +52,7 @@ package_ruby1() {
   pkgdesc='An object-oriented language for quick and easy programming (1.9 ver.)'
   depends=('gdbm' 'openssl' 'libffi' 'libyaml')
   optdepends=('tk: for Ruby/TK'
-              'ruby-docs: Ruby documentation')
+              'ruby1-docs: Ruby documentation')
   backup=('etc/gem1rc')
   install='ruby.install'
 
diff --git a/pcr/ruby1/ruby.install b/pcr/ruby1/ruby.install
index ce78e96ec..21e9b98a2 100644
--- a/pcr/ruby1/ruby.install
+++ b/pcr/ruby1/ruby.install
@@ -3,9 +3,9 @@
 print_gem_default_target() {
   echo 'The default location of gem installs is $HOME/.gem/ruby'
   echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+  echo '$(ruby1 -rubygems -e "puts Gem.user_dir")/bin'
   echo 'If you want to install to the system wide location, you must either:'
-  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+  echo 'edit /etc/gem1rc or run gem with the --no-user-install flag.'
 }
 
 # arg 1:  the new package version