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

3 files changed, 35 insertions, 38 deletions

diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
index 76e4b58bd..b6cbcc4cc 100644
--- a/libre/ruby-rdiscount/PKGBUILD
+++ b/libre/ruby-rdiscount/PKGBUILD
@@ -4,24 +4,18 @@
 
 _gemname=rdiscount
 pkgname=ruby-$_gemname
-pkgver=1.6.5
+pkgver=2.1.6
 pkgdesc="C implementation of John Gruber's Markdown."
 url="http://dafoster.net/projects/rdiscount/"
 
-# About the license: It is a 4-clause BSD license with the 3rd clause modified
-# to mention documentation instead of advertising.  Not to be confused with
-# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license
-# (dropping the 3rd clause).  Because of the way it is modified, it doesn't have
-# the problems normally associated with the 4-clause BSD license.
-license=('custom:modified-BSD4')
+license=('BSD3')
 
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 depends=('ruby')
 makedepends=('rubygems')
 source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-md5sums=('2de321f1ba826f80b84fe45c0d013fcf')
 
 package() {
   cd "${srcdir}"
@@ -36,3 +30,5 @@ package() {
     install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
   done
 }
+
+md5sums=('99c5a8f33f6796e766f0b8e73b0519c6')
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
deleted file mode 100644
index 6a466b314..000000000
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 188870 2013-06-23 17:45:51Z heftig $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-
-pkgname=libquvi-scripts-current
-_pkgname=libquvi-scripts
-provides=(libquvi-scripts)
-pkgver=0.4.19
-pkgrel=1
-pkgdesc='Library for parsing video download links.'
-arch=('any')
-url='http://quvi.sourceforge.net/'
-license=('LGPL')
-depends=('curl' 'lua')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig})
-
-build() {
-  cd "${_pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-nsfw --with-nlfy
-  make
-}
-
-package() {
-  cd "${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('a37221697367a700cc1cb3b1f4b681ec'
-         'SKIP')
diff --git a/pcr/quvi-current/PKGBUILD b/pcr/quvi-current/PKGBUILD
new file mode 100644
index 000000000..231e79658
--- /dev/null
+++ b/pcr/quvi-current/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: joyfulgirl@archlinux.us
+
+pkgname=quvi-current
+_pkgname=quvi
+provides=(quvi)
+pkgver=0.9.4
+pkgrel=2
+pkgdesc='Command-line tool for parsing video download links.'
+arch=('i686' 'x86_64')
+url='http://quvi.sourceforge.net/'
+license=('AGPL3')
+depends=('libquvi')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"{,.sig})
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('36ba58e00d10b38797c39c0c9e2ef663'
+         'SKIP')