xbps-src: do not hardcode python3 version

srcpkgs/gdb/template

@@ -19,9 +19,9 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=97dcc3169bd430270fc29adb65145846a58c1b55cdbb73382a4a89307bdad03c
 
 if [ "${CROSS_BUILD}" ]; then
-	# Make python2.7 detection work in cross builds
-	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python3.6m"
-	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python3.6m"
+	# Make python3.x detection work in cross builds
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
 fi
 # Package build options
 build_options="gdbserver static python"

srcpkgs/kdevelop-python/template

@@ -9,8 +9,7 @@ makedepends="python3-devel qt5-devel knewstuff-devel kitemmodels-devel
  threadweaver-devel ktexteditor-devel kcmutils-devel knotifyconfig-devel
  grantlee5-devel kdevelop-devel"
 pycompile_dirs="usr/share/kdevpythonsupport"
-pycompile_version="3.6"
-python_version="3"
+pycompile_version="$py3_ver"
 short_desc="Python 3 language and Django project support for KDevelop"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2"

srcpkgs/kitty/template

@@ -21,7 +21,7 @@ fi
 
 do_build() {
 	if [ -n "$CROSS_BUILD" ]; then
-		export CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.6m"
+		export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 		sed -i "s|-fpie|-fpie ${CFLAGS}|g" setup.py
 	fi
 	case "$XBPS_TARGET_MACHINE" in

srcpkgs/python-hypothesis/template

@@ -28,7 +28,7 @@ do_check() {
 
 	# Add variables that will be used by python to find the local
 	# hypothesis build
-	PY3PATH="${PWD}/build-3.6/lib"
+	PY3PATH="${PWD}/build-${py3_ver}/lib"
 	PY2PATH="${PWD}/build-2.7/lib"
 
 	PYTHONPATH="${PY3PATH}" python3 -m pytest tests/cover