Taylor Venable avatar Taylor Venable committed e03a8e0 Merge

merge

Comments (0)

Files changed (5)

bigloo-devel/PKGBUILD

 _pkgname='bigloo'
 pkgname="${_pkgname}-devel"
 _pkgver='3.8a-alpha'
-_pkgsuffix='19Mar12'
-pkgver='3.8a'
-pkgrel=7
+_pkgsuffix='16Mar12'
+pkgver="${_pkgver/-/_}"
+pkgrel=6
 pkgdesc="Fast scheme compiler"
 arch=('i686' 'x86_64')
 url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"
 install=bigloo.install
 source=("ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${_pkgname}${_pkgver}${_pkgsuffix}.tar.gz"
         'satisfy-ldconfig.sh')
-md5sums=('746593a482944bd236eff94465f60647'
+md5sums=('14041c1c5a3a56e798cf682b1f1a15e8'
          'c253eb5651c81204f6c16b89c3c2cb6a')
 
 build() {
 
 package() {
   cd "${srcdir}/${_pkgname}${_pkgver%-*}"
-  make -k DESTDIR="${pkgdir}" install || true
-  #make -C manuals DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
+  make -C manuals DESTDIR="${pkgdir}" install
   chmod 644 "${pkgdir}/usr/lib/bigloo/${_pkgver%-*}"/*.a
 
   # Slake ldconfig's thirst for symlinks.

gnumeric-devel/PKGBUILD

 arch=('i686' 'x86_64')
 url='http://www.gnome.org/projects/gnumeric/'
 license=('GPL')
-depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme')
+depends=('goffice-devel' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv')
 optdepends=('pygobject: for python plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
+provides=("gnumeric=${pkgver}")
+conflicts=('gnumeric')
 install='gnumeric.install'
 options=('libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${pkgver%.*}/${pkgname%-*}-${pkgver}.tar.xz)
+sha256sums=('6ebee914a652858534b9d5d7ce4ea4dcbbd97525227a042ee5bbc2e45756dd3e')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname%-*}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-schemas-install --enable-ssindex
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname%-*}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname%-*}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas
   rm -rf "${pkgdir}/etc/gconf"
 }

gnumeric-devel/gnumeric.install

 
 post_remove() {
   usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor	
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
 # Maintainer: Taylor Venable <taylor@metasyntax.net>
 
 pkgname='scite'
-pkgver='3.0.2'
+pkgver='3.2.2'
 pkgrel=1
 pkgdesc='A generally useful editor with facilities for building and running programs.'
 arch=('i686' 'x86_64')
 install='scite.install'
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//\./}.tgz"
         'SciTE.desktop')
-md5sums=('928a4ef3773fe7eb30799bece8b3b879'
+md5sums=('dec1f05fb5ae0f94cfa4470af2d2f3ae'
          '48526532ef677982a4b156ae90f25b6f')
 
 build() {

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.