Rid python2.

2 files changed, 24 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e97ff1bc0229..a037ba16e805 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -39,17 +39,12 @@ pkgname = gnatcoll-omp
 	pkgdesc = GNAT Components Collection - Bindings to OpenMP
 	depends = gnatcoll-core
 
-pkgname = gnatcoll-python2
-	pkgdesc = GNAT Components Collection - Interface to the python 2 interpreter.
-	depends = python2
-	depends = gnatcoll-core
-	provides = gnatcoll-python
-	replaces = gnatcoll-python
-
-pkgname = gnatcoll-python3
+pkgname = gnatcoll-python
 	pkgdesc = GNAT Components Collection - Interface to the python 3 interpreter.
 	depends = python
 	depends = gnatcoll-core
+	provides = gnatcoll-python
+	replaces = gnatcoll-python
 
 pkgname = gnatcoll-readline
 	pkgdesc = GNAT Components Collection - Bindings to readline
diff --git a/PKGBUILD b/PKGBUILD
index 6292cc04d7d0..a0d4acd62dbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ pkgname=(
     gnatcoll-iconv
     gnatcoll-lzma
     gnatcoll-omp
-    gnatcoll-python2
-    gnatcoll-python3
+#    gnatcoll-python2
+    gnatcoll-python
     gnatcoll-readline
     gnatcoll-syslog
     gnatcoll-zlib
@@ -48,9 +48,9 @@ build()
     patch -p1 < "$srcdir/0001-fix-omp-read-version-information-file-in-text-mode.patch"
     patch -p1 < "$srcdir/0002-fix-python-don-t-cache-prefix-during-install.patch"
 
-    cd "$srcdir/$_source_dir/python"
-    # --gpr-opts reads all remaining arguments, so no quotes
-    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+#    cd "$srcdir/$_source_dir/python"
+#    # --gpr-opts reads all remaining arguments, so no quotes
+#    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/python3"
     python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
@@ -92,23 +92,25 @@ _install_license()
        "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME"
 }
 
-package_gnatcoll-python2()
-{
-    pkgdesc='GNAT Components Collection - Interface to the python 2 interpreter.'
-    depends=('python2' 'gnatcoll-core')
-    provides=('gnatcoll-python')
-    replaces=('gnatcoll-python')
-
-    cd "$srcdir/$_source_dir/python"
-    python setup.py install --prefix="$pkgdir/usr"
-
-    _install_license
-}
-
-package_gnatcoll-python3()
+#package_gnatcoll-python2()
+#{
+#    pkgdesc='GNAT Components Collection - Interface to the python 2 interpreter.'
+#    depends=('python2' 'gnatcoll-core')
+#    provides=('gnatcoll-python')
+#    replaces=('gnatcoll-python')
+#
+#    cd "$srcdir/$_source_dir/python"
+#    python setup.py install --prefix="$pkgdir/usr"
+#
+#    _install_license
+#}
+
+package_gnatcoll-python()
 {
     pkgdesc='GNAT Components Collection - Interface to the python 3 interpreter.'
     depends=('python' 'gnatcoll-core')
+    provides=('gnatcoll-python')
+    replaces=('gnatcoll-python')
 
     cd "$srcdir/$_source_dir/python3"
     python setup.py install --prefix="$pkgdir/usr"