Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

23 files changed, 33 insertions, 41 deletions

diff --git a/libre/kile-libre/PKGBUILD b/libre/kile/PKGBUILD
index 97f242d3a..c909db92b 100644
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile/PKGBUILD
@@ -4,10 +4,9 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-_pkgname=kile
-pkgname=kile-libre
+pkgname=kile
 pkgver=2.1.3
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc="A user friendly TeX/LaTeX frontend for KDE, without nonfree Adobe Reader recommendation"
 arch=("i686" "x86_64")
 license=('GPL2')
@@ -15,23 +14,22 @@ url="http://kile.sourceforge.net/"
 depends=('kdebase-runtime' 'texlive-core' 'kdebase-katepart')
 makedepends=('cmake' 'automoc4')
 optdepends=('kdebase-konsole: embedded terminal')
-conflicts=('kile')
-replaces=('kile')
-provides=('kile')
-install=${_pkgname}.install
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
+conflicts=('kile-libre')
+replaces=('kile-libre')
+install=${pkgname}.install
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
         "libre.patch")
 sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5'
           '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # Remove nonfree Adobe Reader recommendation
   patch -Np1 -i "${srcdir}/libre.patch"
   cd ..
   mkdir build
   cd build
-  cmake ../${_pkgname}-${pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/libre/kile-libre/kile.install b/libre/kile/kile.install
index 9fe93eeac..9fe93eeac 100644
--- a/libre/kile-libre/kile.install
+++ b/libre/kile/kile.install
diff --git a/libre/kile-libre/libre.patch b/libre/kile/libre.patch
index 7d305a2d0..7d305a2d0 100644
--- a/libre/kile-libre/libre.patch
+++ b/libre/kile/libre.patch
diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe/PKGBUILD
index 15e05e4a9..1bbc5a16d 100644
--- a/libre/lesspipe-libre/PKGBUILD
+++ b/libre/lesspipe/PKGBUILD
@@ -3,17 +3,15 @@
 # Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=lesspipe
-pkgname=lesspipe-libre
+pkgname=lesspipe
 pkgver=1.82
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc='an input filter for the pager less, with libarchive support'
 depends=('less')
 arch=('any')
 license=('GPL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 optdepends=('perl'
 	    'rpmextract: support for rpm files'
 	    'fastjar: support for jar files'
@@ -35,18 +33,18 @@ md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56'
          'ec452ea980d5c1e254e9775fd424c18c')
 
 prepare() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i ../libarchive.patch
 }
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --yes
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/share/man/man1
   make install PREFIX=$pkgdir/usr
   install -D $srcdir/lesspipe.sh $pkgdir/etc/profile.d/lesspipe.sh
diff --git a/libre/lesspipe-libre/lesspipe.sh b/libre/lesspipe/lesspipe.sh
index ae6076f6b..ae6076f6b 100644
--- a/libre/lesspipe-libre/lesspipe.sh
+++ b/libre/lesspipe/lesspipe.sh
diff --git a/libre/lesspipe-libre/libarchive.patch b/libre/lesspipe/libarchive.patch
index b4fb48788..b4fb48788 100644
--- a/libre/lesspipe-libre/libarchive.patch
+++ b/libre/lesspipe/libarchive.patch
diff --git a/libre/libosinfo-libre/PKGBUILD b/libre/libosinfo/PKGBUILD
index 27c637bb1..eea40ee0e 100644
--- a/libre/libosinfo-libre/PKGBUILD
+++ b/libre/libosinfo/PKGBUILD
@@ -4,27 +4,25 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Daniel Milewski <niitotantei@gmail.com>
 
-_pkgname=libosinfo
-pkgname=libosinfo-libre
+pkgname=libosinfo
 pkgver=0.2.10
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libosinfo.org/"
 license=('GPL' 'LGPL')
 depends=('glib2' 'libxslt')
 makedepends=('check' 'gobject-introspection' 'intltool' 'libsoup' 'vala')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
+conflicts=(${pkgname}-libre)
+replaces=(${pkgname}-libre)
 options=('!libtool')
-source=(https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz
+source=(https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$pkgver.tar.gz
         libre.patch)
 sha256sums=('564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d'
             '46d1c192f3730b5b02a52140a8f1abbacd6d41968c29cec9205f0cec77336a17')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   rm data/datamaps/windows-lang.xml \
      data/hypervisors/rhel-xen.xml{,.in} \
@@ -42,7 +40,7 @@ prepare() {
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --enable-udev \
               --with-udev-rulesdir=/usr/lib/udev/rules.d \
@@ -52,11 +50,11 @@ build() {
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/libosinfo-libre/libre.patch b/libre/libosinfo/libre.patch
index 50213db8b..50213db8b 100644
--- a/libre/libosinfo-libre/libre.patch
+++ b/libre/libosinfo/libre.patch
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses/PKGBUILD
index 3410e4994..bba4aa64e 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses/PKGBUILD
@@ -5,17 +5,17 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgname=licenses-libre
+pkgname=licenses
 pkgver=20140629
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
 license=('custom:none')
 url="https://parabolagnulinux.org/"
 groups=('base')
-provides=("licenses=${pkgver}")
-conflicts=('licenses')
-replaces=('licenses')
+makedepends=(links)
+conflicts=('licenses-libre')
+replaces=('licenses-libre')
 source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         cc-by-3.0.txt
         cc-by-sa-3.0.txt
diff --git a/libre/licenses-libre/ZopePublicLicense.txt b/libre/licenses/ZopePublicLicense.txt
index 0f06d960d..0f06d960d 100644
--- a/libre/licenses-libre/ZopePublicLicense.txt
+++ b/libre/licenses/ZopePublicLicense.txt
diff --git a/libre/licenses-libre/cc-by-3.0.txt b/libre/licenses/cc-by-3.0.txt
index 4c79aa8ae..4c79aa8ae 100644
--- a/libre/licenses-libre/cc-by-3.0.txt
+++ b/libre/licenses/cc-by-3.0.txt
diff --git a/libre/licenses-libre/cc-by-sa-3.0.txt b/libre/licenses/cc-by-sa-3.0.txt
index 7252d9ca5..7252d9ca5 100644
--- a/libre/licenses-libre/cc-by-sa-3.0.txt
+++ b/libre/licenses/cc-by-sa-3.0.txt
diff --git a/libre/licenses-libre/cc-readme.txt b/libre/licenses/cc-readme.txt
index d71e2254f..d71e2254f 100644
--- a/libre/licenses-libre/cc-readme.txt
+++ b/libre/licenses/cc-readme.txt
diff --git a/libre/licenses-libre/cddl-1.0.txt b/libre/licenses/cddl-1.0.txt
index d83893249..d83893249 100644
--- a/libre/licenses-libre/cddl-1.0.txt
+++ b/libre/licenses/cddl-1.0.txt
diff --git a/libre/licenses-libre/cpl-1.0.txt b/libre/licenses/cpl-1.0.txt
index c48081b33..c48081b33 100644
--- a/libre/licenses-libre/cpl-1.0.txt
+++ b/libre/licenses/cpl-1.0.txt
diff --git a/libre/licenses-libre/eclipse-1.0.txt b/libre/licenses/eclipse-1.0.txt
index f61d34dfe..f61d34dfe 100644
--- a/libre/licenses-libre/eclipse-1.0.txt
+++ b/libre/licenses/eclipse-1.0.txt
diff --git a/libre/licenses-libre/perlartistic.txt b/libre/licenses/perlartistic.txt
index aaf7c8801..aaf7c8801 100644
--- a/libre/licenses-libre/perlartistic.txt
+++ b/libre/licenses/perlartistic.txt
diff --git a/libre/licenses-libre/python-2.txt b/libre/licenses/python-2.txt
index 454f4ea69..454f4ea69 100644
--- a/libre/licenses-libre/python-2.txt
+++ b/libre/licenses/python-2.txt
diff --git a/libre/licenses-libre/w3c.txt b/libre/licenses/w3c.txt
index 6a29463d3..6a29463d3 100644
--- a/libre/licenses-libre/w3c.txt
+++ b/libre/licenses/w3c.txt
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea/PKGBUILD
index 0bd411f13..ecbd765f3 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea/PKGBUILD
@@ -3,16 +3,14 @@
 # Contributor: bitlord
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-_pkgname=liferea
-pkgname=liferea-libre
+pkgname=liferea
 pkgver=1.10.11
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://liferea.sourceforge.net/"
-provides=("liferea=$pkgver")
-replaces=('liferea')
-conflicts=('liferea')
+replaces=('liferea-libre')
+conflicts=('liferea-libre')
 license=('GPL')
 depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 
          'gnome-icon-theme' 'desktop-file-utils')
diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea/libnotify-0.7.patch
index 6dbbffb87..6dbbffb87 100644
--- a/libre/liferea-libre/libnotify-0.7.patch
+++ b/libre/liferea/libnotify-0.7.patch
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea/liferea.install
index 7fff91b49..7fff91b49 100644
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea/liferea.install
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea/remove-non-free-suggestions.patch
index 5024f19ee..5024f19ee 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea/remove-non-free-suggestions.patch