rename to openexr

2 files changed, 16 insertions, 18 deletions

diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr/PKGBUILD
index 5423862e3..e38132fcf 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr/PKGBUILD
@@ -2,30 +2,28 @@
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=openexr
-pkgname=openexr-libre
+pkgname=openexr
 pkgver=2.1.0
 pkgrel=1
 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation"
-url="http://www.openexr.com/"
+url="http://www.$pkgname.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
-[ "$CARCH" != "mips64el" ] && makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-mksource=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-          "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
-          "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
-          "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
-          "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
-          "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt")
+makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama')
+replaces=("$pkgname-libre")
+conflicts=("$pkgname-libre")
+mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
+          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
+          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
+          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
+          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt")
 source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt)
 
 mksource() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # remove documentation with embedded nonfree fonts
   rm -rv "doc/"{InterpretingDeepPixels,MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction,TheoryDeepPixels}.pdf
@@ -45,19 +43,19 @@ prepare() {
   # remove TheoryDeepPixels.pdf reference
   sed -i '\|TheoryDeepPixels[.]pdf|d
           \|InterpretingDeepPixels[.]pdf| s| [\]||
-         ' "${srcdir}/${_pkgname}-${pkgver}/doc/Makefile."{am,in}
+         ' "${srcdir}/${pkgname}-${pkgver}/doc/Makefile."{am,in}
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}"
 }
 mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43'
diff --git a/libre/openexr-libre/gcc43.patch b/libre/openexr/gcc43.patch
index ab99eb9a1..ab99eb9a1 100644
--- a/libre/openexr-libre/gcc43.patch
+++ b/libre/openexr/gcc43.patch