remove "-libre" suffix on makedepends, depends and optdepends on more packages to avoid break dependencies on the future

7 files changed, 12 insertions, 12 deletions

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index b21733dd6..9409190c8 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
index cf5c374b0..a4db0e5b6 100644
--- a/nonprism/choqok-nonprism/PKGBUILD
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgname=choqok
 pkgname=choqok-nonprism
 pkgver=1.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A status.net client for KDE, without Twitter support"
 url='http://choqok.gnufolks.org/'
 license=('GPL')
@@ -18,7 +18,7 @@ provides=("$_pkgname=$pkgver")
 conflicts=$_pkgname
 depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-konqueror-libre: proxy support')
+optdepends=('kdebase-konqueror: proxy support')
 install="${_pkgname}.install"
 source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
 md5sums=('2efe34ed903b448a21d9233d8033dbdb')
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
index 36d5497dd..196536ea0 100644
--- a/nonprism/icedove-libre-nonprism/PKGBUILD
+++ b/nonprism/icedove-libre-nonprism/PKGBUILD
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird' "${pkgname%-nonprism}")
 conflicts=('thunderbird' "${pkgname%-nonprism}")
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
index 9dc9c4cb2..bda2c27c3 100644
--- a/pcr/imagemagick-srv/PKGBUILD
+++ b/pcr/imagemagick-srv/PKGBUILD
@@ -5,15 +5,15 @@
 pkgbase=imagemagick
 pkgname=imagemagick-srv
 pkgver=6.8.6.8
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
 provides=("$pkgbase=$pkgver")
 conflicts=$pkgbase
 replaces=$pkgbase
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \
-             'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
              'libwebp') # libcl opencl-headers
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index d8e12a3b9..01fb7a47f 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=mitsuba
 _pkgver=0.4.4
-_pkgrel=5
+_pkgrel=5.1
 _bldname=blender
 _bldver=2.69
 _bldep=10
@@ -34,7 +34,7 @@ depends=(
   collada-dom
   glew
   libxxf86vm
-  openexr-libre
+  openexr
   qt4
   xerces-c
 )
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
index dfb8a116c..9f33a6794 100644
--- a/pcr/ryzom-data/PKGBUILD
+++ b/pcr/ryzom-data/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 arch=('any')
 url="http://media.ryzom.com/"
 license=('CCPL:by-sa')
-makedepends=('rsync' 'p7zip-libre')
+makedepends=('rsync' 'p7zip')
 conflicts=('ryzom-data')
 pkgdesc="An awesome free software 3D MMORPG game. Game data."
 source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata")
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index 1db06b6a9..c27f6c587 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=yafaray
 _pkgver=1.5
-_pkgrel=1
+_pkgrel=1.1
 _pkgdate=20130921
 _bldname=blender
 _bldver=2.69
@@ -36,7 +36,7 @@ depends=(
   freetype2
   libjpeg
   libxml2
-  openexr-libre
+  openexr
 )
 optdepends=(
   'python: Python bindings'