python/python2-pybluez: Renamed from pybluez

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

10 files changed, 29 insertions, 55 deletions

diff --git a/desktop/kanyremote/kanyremote.info b/desktop/kanyremote/kanyremote.info
index 52605017ab..b2fa00417a 100644
--- a/desktop/kanyremote/kanyremote.info
+++ b/desktop/kanyremote/kanyremote.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/anyremote/kanyremote/6.1/kany
 MD5SUM="5378398883c486d1f2b853423ea119b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="anyremote pybluez"
+REQUIRES="anyremote python2-pybluez"
 MAINTAINER="otzy_007"
 EMAIL="oz [at] oprod [dot] net"
diff --git a/multimedia/kodi/README b/multimedia/kodi/README
index fb2bf88043..1d4038e386 100644
--- a/multimedia/kodi/README
+++ b/multimedia/kodi/README
@@ -5,8 +5,8 @@ viewing and playing a vast library of audio, video and image formats.
 Kodi has a sophisticated library management system that allows you to
 organize all your media to give you quick and immediate access.
 
-Optional dependencies: libcec, libnfs, lirc, cwiid, pybluez, avahi, 
-                       shairplay, and openjdk
+Optional dependencies: libcec, libnfs, lirc, cwiid, python2-pybluez,
+                       avahi, shairplay, and openjdk
 
 Optional: libcrystalhd (not available at slackbuilds.org)
 
diff --git a/office/wammu/README b/office/wammu/README
index 8f56f6c05d..f171b7da1e 100644
--- a/office/wammu/README
+++ b/office/wammu/README
@@ -1,4 +1,4 @@
 Mobile phone manager using Gammu as it's backend. It works with any
 phone Gammu supports - many Nokias, Siemens, Alcatel, ...
 
-pybluez is an optional dependency (for bluetooth support).
+python2-pybluez is an optional dependency (for bluetooth support).
diff --git a/python/nxt-python/nxt-python.info b/python/nxt-python/nxt-python.info
index c0554514c3..d36d2f271d 100644
--- a/python/nxt-python/nxt-python.info
+++ b/python/nxt-python/nxt-python.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Eelviny/nxt-python/archive/v2.2.2/nxt-python-2.2.2.
 MD5SUM="5bd1f018cef143f3c1184847db6a9e1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyusb pybluez"
+REQUIRES="pyusb python2-pybluez"
 MAINTAINER="klaatu"
 EMAIL="klaatu@member.fsf.org"
diff --git a/python/pybluez/pybluez-2to3.patch b/python/pybluez/pybluez-2to3.patch
deleted file mode 100644
index e15309db44..0000000000
--- a/python/pybluez/pybluez-2to3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 64ca3fd1568e56f2d0e1fe992f3a0f5ba57ea694 Mon Sep 17 00:00:00 2001
-From: Stephen Abraham <stephenabraham@tophatorbotics.com>
-Date: Mon, 13 Sep 2021 16:22:46 -0400
-Subject: [PATCH] Removed 2to3 command
-
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index c9de5c9..6a80b4e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -127,7 +127,6 @@ def finalize_options(self):
-       license='GPL',
-       extras_require={'ble': ['gattlib']},
-       package_dir=package_dir,
--      use_2to3=True,
-       install_requires=install_requires,
-       package_data=package_data,
-       eager_resources=eager_resources,
diff --git a/python/pybluez/slack-desc b/python/pybluez/slack-desc
deleted file mode 100644
index 3371d219dd..0000000000
--- a/python/pybluez/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-pybluez: pybluez (Python BlueZ bindings)
-pybluez:
-pybluez: Python extension module allowing access to system Bluetooth
-pybluez: resources.
-pybluez:
-pybluez: Homepage: https://pybluez.github.io/
-pybluez:
-pybluez:
-pybluez:
-pybluez:
-pybluez:
diff --git a/python/pybluez/README b/python/python2-pybluez/README
index 90f6019f56..90f6019f56 100644
--- a/python/pybluez/README
+++ b/python/python2-pybluez/README
diff --git a/python/pybluez/pybluez.SlackBuild b/python/python2-pybluez/python2-pybluez.SlackBuild
index c04a9efc51..6e6d6a8b81 100644
--- a/python/pybluez/pybluez.SlackBuild
+++ b/python/python2-pybluez/python2-pybluez.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Slackware build script for pybluez
+# Slackware build script for python2-pybluez
 
-# Copyright 2009-2021 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2009-2022 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=pybluez
+PRGNAM=python2-pybluez
 SRCNAM=PyBluez
 VERSION=${VERSION:-0.23}
 BUILD=${BUILD:-1}
@@ -77,11 +77,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Don't use 2to3 support anymore
-patch -p1 -i $CWD/pybluez-2to3.patch
-
-python3 setup.py install --root=$PKG
-
 # Fix python2 support
 sed -i '50,$d' bluetooth/__init__.py
 
diff --git a/python/pybluez/pybluez.info b/python/python2-pybluez/python2-pybluez.info
index 97070c4479..88d00dc9a5 100644
--- a/python/pybluez/pybluez.info
+++ b/python/python2-pybluez/python2-pybluez.info
@@ -1,10 +1,10 @@
-PRGNAM="pybluez"
+PRGNAM="python2-pybluez"
 VERSION="0.23"
 HOMEPAGE="https://pybluez.github.io/"
 DOWNLOAD="https://files.pythonhosted.org/packages/08/9f/e9d93b266d2d1ea988780a52a696073ba0a65df65a532165fdf6ff90d0ed/PyBluez-0.23.tar.gz"
 MD5SUM="afbe8429bb82d2c46a3d0f5f4f898f9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python2-gattlib python3-gattlib"
+REQUIRES="python2-gattlib"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@slackbuilds.org"
diff --git a/python/python2-pybluez/slack-desc b/python/python2-pybluez/slack-desc
new file mode 100644
index 0000000000..eb2a013d01
--- /dev/null
+++ b/python/python2-pybluez/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python2-pybluez: python2-pybluez (Python BlueZ bindings)
+python2-pybluez:
+python2-pybluez: Python extension module allowing access to system Bluetooth
+python2-pybluez: resources.
+python2-pybluez:
+python2-pybluez: Homepage: https://pybluez.github.io/
+python2-pybluez:
+python2-pybluez:
+python2-pybluez:
+python2-pybluez:
+python2-pybluez: