4.2.3

2 files changed, 8 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90a16b2d1c2b..2fbeb4192a85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun May 28 21:23:01 UTC 2017
 pkgbase = omniorb
 	pkgdesc = A CORBA object request broker for C++ and Python.
-	pkgver = 4.2.2
+	pkgver = 4.2.3
 	pkgrel = 1
 	url = http://omniorb.sourceforge.net/
 	arch = i686
@@ -10,10 +8,9 @@ pkgbase = omniorb
 	license = GPL2
 	license = LGPL2
 	makedepends = pkgconfig
-	depends = python2
-	depends = openssl
-	source = http://downloads.sourceforge.net/omniorb/omniORB-4.2.2.tar.bz2
-	sha512sums = 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
+	depends = python
+	source = http://downloads.sourceforge.net/omniorb/omniORB-4.2.3.tar.bz2
+	sha512sums = 12cd0eb25cbbc28e42671053a567ede076f33d434f82f605023b35e12a8de77cce7def709ef215653fb93feafd1df49896d6d56f39682e4c81470cfd8cf2f7a0
 
 pkgname = omniorb
 
diff --git a/PKGBUILD b/PKGBUILD
index 1dbec1827b9b..94f898f96336 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,29 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Essien Ita Essien <me@essienitaessien.com>
-# Contributor: Brice Mealier <mealier_brice@yahoo.fr>
-
 pkgname=omniorb
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 pkgdesc="A CORBA object request broker for C++ and Python."
 arch=('i686' 'x86_64')
 url="http://omniorb.sourceforge.net/"
 license=('GPL2' 'LGPL2')
-depends=('python2' 'openssl')
+depends=('python')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/omniorb/omniORB-${pkgver}.tar.bz2)
-sha512sums=('3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad')
+sha512sums=('12cd0eb25cbbc28e42671053a567ede076f33d434f82f605023b35e12a8de77cce7def709ef215653fb93feafd1df49896d6d56f39682e4c81470cfd8cf2f7a0')
 
 build() {
   cd "${srcdir}/omniORB-${pkgver}"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "$file"
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' "$file"
-  done
-
-  PYTHON=/usr/bin/python2.7 ./configure \
+  ./configure \
          --prefix=/usr \
          --with-omniORB-config=/etc/omniorb/omniORB.cfg \
          --with-omniNames-logdir=/var/log/omniORB \
          --with-openssl=/usr
-
   make
 }
 
 package() {
   cd "${srcdir}/omniORB-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
-
   for i in man/man1/*.1; do
     install -D -m 644 $i "${pkgdir}/usr/share/${i}"
   done
-  chmod 755 "${pkgdir}"/{usr,usr/bin,usr/lib,usr/share,usr/include,usr/share/idl,usr/lib/pkgconfig,usr/lib/python2.7,usr/lib/python2.7/site-packages}
 }