Unsplit package

2 files changed, 13 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ac7b4db2cf0..e00d054be8e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = pyatspi-git
+pkgbase = python-atspi-git
 	pkgver = 2.26.0+0+g813ba13
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/pyatspi2
@@ -9,22 +9,14 @@ pkgbase = pyatspi-git
 	makedepends = at-spi2-core
 	makedepends = gnome-common
 	makedepends = git
+	depends = python-gobject
+	depends = at-spi2-core
+	provides = python-atspi
+	conflicts = python-atspi
 	source = git+https://gitlab.gnome.org/GNOME/pyatspi2.git#commit=813ba139a46c071103efd45ec65481213974f07f
 	source = async-fix.diff
 	sha256sums = SKIP
 	sha256sums = ab4f8acf08e4661bbb0388995dcb45e4e103b59b16fcdd8a77b097722ebb1893
 
 pkgname = python-atspi-git
-	pkgdesc = Python 3 bindings for at-spi
-	depends = python-gobject
-	depends = at-spi2-core
-	provides = python-atspi
-	conflicts = python-atspi
-
-pkgname = python2-atspi-git
-	pkgdesc = Python 2 bindings for at-spi
-	depends = python2-gobject
-	depends = at-spi2-core
-	provides = python2-atspi
-	conflicts = python2-atspi
 
diff --git a/PKGBUILD b/PKGBUILD
index 768263699a82..86ddfe086fbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,16 @@
 # Contributor: Peter Vágner <pvdeejay@jabber.cz>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
-pkgbase=pyatspi-git
-pkgname=(python-atspi-git python2-atspi-git)
+pkgname=python-atspi-git
 pkgver=2.26.0+0+g813ba13
 pkgrel=1
 arch=('any')
 url="https://gitlab.gnome.org/GNOME/pyatspi2"
 license=('GPL2')
+depends=('python-gobject' 'at-spi2-core')
 makedepends=('python-gobject' 'python2-gobject' 'at-spi2-core' 'gnome-common' 'git')
+provides=(python-atspi)
+conflicts=(python-atspi)
 
 _commit=813ba139a46c071103efd45ec65481213974f07f  # tags/PYATSPI_2_26_0^0
 source=("git+https://gitlab.gnome.org/GNOME/pyatspi2.git#commit=$_commit"
@@ -32,33 +34,13 @@ prepare() {
   NOCONFIGURE=1 ./autogen.sh
 }
 
-_build() (
-  cd python$1
-  ../pyatspi2/configure --prefix=/usr --with-python=/usr/bin/python$1
+build() (
+  cd python3
+  ../pyatspi2/configure --prefix=/usr --with-python=/usr/bin/python3
   make
 )
 
-build() {
-  _build 2
-  _build 3
-}
-
-package_python-atspi-git() {
-  pkgdesc="Python 3 bindings for at-spi"
-  depends=(python-gobject at-spi2-core)
-  provides=(python-atspi)
-  conflicts=(python-atspi)
-
+package() {
   cd python3
   make DESTDIR="$pkgdir" install
 }
-
-package_python2-atspi-git() {
-  pkgdesc="Python 2 bindings for at-spi"
-  depends=(python2-gobject at-spi2-core)
-  provides=(python2-atspi)
-  conflicts=(python2-atspi)
-
-  cd python2
-  make DESTDIR="$pkgdir" install
-}