--- protobuf-2.5.0.ebuild	2014-09-17 04:00:12.584677054 +0000
+++ protobuf-2.6.0.ebuild	2014-09-18 03:02:20.843361036 +0000
@@ -7,27 +7,34 @@
 PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools eutils distutils-r1 java-pkg-opt-2 elisp-common
+inherit autotools eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
 
 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
 HOMEPAGE="http://code.google.com/p/protobuf/"
-SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
+SRC_URI="https://protobuf.googlecode.com/svn/rc/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
-SLOT="0/8" # subslot = soname major version
+SLOT="0/9" # subslot = soname major version
 KEYWORDS="amd64 arm -hppa ~ia64 ~mips -ppc -ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos"
 IUSE="emacs examples java python static-libs vim-syntax"
 
 CDEPEND="emacs? ( virtual/emacs )
 	python? ( ${PYTHON_DEPS} )"
+# python-dateutil uses deprecated distutils eclass.
 DEPEND="${CDEPEND}
 	java? ( >=virtual/jdk-1.5 )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )"
+	python? (
+		dev-python/google-apputils[${PYTHON_USEDEP}]
+		dev-python/python-dateutil:python-2
+		dev-python/python-gflags[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.5 )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-x32.patch
+	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+
 	if [[ ${CHOST} != *-darwin* ]] ; then
 		# breaks Darwin, bug #472514
 		epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch