renamed mate-document-viewer-libre to atril-libre and mate-file-archiver-libre to engrampa-libre

7 files changed, 109 insertions, 102 deletions

diff --git a/libre/atril-libre/PKGBUILD b/libre/atril-libre/PKGBUILD
new file mode 100644
index 000000000..3f5b92481
--- /dev/null
+++ b/libre/atril-libre/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=atril
+pkgname=atril-libre
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Simply a document viewer, with libarchive recommendation"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsm' 'libspectre'
+         'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib')
+makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common'
+             'perl-xml-parser' 'texlive-bin' 'yelp-tools')
+optdepends=('caja: Document Properties extension'
+            'djvulibre: DjVu support'
+            'libgxps: XPS support'
+            'p7zip: cbz and cb7 compressed comic books'
+            'texlive-bin: DVI support'
+            'libarchive: cbr compressed comic books'
+            'yelp: for reading MATE help documents')
+replaces=('mate-document-viewer' "$_pkgname")
+provides=('mate-document-viewer' "$_pkgname=$pkgver")
+conflicts=('mate-document-viewer' "$_pkgname")
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz")
+sha1sums=('8327437ba12df61326b83342cea746d1764727d0')
+install=${_pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${_pkgname} \
+        --with-gtk=2.0 \
+        --enable-gtk-doc \
+        --enable-djvu \
+        --enable-dvi \
+        --enable-t1lib \
+        --enable-pixbuf \
+        --enable-comics \
+        --enable-xps \
+        --enable-introspection \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/mate-document-viewer-libre/mate-document-viewer.install b/libre/atril-libre/atril.install
index bf6781f93..bf6781f93 100644
--- a/libre/mate-document-viewer-libre/mate-document-viewer.install
+++ b/libre/atril-libre/atril.install
diff --git a/libre/engrampa-libre/PKGBUILD b/libre/engrampa-libre/PKGBUILD
new file mode 100644
index 000000000..a109e8839
--- /dev/null
+++ b/libre/engrampa-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 106530 2014-03-05 20:15:56Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=engrampa
+pkgname=engrampa-libre
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('unar: for RAR uncompression'
+            'zip: for ZIP archives' 'unzip: for ZIP archives'
+            'p7zip: 7zip compression utility' 'arj: for ARJ archives'
+            'yelp: for reading MATE help documents')
+replaces=('mate-file-archiver' "$_pkgname")
+provides=('mate-file-archiver' "$_pkgname=$pkgver")
+conflicts=('mate-file-archiver' "$_pkgname")
+options=( '!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz"
+        fr-rpm-bsdtar.patch)
+sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65'
+          '219b05a979bf6f249aaae27964f02345fd81168d')
+install=${_pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    # This patch 'depends' on libarchive
+    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${_pkgname} \
+        --with-gtk=2.0 \
+        --disable-static \
+        --disable-packagekit
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/mate-file-archiver-libre/mate-file-archiver.install b/libre/engrampa-libre/engrampa.install
index bf6781f93..bf6781f93 100644
--- a/libre/mate-file-archiver-libre/mate-file-archiver.install
+++ b/libre/engrampa-libre/engrampa.install
diff --git a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch b/libre/engrampa-libre/fr-rpm-bsdtar.patch
index 93a783176..93a783176 100644
--- a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch
+++ b/libre/engrampa-libre/fr-rpm-bsdtar.patch
diff --git a/libre/mate-document-viewer-libre/PKGBUILD b/libre/mate-document-viewer-libre/PKGBUILD
deleted file mode 100644
index 969c335b2..000000000
--- a/libre/mate-document-viewer-libre/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-_pkgname=mate-document-viewer
-pkgname=mate-document-viewer-libre
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Simply a document viewer, with libarchive recommendation"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm'
-         'libspectre' 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib')
-makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common'
-             'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin')
-optdepends=('djvulibre: DjVu support'
-            'libgxps: XPS support'
-            'mate-file-manager: Document Properties extension'
-            'p7zip: cbz and cb7 compressed comic books'
-            'texlive-bin: DVI support'
-            'libarchive: cbr compressed comic books')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997')
-install=${_pkgname}.install
-
-build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgname} \
-        --enable-gtk-doc \
-        --enable-djvu \
-        --enable-dvi \
-        --enable-t1lib \
-        --enable-pixbuf \
-        --enable-comics \
-        --enable-introspection \
-        --disable-static \
-        --disable-scrollkeeper
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    ln -s atril "${pkgdir}/usr/bin/mate-document-viewer"
-}
diff --git a/libre/mate-file-archiver-libre/PKGBUILD b/libre/mate-file-archiver-libre/PKGBUILD
deleted file mode 100644
index 80711e259..000000000
--- a/libre/mate-file-archiver-libre/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-_pkgname=mate-file-archiver
-pkgname=mate-file-archiver-libre
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive'
-         'mate-file-manager' 'tar')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-optdepends=('arj: for ARJ support'
-            'p7zip: for 7zip support'
-            'unar: for RAR extract support'
-            'unzip: for ZIP extract support'
-            'zip: for ZIP support')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz"
-        fr-rpm-bsdtar.patch)
-sha1sums=('58a0f7d78dabd627a3a2b3352fabcba20d72aa92'
-          '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${_pkgname}.install
-
-prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"    
-    # This patch 'depends' on libarchive
-    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgname} \
-        --disable-static \
-        --disable-scrollkeeper \
-        --disable-packagekit
-    mate-doc-prepare --force
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}