Use -r1 for new python eclasses usage and -r2 for also include multilib support, see bug #462178

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 40 insertions, 3 deletions

diff --git a/x11-proto/xcb-proto/ChangeLog b/x11-proto/xcb-proto/ChangeLog
index 651d5c6f35cf..1840235d6cbf 100644
--- a/x11-proto/xcb-proto/ChangeLog
+++ b/x11-proto/xcb-proto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-proto/xcb-proto
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.96 2013/03/06 13:05:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/ChangeLog,v 1.97 2013/03/23 18:45:54 pacho Exp $
+
+*xcb-proto-1.8-r2 (23 Mar 2013)
+
+  23 Mar 2013; Pacho Ramos <pacho@gentoo.org> +xcb-proto-1.8-r2.ebuild,
+  xcb-proto-1.8-r1.ebuild:
+  Use -r1 for new python eclasses usage and -r2 for also include multilib
+  support, see bug #462178
 
   06 Mar 2013; Michał Górny <mgorny@gentoo.org> xcb-proto-1.8-r1.ebuild:
   Migrate to python-r1.
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild
index 8ce1ea781a10..7403eb2a9b58 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild,v 1.2 2013/03/06 13:05:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild,v 1.3 2013/03/23 18:45:54 pacho Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
-XORG_MULTILIB=yes
 inherit python-single-r1 xorg-2
 
 DESCRIPTION="X C-language Bindings protocol headers"
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild
new file mode 100644
index 000000000000..e1a85ae4b5fb
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild,v 1.1 2013/03/23 18:45:54 pacho Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+XORG_MULTILIB=yes
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	xorg-2_pkg_setup
+}
+
+pkg_postinst() {
+	ewarn "Please rebuild both libxcb and xcb-util if you are upgrading from version 1.6"
+}