--- a/components/python/oslo.i18n/Makefile	Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.i18n/Makefile	Wed Sep 07 14:48:32 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		oslo.i18n
-COMPONENT_VERSION=	1.5.0
+COMPONENT_VERSION=	3.5.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70
+   sha256:5fff5f6ceabed9d09b18d83e049864c29eff038efbbe67e03fe68c49cc189f10
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	https://launchpad.net/oslo.i18n
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/oslo.i18n/
 COMPONENT_BUGDB=	python-mod/oslo.i18n
 
-TPNO=			25741
+TPNO=			27992
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -48,8 +48,8 @@
 
 install:	$(INSTALL_NO_ARCH)
 
-# see $(COMPONENT_SRC)/test-requirements.txt for the python modules
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
 # required to execute unittests.
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)

--- a/components/python/oslo.i18n/oslo.i18n-PYVER.p5m	Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.i18n/oslo.i18n-PYVER.p5m	Wed Sep 07 14:48:32 2016 -0700
@@ -40,18 +40,13 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2015/058
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.i18n-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/i18n/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/i18n/fixture.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/i18n/log.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_i18n/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_i18n/_factory.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_i18n/_gettextutils.py
@@ -76,8 +71,5 @@
 depend type=require \
     fmri=library/python/oslo.i18n@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-$(PYV)
-
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)

--- a/components/python/oslo.i18n/patches/disable-oslo-deprecation.patch	Wed Sep 07 14:48:32 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This patch removes the legacy oslo namespace deprecation check from the
-oslo.i18n library. The deprecated() function is left to satisfy the
-unit tests. It is not suitable for the upstream and should be removed
-once all of the relevant consumers have switched over to the new
-namespace.
-
---- oslo.i18n-1.3.1/oslo/i18n/__init__.py.~1~	2015-01-27 05:34:49.000000000 -0800
-+++ oslo.i18n-1.3.1/oslo/i18n/__init__.py	2015-03-02 22:45:07.303224309 -0800
-@@ -26,6 +26,3 @@ def deprecated():
-         DeprecationWarning,
-         stacklevel=3,
-     )
--
--
--deprecated()