--- /dev/null
+diff --git a/setup.py b/setup.py
+index 2cbec9f..ea42e96 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,5 +1,5 @@
+
+-import os, sys
++import os, sys, subprocess
+
+ try:
+ from setuptools import setup, Extension
+@@ -8,6 +8,7 @@ except ImportError:
+
+
+ VERSION = '1.9.4'
++ICU_VERSION = subprocess.check_output(('icu-config', '--version')).strip()
+
+ INCLUDES = {
+ 'darwin': ['/usr/local/include'],
+@@ -43,11 +44,11 @@ LFLAGS = {
+ }
+
+ LIBRARIES = {
+- 'darwin': ['icui18n', 'icuuc', 'icudata', 'icule'],
+- 'linux': ['icui18n', 'icuuc', 'icudata', 'icule'],
+- 'freebsd': ['icui18n', 'icuuc', 'icudata', 'icule'],
+- 'win32': ['icuin', 'icuuc', 'icudt', 'icule'],
+- 'sunos5': ['icui18n', 'icuuc', 'icudata', 'icule'],
++ 'darwin': ['icui18n', 'icuuc', 'icudata'],
++ 'linux': ['icui18n', 'icuuc', 'icudata'],
++ 'freebsd': ['icui18n', 'icuuc', 'icudata'],
++ 'win32': ['icuin', 'icuuc', 'icudt'],
++ 'sunos5': ['icui18n', 'icuuc', 'icudata'],
+ }
+
+ platform = sys.platform
+@@ -79,6 +80,9 @@ else:
+
+ if 'PYICU_LIBRARIES' in os.environ:
+ _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep)
++elif ((sys.version_info >= (3,) and str(ICU_VERSION, 'ascii') < '58') or
++ (sys.version_info < (3,) and ICU_VERSION < '58')):
++ _libraries = LIBRARIES[platform][:] + ['icule']
+ else:
+ _libraries = LIBRARIES[platform]
+
--- /dev/null
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/icu
+"
+# epydoc supports only python2*
+DEPEND="${RDEPEND}
+ doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+PATCHES=(
+ "${FILESDIR}/${P}-exclude_libicule.patch"
+)
+
+# we need an exact version match for epydoc to work on a binary module
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir -p doc/html || die
+ epydoc --html --verbose -o doc/html \
+ --url="${HOMEPAGE}" --name="${MY_P}" \
+ icu.py || die "Making the docs failed!"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ if use doc; then
+ local HTML_DOCS=( doc/html/. )
+ fi
+ distutils-r1_python_install_all
+}