Update for new version

Split package into Python 3 and 2 versions

2 files changed, 63 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0078b10f8697..18d524527ab9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,29 @@
 pkgbase = omniorbpy
-	pkgdesc = omniORB is a CORBA object request broker for C++ and Python.
-	pkgver = 4.2.3
+	pkgdesc = A CORBA object request broker for C++ and Python.
+	pkgver = 4.2.4
 	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
-	source = http://downloads.sourceforge.net/omniorb/omniORBpy-4.2.3.tar.bz2
-	sha256sums = 5c601888e57c7664324357a1be50f2739c468057b46fba29821a25069fc0aee5
+	replaces = omniorbpy
 
-pkgname = omniorbpy
+pkgname = omniorbpy-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 0680f5528b59..de8aa7b063a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,32 +6,69 @@
 # Contributor: pfm <nl081130 *at* yahoo *dot* de>
 # Contributor: mortbauer <mortbauer *at* gmail *dot* com>
  
-pkgname=omniorbpy
-pkgver=4.2.3
+pkgbase=omniorbpy
+pkgname=(python-omniorbpy python2-omniorbpy omniorbpy-common)
+pkgver=4.2.4
 pkgrel=1
-pkgdesc="omniORB is a CORBA object request broker for C++ and Python."
+pkgdesc="A CORBA object request broker for C++ and Python."
 arch=(i686 x86_64)
 url="http://omniorb.sourceforge.net/"
 license=('LGPL')
-depends=('omniorb' 'python2')
-conflicts=('omniorbpy-omg' 'pyorbit')
-provides=('pyorbit')
+depends=('omniorb')
 source=(http://downloads.sourceforge.net/omniorb/omniORBpy-$pkgver.tar.bz2)
-sha256sums=('5c601888e57c7664324357a1be50f2739c468057b46fba29821a25069fc0aee5')
+sha256sums=('dae8d867559cc934002b756bc01ad7fabbc63f19c2d52f755369989a7a1d27b6')
  
 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() {
+
+package_python-omniorbpy() {
+  depends+=('python' 'omniorbpy-common')
+
   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 "$pkgdir"/usr/lib/*/site-packages/omniidl_be/__init__.py*
+  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 '{}' +
+}