remove python2 dependencies and packages

mk/python.mk

@@ -1,3 +0,0 @@
-PYTHON_VERSION=2.7
-PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib
-PYTHON:=${STAGING_HOST_DIR}/usr/bin/python

package/boost/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
 PKG_DESCR:=		portable c++ library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		python2-host
+PKG_BUILDDEP:=		python3-host
 PKG_NEEDS:=		c++
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
@@ -23,8 +23,8 @@ PKG_FLAVOURS_BOOST:=	DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS LOG MATH PROGRAM_O
 
 PKGFD_DATE_TIME:=	with date-time
 PKGFD_PYTHON:=		with python
-PKGFB_PYTHON:=		python2
-PKGFS_PYTHON:=		python2
+PKGFB_PYTHON:=		python3
+PKGFS_PYTHON:=		python3
 PKGFD_IOSTREAMS:=	with iostreams
 PKGFD_GRAPH:=		with graph
 PKGFD_GRAPH_PARALLEL:=	with graph_parallel
@@ -40,7 +40,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-include ${ADK_TOPDIR}/mk/python.mk
+include ${ADK_TOPDIR}/mk/python3.mk
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/bzr/Makefile

@@ -1,41 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted 
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		bzr
-PKG_VERSION:=		2.6.0
-PKG_RELEASE:=		1
-PKG_HASH:=		0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0
-PKG_DESCR:=		source code management system
-PKG_SECTION:=		dev/scm
-PKG_BUILDDEP:=		python2
-PKG_DEPENDS:=		python2
-PKG_URL:=		http://bazaar.canonical.com/en/
-PKG_SITES:=		https://launchpad.net/bzr/2.6/2.6.0/+download/
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-PKG_HOST_DEPENDS:=	!darwin
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,BZR,bzr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-include $(ADK_TOPDIR)/mk/python.mk
-
-do-build:
-	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix=$(WRKINST)/usr build_ext --allow-python-fallback
-
-do-install:
-	$(INSTALL_DIR) $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages
-	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \
-		$(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages
-	$(INSTALL_DIR) $(IDIR_BZR)/usr/bin
-	$(INSTALL_BIN) $(WRKBUILD)/bzr $(IDIR_BZR)/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/cherrypy/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		5fccc9ad3bf9a1df83bbb934772f34f42571421bdd75f90f74c170b6c0ef13b1
 PKG_DESCR:=		python web framework
 PKG_SECTION:=		dev/python	
-PKG_DEPENDS:=		python2
-PKG_BUILDDEP:=		python2
+PKG_DEPENDS:=		python3
+PKG_BUILDDEP:=		python3
 PKG_URL:=		http://www.cherrypy.org/
 PKG_SITES:=		https://pypi.python.org/packages/source/C/CherryPy/
 
@@ -25,7 +25,7 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-include $(ADK_TOPDIR)/mk/python.mk
+include $(ADK_TOPDIR)/mk/python3.mk
 
 do-build:
 	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build
@@ -35,6 +35,6 @@ do-install:
 	$(INSTALL_DIR) $(IDIR_CHERRYPY)/usr/bin
 	$(INSTALL_DIR) $(IDIR_CHERRYPY)/usr/lib/python$(PYTHON_VERSION)
 	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/* $(IDIR_CHERRYPY)/usr/lib/python$(PYTHON_VERSION)
-	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/cherrypy/cherryd $(IDIR_CHERRYPY)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/CherryPy-$(PKG_VERSION)-py3.9.egg/cherrypy/cherryd $(IDIR_CHERRYPY)/usr/bin
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/dbus-python/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		dbus-python
-PKG_VERSION:=		1.2.0
-PKG_RELEASE:=		2
-PKG_HASH:=		e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
+PKG_VERSION:=		1.3.2
+PKG_RELEASE:=		1
+PKG_HASH:=		ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8
 PKG_DESCR:=		python bindings for dbus
 PKG_SECTION:=		dev/python
 PKG_DEPENDS:=		dbus dbus-glib
@@ -20,15 +20,17 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DBUS_PYTHON,dbus-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+include $(ADK_TOPDIR)/mk/python3.mk
+
 dbus-python-install:
-	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/
-	$(CP) $(WRKINST)/usr/lib/python2.7/site-packages/*.so \
-		$(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/
-	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus
-	$(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/*.py \
-		$(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/
-	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
-	$(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/mainloop/*.py \
-		$(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
+	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/
+	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*.so \
+		$(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/
+	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus
+	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/*.py \
+		$(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/
+	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/mainloop
+	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/mainloop/*.py \
+		$(IDIR_DBUS_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages/dbus/mainloop
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/dbus-python/patches/patch-configure

@@ -1,11 +0,0 @@
---- dbus-python-1.2.0.orig/configure	2013-05-08 09:48:42.000000000 +0200
-+++ dbus-python-1.2.0/configure	2013-12-13 12:52:44.522656370 +0100
-@@ -11762,7 +11762,7 @@ $as_echo "$as_me: PYTHON_INCLUDES overri
- else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5
- $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; }
--  PYTHON_INCLUDES=`$PYTHON-config --includes`
-+  PYTHON_INCLUDES=`python-config --includes`
-   if test $? = 0; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5
- $as_echo "$PYTHON_INCLUDES" >&6; }

package/gpsd/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
-PKG_VERSION:=		3.16
+PKG_VERSION:=		3.24
 PKG_RELEASE:=		1
-PKG_HASH:=		03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
+PKG_HASH:=		00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c
 PKG_DESCR:=		interface daemon for gps receivers
 PKG_SECTION:=		sys/hw
 PKG_BUILDDEP:=		scons-host ncurses
@@ -31,7 +31,7 @@ INSTALL_STYLE:=		manual
 
 do-install:
 	(cd $(WRKBUILD); env PATH='$(TARGET_PATH)' CCFLAGS='' DESTDIR='$(WRKINST)' \
-		scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no)
+		$(STAGING_HOST_DIR)/usr/bin/python3 $(STAGING_HOST_DIR)/usr/bin/scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no)
 
 gpsd-install:
 	${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin

package/gpsd/patches/patch-SConstruct

@@ -1,12 +0,0 @@
---- gpsd-3.10.orig/SConstruct	2013-11-22 14:10:01.000000000 +0100
-+++ gpsd-3.10/SConstruct	2014-02-07 19:33:32.000000000 +0100
-@@ -231,6 +231,9 @@ for (name, default, help) in pathopts:
- 
- env['VERSION'] = gpsd_version
- env['PYTHON'] = sys.executable
-+env['PLATFORM'] = "posix"
-+env['SHLIBSUFFIX'] = ".so"
-+env['SHLINKFLAGS'] = "-shared"
- 
- # Set defaults from environment.  Note that scons doesn't cope well
- # with multi-word CPPFLAGS/LDFLAGS/SHLINKFLAGS values; you'll have to

package/gpsd/patches/patch-gpsmon_c

@@ -1,13 +0,0 @@
---- gpsd-3.10.orig/gpsmon.c	2013-11-21 09:57:44.000000000 +0100
-+++ gpsd-3.10/gpsmon.c	2014-03-16 09:08:34.000000000 +0100
-@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma
-     static char line[80];
-     int c;
- 
-+#ifndef __GLIBC__
-+#define CTRL(x)     (x&037)
-+#endif
-+
-     c = wgetch(cmdwin);
-     if (c == CTRL('L')) {
- 	(void)clearok(stdscr, true);

package/grub/Makefile

@@ -10,7 +10,7 @@ PKG_HASH:=		b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
 PKG_DESCR:=		multiboot boot loader
 PKG_SECTION:=		base/boot
 PKG_BUILDDEP:=		bison-host grub-host
-HOST_BUILDDEP:=		python2-host
+HOST_BUILDDEP:=		python3-host
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		https://ftp.gnu.org/gnu/grub/
 PKG_NOPARALLEL:=	1

package/jack/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_DESCR:=		audio connection kit (v1)
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib libsndfile libsamplerate libdb
-PKG_BUILDDEP:=		db python2-host alsa-lib libsndfile libsamplerate
+PKG_BUILDDEP:=		db python3-host alsa-lib libsndfile libsamplerate
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://jackaudio.org
 PKG_SITES:=		https://github.com/jackaudio/jack1.git

package/jack2/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		jack2
-PKG_VERSION:=		31d4ae97f296fe1c954cbb51e50d5e60578260b8
+PKG_VERSION:=		99e5d115ea47f6673ef741ce5633e57661f63510
 PKG_RELEASE:=		1
 PKG_GIT:=		hash
 PKG_DESCR:=		audio connection kit (v2)
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib libsndfile libsamplerate
-PKG_BUILDDEP:=		python2-host alsa-lib libsndfile libsamplerate
+PKG_BUILDDEP:=		python3-host alsa-lib libsndfile libsamplerate
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://jackaudio.org
 PKG_SITES:=		https://github.com/jackaudio/jack2.git

package/jack2/patches/patch-wscript

@@ -1,23 +0,0 @@
---- jack2-31d4ae97f296fe1c954cbb51e50d5e60578260b8.orig/wscript	2017-06-01 19:03:37.000000000 +0200
-+++ jack2-31d4ae97f296fe1c954cbb51e50d5e60578260b8/wscript	2017-06-01 19:10:22.063929110 +0200
-@@ -506,8 +506,6 @@ def configure(conf):
-         if conf.env['BUILD_JACKDBUS'] != True:
-             conf.fatal('jackdbus was explicitly requested but cannot be built')
- 
--    conf.recurse('example-clients')
--
-     # test for the availability of ucontext, and how it should be used
-     for t in ("gp_regs", "uc_regs", "mc_gregs", "gregs"):
-         fragment = "#include <ucontext.h>\n"
-@@ -1016,11 +1014,6 @@ def build(bld):
- 
-     build_drivers(bld)
- 
--    bld.recurse('example-clients')
--    if bld.env['IS_LINUX']:
--        bld.recurse('man')
--    if not bld.env['IS_WINDOWS']:
--        bld.recurse('tests')
-     if bld.env['BUILD_JACKDBUS']:
-         bld.recurse('dbus')
- 

package/py-spidev/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_GIT:=		hash
 PKG_DESCR:=		module for interfacing with spi devices from user space via the spidev linux kernel driver
 PKG_SECTION:=		dev/python
-PKG_DEPENDS:=		python2
-PKG_BUILDDEP:=		python2
+PKG_DEPENDS:=		python3
+PKG_BUILDDEP:=		python3
 PKG_URL:=		https://github.com/doceme/py-spidev
 PKG_SITES:=		https://github.com/doceme/py-spidev.git
 
@@ -18,7 +18,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PY_SPIDEV,py-spidev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-include $(ADK_TOPDIR)/mk/python.mk
+include $(ADK_TOPDIR)/mk/python3.mk
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/pycurl/Makefile

@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		pycurl
-PKG_VERSION:=		7.19.0.2
+PKG_VERSION:=		7.45.2
 PKG_RELEASE:=		1
-PKG_HASH:=		7a9e793b9181654d5eef3f6d22c244c57d2b51d38feb4c1b71d68efda99b0547
+PKG_HASH:=		5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca
 PKG_DESCR:=		python module for fetching of files
 PKG_SECTION:=		dev/python
-PKG_BUILDDEP:=		python2 curl
-PKG_DEPENDS:=		python2 libcurl
-PKG_URL:=		http://pycurl.sourceforge.net/
-PKG_SITES:=		http://pycurl.sourceforge.net/download/
+PKG_BUILDDEP:=		python3 curl
+PKG_DEPENDS:=		python3 libcurl
+PKG_URL:=		http://pycurl.io/
+PKG_SITES:=		https://files.pythonhosted.org/packages/a8/af/24d3acfa76b867dbd8f1166853c18eefc890fc5da03a48672b38ea77ddae/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
@@ -28,7 +28,7 @@ TARGET_CFLAGS+=		-fPIC
 MAKE_ENV+=		LDSHARED="$(TARGET_CC) -shared"
 CURL_CONFIG:=		$(STAGING_TARGET_DIR)/usr/bin/curl-config
 
-include $(ADK_TOPDIR)/mk/python.mk
+include $(ADK_TOPDIR)/mk/python3.mk
 
 do-build:
 	(cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py --curl-config=$(CURL_CONFIG) build)

package/pycurl/patches/patch-setup_py

@@ -1,12 +0,0 @@
---- pycurl-7.19.0.orig/setup.py	2008-09-09 19:40:34.000000000 +0200
-+++ pycurl-7.19.0/setup.py	2011-10-14 17:59:41.000000000 +0200
-@@ -115,9 +115,6 @@ else:
-             define_macros.append(('HAVE_CURL_SSL', 1))
-     if not libraries:
-         libraries.append("curl")
--    # Add extra compile flag for MacOS X
--    if sys.platform[:-1] == "darwin":
--        extra_link_args.append("-flat_namespace")
- 
- 
- ###############################################################################

package/pyrex/Makefile

@@ -1,38 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		Pyrex
-PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		3
-PKG_HASH:=		5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50
-PKG_DESCR:=		mixes python and c data types
-PKG_SECTION:=		dev/python
-PKG_DEPENDS:=		python2
-PKG_URL:=		http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
-PKG_SITES:=		http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,PYREX,pyrex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-include $(ADK_TOPDIR)/mk/python.mk
-
-do-build:
-	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build
-	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(STAGING_HOST_DIR)/usr"
-	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr"
-
-do-install:
-	$(INSTALL_DIR) $(IDIR_PYREX)/usr/lib/python$(PYTHON_VERSION)
-	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/* \
-		$(IDIR_PYREX)/usr/lib/python$(PYTHON_VERSION)
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/scons/Makefile

@@ -4,19 +4,21 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		scons
-PKG_VERSION:=		2.3.0
-PKG_RELEASE:=		2
-PKG_HASH:=		9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b
+PKG_VERSION:=		3.1.2
+PKG_RELEASE:=		1
+PKG_HASH:=		7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb
 PKG_DESCR:=		software construction tool
 PKG_SECTION:=		dev/tools
-HOST_BUILDDEP:=		python2-host
+HOST_BUILDDEP:=		python3-host
 PKG_URL:=		http://www.scons.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=scons/}
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-${PKG_VERSION}.tar.gz
 
 PKG_CFLINE_SCONS:=	depends on ADK_HOST_ONLY
 
+#WRKDIST=		${WRKDIR}/SCons-${PKG_VERSION}
+
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -26,7 +28,7 @@ HOST_STYLE:=		manual
 
 scons-hostinstall:
 	(cd $(WRKBUILD); PATH='$(HOST_PATH)' python setup.py install \
-		--prefix=$(STAGING_HOST_DIR)/usr)
+		--prefix=$(STAGING_HOST_DIR)/usr --install-lib=$(STAGING_HOST_DIR)/lib/scons-$(PKG_VERSION))
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/talloc/Makefile

@@ -4,12 +4,12 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		talloc
-PKG_VERSION:=		2.1.9
+PKG_VERSION:=		2.3.4
 PKG_RELEASE:=		1
-PKG_HASH:=		f0aad4cb88a3322207c82136ddc07bed48a37c2c21f82962d6c5ccb422711062
+PKG_HASH:=		179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505
 PKG_DESCR:=		memory allocation library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		python2-host python2
+PKG_BUILDDEP:=		python3-host python3
 PKG_URL:=		https://talloc.samba.org/talloc/doc/html/index.html
 PKG_SITES:=		https://www.samba.org/ftp/talloc/
 PKG_LIBNAME:=		libtalloc

package/urlgrabber/Makefile

@@ -1,38 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		urlgrabber
-PKG_VERSION:=		3.10
-PKG_RELEASE:=		1
-PKG_HASH:=		151474dcba8ad99a98eb1f18873bd888e8bfd68fd71a280991899e932689dc89
-PKG_DESCR:=		python module for fetching of files
-PKG_SECTION:=		dev/python
-PKG_BUILDDEP:=		pycurl
-PKG_DEPENDS:=		pycurl
-PKG_URL:=		http://urlgrabber.baseurl.org/
-PKG_SITES:=		http://urlgrabber.baseurl.org/download/
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,URLGRABBER,urlgrabber,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-include $(ADK_TOPDIR)/mk/python.mk
-
-do-build:
-	(cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build)
-	(cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr")
-
-do-install:
-	$(INSTALL_DIR) $(IDIR_URLGRABBER)/usr/lib/python$(PYTHON_VERSION)/site-packages
-	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \
-		$(IDIR_URLGRABBER)/usr/lib/python$(PYTHON_VERSION)/site-packages
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/urlgrabber/patches/patch-setup_py

@@ -1,24 +0,0 @@
---- urlgrabber-3.9.1.orig/setup.py	2009-02-23 22:37:16.000000000 +0100
-+++ urlgrabber-3.9.1/setup.py	2013-02-11 13:46:37.000000000 +0100
-@@ -1,16 +1,16 @@
- # urlgrabber distutils setup
- import re as _re
--import urlgrabber as _urlgrabber
-+#import urlgrabber as _urlgrabber
- 
- name = "urlgrabber"
- description = "A high-level cross-protocol url-grabber"
--long_description = _urlgrabber.__doc__
-+long_description = "A high-level cross-protocol url-grabber"
- license = "LGPL"
--version = _urlgrabber.__version__
--_authors = _re.split(r',\s+', _urlgrabber.__author__)
-+version = "3.9.1"
-+_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko')
- author       = ', '.join([_re.sub(r'\s+<.*',        r'', _) for _ in _authors])
- author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors])
--url = _urlgrabber.__url__
-+url = "http://linux.duke.edu/projects/urlgrabber/"
- 
- packages = ['urlgrabber']
- package_dir = {'urlgrabber':'urlgrabber'}