From 4f36ece4de4922b5cbe1887eb755f3a1be7b6010 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 10 Jun 2018 12:25:39 +0000
Subject: [PATCH] python-2.7.14: sync line offsets in patchset, update
 HOMEPAGE.

---
 .../python/patches/python-2.7.14.patchset     | 28 +++++++++----------
 dev-lang/python/python-2.7.14.recipe          |  6 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev-lang/python/patches/python-2.7.14.patchset b/dev-lang/python/patches/python-2.7.14.patchset
index 36d00cd67..31a1a184f 100644
--- a/dev-lang/python/patches/python-2.7.14.patchset
+++ b/dev-lang/python/patches/python-2.7.14.patchset
@@ -558,7 +558,7 @@ index 12c43b0..206b325 100644
  
          Py_BEGIN_ALLOW_THREADS
 diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
-index f03e488..d4b9d8c 100644
+index 70308e9..cd0da91 100644
 --- a/Python/bltinmodule.c
 +++ b/Python/bltinmodule.c
 @@ -19,7 +19,7 @@
@@ -584,10 +584,10 @@ index 40b1bce..4185370 100755
              elif sys.platform.startswith("atheos"):
                  searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
 diff --git a/configure.ac b/configure.ac
-index 1273465..93ae44b 100644
+index 780f275..feed5e0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -909,7 +909,7 @@ if test $enable_shared = "yes"; then
+@@ -908,7 +908,7 @@ if test $enable_shared = "yes"; then
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -596,7 +596,7 @@ index 1273465..93ae44b 100644
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-@@ -917,6 +917,9 @@ if test $enable_shared = "yes"; then
+@@ -916,6 +916,9 @@ if test $enable_shared = "yes"; then
  	      FreeBSD*)
  		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
  		;;
@@ -606,7 +606,7 @@ index 1273465..93ae44b 100644
  	  esac
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
-@@ -1018,7 +1021,7 @@ AC_PROG_MKDIR_P
+@@ -1014,7 +1017,7 @@ AC_PROG_MKDIR_P
  AC_SUBST(LN)
  if test -z "$LN" ; then
  	case $ac_sys_system in
@@ -615,7 +615,7 @@ index 1273465..93ae44b 100644
  		CYGWIN*) LN="ln -s";;
  		atheos*) LN="ln -s";;
  		*) LN=ln;;
-@@ -2211,7 +2214,7 @@ then
+@@ -2207,7 +2210,7 @@ then
  			BLDSHARED="$LDSHARED"
  		fi
  		;;
@@ -624,7 +624,7 @@ index 1273465..93ae44b 100644
  		LDSHARED='$(CC) -shared'
  		LDCXXSHARED='$(CXX) -shared';;
  	BSD/OS*/4*)
-@@ -2283,7 +2286,7 @@ then
+@@ -2279,7 +2282,7 @@ then
  		 then CCSHARED="-fPIC";
  		 else CCSHARED="+z";
  		 fi;;
@@ -633,7 +633,7 @@ index 1273465..93ae44b 100644
  	BSD/OS*/4*) CCSHARED="-fpic";;
  	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
  	OpenUNIX*|UnixWare*)
-@@ -2315,7 +2318,7 @@ then
+@@ -2311,7 +2314,7 @@ then
  	    LINKFORSHARED="-Wl,-E -Wl,+s";;
  #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
  	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
@@ -642,7 +642,7 @@ index 1273465..93ae44b 100644
  	# -u libsys_s pulls in all symbols in libsys
  	Darwin/*) 
  		# -u _PyMac_Error is needed to pull in the mac toolbox glue,
-@@ -2430,14 +2433,16 @@ case "$ac_sys_system" in
+@@ -2426,14 +2429,16 @@ case "$ac_sys_system" in
  esac
  
  # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
@@ -663,7 +663,7 @@ index 1273465..93ae44b 100644
  esac
  
  AC_MSG_CHECKING(for --with-libs)
-@@ -3776,7 +3781,7 @@ fi],
+@@ -3772,7 +3777,7 @@ fi],
  AC_SUBST(LIBM)
  case $ac_sys_system in
  Darwin) ;;
@@ -673,7 +673,7 @@ index 1273465..93ae44b 100644
  esac
  AC_MSG_CHECKING(for --with-libm=STRING)
 diff --git a/setup.py b/setup.py
-index 54054c2..bc0ae02 100644
+index 5503486..35c713d 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -541,6 +541,12 @@ class PyBuildExt(build_ext):
@@ -766,10 +766,10 @@ Subject: fix pyconfig.h path
 
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e288964..bf4f7ef 100644
+index 54e9480..1592b6e 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -110,7 +110,7 @@ BINDIR=		@bindir@
+@@ -109,7 +109,7 @@ BINDIR=		@bindir@
  LIBDIR=		@libdir@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
@@ -991,7 +991,7 @@ Subject: Haiku hasn't makedev(), _PyInt_FromDev isn't defined.
 
 
 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-index e73805f..515c61a 100644
+index a06c56e..1754d79 100644
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
 @@ -1483,6 +1483,8 @@ _pystat_fromstructstat(STRUCT_STAT *st)
diff --git a/dev-lang/python/python-2.7.14.recipe b/dev-lang/python/python-2.7.14.recipe
index 0b33a0ed4..445718c0b 100644
--- a/dev-lang/python/python-2.7.14.recipe
+++ b/dev-lang/python/python-2.7.14.recipe
@@ -8,10 +8,10 @@ and .NET virtual machines.
 Python is free to use, even for commercial products, because of its \
 OSI-approved open source license.
 "
-HOMEPAGE="http://www.python.org"
+HOMEPAGE="https://www.python.org/"
 LICENSE="Python"
-COPYRIGHT="1990-2017, Python Software Foundation"
-REVISION="1"
+COPYRIGHT="1990-2017 Python Software Foundation"
+REVISION="2"
 SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
 CHECKSUM_SHA256="71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66"
 SOURCE_DIR="Python-$portVersion"