From 0b7f1bbb8fb1b9555bf44468594e0fd6d37a3b57 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Fri, 12 Apr 2019 10:17:48 +0200
Subject: [PATCH] SIP: bump, patches upstreamed (#3755)

---
 dev-python/sip/patches/sip-4.19.15.patch      | 110 ------------------
 ...{sip-4.19.15.recipe => sip-4.19.16.recipe} |   5 +-
 2 files changed, 2 insertions(+), 113 deletions(-)
 delete mode 100644 dev-python/sip/patches/sip-4.19.15.patch
 rename dev-python/sip/{sip-4.19.15.recipe => sip-4.19.16.recipe} (95%)

diff --git a/dev-python/sip/patches/sip-4.19.15.patch b/dev-python/sip/patches/sip-4.19.15.patch
deleted file mode 100644
index a96808e76..000000000
--- a/dev-python/sip/patches/sip-4.19.15.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/configure.py b/configure.py
-index 82140ac..ae39af3 100644
---- a/configure.py
-+++ b/configure.py
-@@ -152,7 +152,8 @@ def set_build_platform():
-         "sunos5":       "solaris-cc",
-         "ultrix":       "ultrix-g++",
-         "unix_sv":      "unixware-g++",
--        "unixware":     "unixware-cc"
-+        "unixware":     "unixware-cc",
-+        "haiku1":		"haiku-g++"
-     }
- 
-     build_platform = "none"
-diff --git a/specs/haiku-g++ b/specs/haiku-g++
-new file mode 100644
-index 0000000..728f10b
---- /dev/null
-+++ b/specs/haiku-g++
-@@ -0,0 +1,90 @@
-+#
-+# qmake configuration for haiku-g++
-+#
-+
-+MAKEFILE_GENERATOR	= UNIX
-+TEMPLATE		= app
-+CONFIG			+= qt warn_on release incremental link_prl
-+QT			+= core gui
-+QMAKE_INCREMENTAL_STYLE = sublib
-+
-+QMAKE_CC		= gcc
-+QMAKE_LEX		= flex
-+QMAKE_LEXFLAGS		=
-+QMAKE_YACC		= yacc
-+QMAKE_YACCFLAGS		= -d
-+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
-+QMAKE_YACC_HEADER       = $base.tab.h
-+QMAKE_YACC_SOURCE       = $base.tab.c
-+QMAKE_CFLAGS		= -pipe
-+QMAKE_CFLAGS_DEPS	= -M
-+QMAKE_CFLAGS_WARN_ON	= -Wall -W
-+QMAKE_CFLAGS_WARN_OFF	= -w
-+QMAKE_CFLAGS_RELEASE	= -O2
-+QMAKE_CFLAGS_DEBUG	= -g
-+QMAKE_CFLAGS_SHLIB	= -fPIC
-+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
-+QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
-+
-+QMAKE_CXX		= g++
-+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-+QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
-+
-+QMAKE_INCDIR		=
-+QMAKE_LIBDIR		=
-+QMAKE_INCDIR_X11	=
-+QMAKE_LIBDIR_X11	=
-+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-+QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
-+QMAKE_INCDIR_OPENGL	=
-+QMAKE_LIBDIR_OPENGL	=
-+
-+QMAKE_LINK		= g++
-+QMAKE_LINK_SHLIB	= g++
-+QMAKE_LFLAGS		=
-+QMAKE_LFLAGS_RELEASE	=
-+QMAKE_LFLAGS_DEBUG	=
-+QMAKE_LFLAGS_SHLIB	= -shared
-+QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-+QMAKE_LFLAGS_SONAME	= -Wl,-soname,
-+QMAKE_LFLAGS_THREAD	=
-+QMAKE_RPATH		= -Wl,-rpath,
-+
-+QMAKE_LIBS		=
-+QMAKE_LIBS_DYNLOAD	= -ldl
-+QMAKE_LIBS_X11		=
-+QMAKE_LIBS_X11SM	=
-+QMAKE_LIBS_NIS		= -lnsl
-+QMAKE_LIBS_OPENGL	= -lGLU -lGL
-+QMAKE_LIBS_OPENGL_QT	= -lGL
-+QMAKE_LIBS_THREAD	= -lroot
-+
-+QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
-+QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
-+
-+QMAKE_AR		= ar cqs
-+QMAKE_RANLIB		=
-+
-+QMAKE_TAR		= tar -cf
-+QMAKE_GZIP		= gzip -9f
-+
-+QMAKE_COPY		= cp -f
-+QMAKE_COPY_FILE         = $(COPY)
-+QMAKE_COPY_DIR          = $(COPY) -r
-+QMAKE_MOVE		= mv -f
-+QMAKE_DEL_FILE		= rm -f
-+QMAKE_DEL_DIR		= rmdir
-+QMAKE_STRIP             = strip
-+QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
-+QMAKE_CHK_DIR_EXISTS	= test -d
-+QMAKE_MKDIR		= mkdir -p
-+load(qt_config)
diff --git a/dev-python/sip/sip-4.19.15.recipe b/dev-python/sip/sip-4.19.16.recipe
similarity index 95%
rename from dev-python/sip/sip-4.19.15.recipe
rename to dev-python/sip/sip-4.19.16.recipe
index 0be80bc50..3cbfb8525 100644
--- a/dev-python/sip/sip-4.19.15.recipe
+++ b/dev-python/sip/sip-4.19.16.recipe
@@ -9,10 +9,9 @@ LICENSE="GNU GPL v2
 	GNU GPL v3
 	SIP"
 REVISION="1"
-SOURCE_URI="https://www.riverbankcomputing.com/static/Downloads/sip/sip-$portVersion.tar.gz"
-CHECKSUM_SHA256="2b5c0b2c0266b467b365c21376d50dde61a3236722ab87ff1e8dacec283eb610"
+SOURCE_URI="https://www.riverbankcomputing.com/static/Downloads/sip/$portVersion/sip-$portVersion.tar.gz"
+CHECKSUM_SHA256="184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620"
 SOURCE_DIR="sip-$portVersion"
-PATCHES="sip-$portVersion.patch"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 if [ "$targetArchitecture" = "x86_gcc2" ]; then