4.3.0

2 files changed, 12 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18d524527ab9..981a5fcefbb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,14 @@
 pkgbase = omniorbpy
 	pkgdesc = A CORBA object request broker for C++ and Python.
-	pkgver = 4.2.4
+	pkgver = 4.3.0
 	pkgrel = 1
 	url = http://omniorb.sourceforge.net/
-	arch = i686
 	arch = x86_64
 	license = LGPL
 	depends = omniorb
-	source = http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.4.tar.bz2
-	sha256sums = dae8d867559cc934002b756bc01ad7fabbc63f19c2d52f755369989a7a1d27b6
-
-pkgname = python-omniorbpy
-	depends = omniorb
 	depends = python
-	depends = omniorbpy-common
-
-pkgname = python2-omniorbpy
-	depends = omniorb
-	depends = python2
-	depends = omniorbpy-common
-	provides = omniorbpy
-	provides = pyorbit
-	conflicts = omniorbpy-omg
-	conflicts = pyorbit
-	replaces = omniorbpy
-
-pkgname = omniorbpy-common
+	provides = python-omniorbpy
+	source = http://downloads.sourceforge.net/omniorb/omniORBpy-4.3.0.tar.bz2
+	sha256sums = fffcfdfc34fd6e2fcc45d803d7d5db5bd4d188a747ff9f82b3684a753e001b4d
 
+pkgname = omniorbpy
diff --git a/PKGBUILD b/PKGBUILD
index de8aa7b063a1..5e7818465154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,74 +1,23 @@
-# Maintainer:  Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==>
-# Contributor: mickele
-# Contributor: Brice Méalier <mealier_brice *at* yahoo *dot* fr>
-# Contributor: Essien Ita Essien <me *at* essienitaessien *dot* com>
-# Contributor: Tobias Sandmann <tSa *at* gmx *dot* eu>
-# Contributor: pfm <nl081130 *at* yahoo *dot* de>
-# Contributor: mortbauer <mortbauer *at* gmail *dot* com>
- 
-pkgbase=omniorbpy
-pkgname=(python-omniorbpy python2-omniorbpy omniorbpy-common)
-pkgver=4.2.4
+pkgname=omniorbpy
+pkgver=4.3.0
 pkgrel=1
 pkgdesc="A CORBA object request broker for C++ and Python."
-arch=(i686 x86_64)
+arch=(x86_64)
 url="http://omniorb.sourceforge.net/"
 license=('LGPL')
-depends=('omniorb')
+depends=('omniorb' 'python')
+provides=('python-omniorbpy')
 source=(http://downloads.sourceforge.net/omniorb/omniORBpy-$pkgver.tar.bz2)
-sha256sums=('dae8d867559cc934002b756bc01ad7fabbc63f19c2d52f755369989a7a1d27b6')
+sha256sums=('fffcfdfc34fd6e2fcc45d803d7d5db5bd4d188a747ff9f82b3684a753e001b4d')
  
 build() {
-  cp -r "$srcdir/omniORBpy-$pkgver"{,-py2}
-
   cd "$srcdir/omniORBpy-$pkgver"
   ./configure PYTHON=/usr/bin/python --prefix=/usr
   make
-
-  cd "$srcdir/omniORBpy-$pkgver-py2"
-  ./configure PYTHON=/usr/bin/python2 --prefix=/usr
-  make
 }
 
-package_python-omniorbpy() {
-  depends+=('python' 'omniorbpy-common')
-
+package() {
   cd "$srcdir/omniORBpy-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  # remove conflicting files
-  rm -r "$pkgdir"/usr/include
-  rm "$pkgdir"/usr/lib/*/site-packages/omniidl_be/__init__.*
-  rm -r "$pkgdir"/usr/lib/*/site-packages/omniidl_be/__pycache__
- 
-  # adjust directory permissions
-  find "$pkgdir" -type d -exec chmod 755 '{}' +
-}
-
-package_python2-omniorbpy() {
-  depends+=('python2' 'omniorbpy-common')
-  conflicts=('omniorbpy-omg' 'pyorbit')
-  provides=('omniorbpy' 'pyorbit')
-  replaces=('omniorbpy')
-
-  cd "$srcdir/omniORBpy-$pkgver-py2"
-  make DESTDIR="$pkgdir" install
-
-  # remove conflicting files
-  rm -r "$pkgdir"/usr/include
-  rm "$pkgdir"/usr/lib/*/site-packages/omniidl_be/__init__.*
- 
-  # adjust directory permissions
-  find "$pkgdir" -type d -exec chmod 755 '{}' +
 }
 
-package_omniorbpy-common() {
-  cd "$srcdir/omniORBpy-$pkgver"
-  (cd include; make DESTDIR="$pkgdir" install)
-  (cd modules; make DESTDIR="$pkgdir" install)
-
-  # remove conflicting files
-  rm -rf "$pkgdir"/usr/lib
-  # adjust directory permissions
-  find "$pkgdir" -type d -exec chmod 755 '{}' +
-}