dev-qt/qt3support: Fix socklen_t detection. Bug #553936

4 files changed, 174 insertions, 0 deletions

diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
new file mode 100644
index 00000000..166d528a
--- /dev/null
+++ b/dev-qt/qt3support/Manifest
@@ -0,0 +1,4 @@
+AUX qt3support-4.8.7-fix-socklent-for-musl.patch 3982 SHA256 905bc36d1f94cd66984a64253cbda84655d350b34255f0cae10fc9d6df788051 SHA512 54dc653bd480b1b860f5b97f615ddd19470721244e809669ae988138bc04a5788b1ffc704153b2ab7a35c047ae5bb51cf94420f72a368735e6ec5688b9b093a9 WHIRLPOOL 9cb0aa6b92b1d26b17996f444dc7f5937a4e1c36ae98fa79312da3b68020dbf2efde6b2d4fd7d1d9513cb42425b58560d3c1d67403fc4fc44b6d08cf3dc575cc
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
+EBUILD qt3support-4.8.7-r99.ebuild 1072 SHA256 63bbe62c13465d14707e3e278c7575259b71a59b9084f95d17be1c372105e60b SHA512 1066cd6f8cf109073a3cdf6be429189c60cf5a307b76ffdddbd5a51af337eeb35ede21112a82e84adc1b4b78eadd6862d5cb0b3f9f845782d494e6cf56f0b95b WHIRLPOOL 7a8f000b4eabf9d1dab50602063d30254668ba5c1b7c04950a218d3b00214c383b7836441474a9a05f73d58e6ca20b7497677af69d69c34d766b04e23fab8eaa
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
diff --git a/dev-qt/qt3support/files/qt3support-4.8.7-fix-socklent-for-musl.patch b/dev-qt/qt3support/files/qt3support-4.8.7-fix-socklent-for-musl.patch
new file mode 100644
index 00000000..29031aed
--- /dev/null
+++ b/dev-qt/qt3support/files/qt3support-4.8.7-fix-socklent-for-musl.patch
@@ -0,0 +1,119 @@
+diff -ru a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h
+--- a/mkspecs/linux-cxx/qplatformdefs.h	2015-05-07 14:14:41.000000000 +0000
++++ b/mkspecs/linux-cxx/qplatformdefs.h	2015-07-04 22:28:58.203016692 +0000
+@@ -87,10 +87,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+diff -ru a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h
+--- a/mkspecs/linux-ecc-64/qplatformdefs.h	2015-05-07 14:14:42.000000000 +0000
++++ b/mkspecs/linux-ecc-64/qplatformdefs.h	2015-07-04 22:29:05.627017526 +0000
+@@ -87,10 +87,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+diff -ru a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
+--- a/mkspecs/linux-g++/qplatformdefs.h	2015-05-07 14:14:41.000000000 +0000
++++ b/mkspecs/linux-g++/qplatformdefs.h	2015-07-04 22:29:09.427017954 +0000
+@@ -86,10 +86,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+diff -ru a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h
+--- a/mkspecs/linux-kcc/qplatformdefs.h	2015-05-07 14:14:41.000000000 +0000
++++ b/mkspecs/linux-kcc/qplatformdefs.h	2015-07-04 22:29:12.705018322 +0000
+@@ -90,10 +90,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+diff -ru a/mkspecs/linux-llvm/qplatformdefs.h b/mkspecs/linux-llvm/qplatformdefs.h
+--- a/mkspecs/linux-llvm/qplatformdefs.h	2015-05-07 14:14:42.000000000 +0000
++++ b/mkspecs/linux-llvm/qplatformdefs.h	2015-07-04 22:29:16.239018720 +0000
+@@ -87,10 +87,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+diff -ru a/mkspecs/linux-lsb-g++/qplatformdefs.h b/mkspecs/linux-lsb-g++/qplatformdefs.h
+--- a/mkspecs/linux-lsb-g++/qplatformdefs.h	2015-05-07 14:14:42.000000000 +0000
++++ b/mkspecs/linux-lsb-g++/qplatformdefs.h	2015-07-04 22:29:19.529019090 +0000
+@@ -94,10 +94,10 @@
+ 
+ #define QT_OPEN_LARGEFILE       0
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #ifndef SIOCGIFBRDADDR
+diff -ru a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h
+--- a/mkspecs/linux-pgcc/qplatformdefs.h	2015-05-07 14:14:42.000000000 +0000
++++ b/mkspecs/linux-pgcc/qplatformdefs.h	2015-07-04 22:29:24.101019604 +0000
+@@ -87,10 +87,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
new file mode 100644
index 00000000..258aee1d
--- /dev/null
+++ b/dev-qt/qt3support/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>http://doc.qt.io/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-qt/qt3support/qt3support-4.8.7-r99.ebuild b/dev-qt/qt3support/qt3support-4.8.7-r99.ebuild
new file mode 100644
index 00000000..018a8c1f
--- /dev/null
+++ b/dev-qt/qt3support/qt3support-4.8.7-r99.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.7.ebuild,v 1.1 2015/05/26 18:13:20 pesa Exp $
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The Qt3Support module for the Qt toolkit"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="+accessibility"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+	src/qt3support
+	src/tools/uic3
+	tools/porting"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.7-fix-socklent-for-musl.patch"
+)
+
+multilib_src_configure() {
+	local myconf=(
+		-qt3support
+		$(qt_use accessibility)
+	)
+	qt4_multilib_src_configure
+}