Merge remote-tracking branch 'tombriden/blink_bump'
This commit is contained in:
		
						commit
						e3f6a57f40
					
				@ -1,15 +0,0 @@
 | 
			
		||||
From: Julian Ospald <hasufell@gentoo.org>
 | 
			
		||||
Date: Tue Sep  8 01:22:40 UTC 2015
 | 
			
		||||
Subject: fix compatibility with libressl
 | 
			
		||||
Upstream: not yet
 | 
			
		||||
 | 
			
		||||
--- a/eventlib/green/socket.py
 | 
			
		||||
+++ b/eventlib/green/socket.py
 | 
			
		||||
@@ -89,7 +89,6 @@
 | 
			
		||||
 else:
 | 
			
		||||
     # some constants the SSL module exports but not in __all__
 | 
			
		||||
     from eventlib.green.ssl import (RAND_add,
 | 
			
		||||
-                                    RAND_egd,
 | 
			
		||||
                                     RAND_status,
 | 
			
		||||
                                     SSL_ERROR_ZERO_RETURN,
 | 
			
		||||
                                     SSL_ERROR_WANT_READ,
 | 
			
		||||
@ -1,11 +1,11 @@
 | 
			
		||||
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
 | 
			
		||||
# Distributed under the terms of the GNU General Public License v2
 | 
			
		||||
 | 
			
		||||
require setup-py [ import=distutils blacklist="3" ]
 | 
			
		||||
require github [ user="AGProjects" tag="release-${PV}" ]
 | 
			
		||||
require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
 | 
			
		||||
 | 
			
		||||
SUMMARY="Coroutine-based networking library"
 | 
			
		||||
HOMEPAGE="http://sipsimpleclient.org"
 | 
			
		||||
DOWNLOADS="http://download.ag-projects.com/SipClient/${PNV}.tar.gz"
 | 
			
		||||
 | 
			
		||||
LICENCES="MIT"
 | 
			
		||||
SLOT="0"
 | 
			
		||||
@ -19,5 +19,3 @@ DEPENDENCIES="
 | 
			
		||||
        net-twisted/TwistedCore[python_abis:*(-)?]
 | 
			
		||||
"
 | 
			
		||||
 | 
			
		||||
DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-libressl.patch" )
 | 
			
		||||
 | 
			
		||||
@ -1,11 +1,11 @@
 | 
			
		||||
# Copyright 2016 Julian Ospald <hasufell@posteo.de>
 | 
			
		||||
# Distributed under the terms of the GNU General Public License v2
 | 
			
		||||
 | 
			
		||||
require setup-py [ import=distutils blacklist="3" ]
 | 
			
		||||
require github [ user="AGProjects" tag="release-${PV}" ]
 | 
			
		||||
require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
 | 
			
		||||
 | 
			
		||||
SUMMARY="Client library for MSRP protocol and its relay extension"
 | 
			
		||||
HOMEPAGE="http://sipsimpleclient.org"
 | 
			
		||||
DOWNLOADS="http://download.ag-projects.com/MSRP/${PNV}.tar.gz"
 | 
			
		||||
 | 
			
		||||
LICENCES="LGPL-2"
 | 
			
		||||
SLOT="0"
 | 
			
		||||
@ -13,10 +13,10 @@ MYOPTIONS=""
 | 
			
		||||
 | 
			
		||||
DEPENDENCIES="
 | 
			
		||||
    build+run:
 | 
			
		||||
        dev-python/cryptography[python_abis:*(-)?]
 | 
			
		||||
        dev-python/cryptography[>=1.6][python_abis:*(-)?]
 | 
			
		||||
        dev-python/enum34[python_abis:*(-)?]
 | 
			
		||||
        dev-python/gmpy2[python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-application[python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
 | 
			
		||||
        dev-python/zopeinterface[python_abis:*(-)?]
 | 
			
		||||
        net-libs/libotr
 | 
			
		||||
"
 | 
			
		||||
@ -21,7 +21,7 @@ DEPENDENCIES="
 | 
			
		||||
        virtual/pkg-config
 | 
			
		||||
    build+run:
 | 
			
		||||
        dev-db/sqlite:3
 | 
			
		||||
        dev-libs/icu:62.1
 | 
			
		||||
        dev-libs/icu:=
 | 
			
		||||
        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
 | 
			
		||||
        media-libs/libvpx
 | 
			
		||||
        media-libs/v4l-utils
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user