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

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 46 insertions, 20 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/Manifest b/x11-proto/xcb-proto/Manifest
index 047f4f688cef..fd6688b2d54d 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -12,26 +12,15 @@ EBUILD xcb-proto-1.6-r2.ebuild 1178 SHA256 9817457e31752f9c5a5c89ed539c46e9954c3
 EBUILD xcb-proto-1.7-r1.ebuild 1053 SHA256 5bc802a5ec8b2a5ec38b3059c2fc3e1d3864b0416d8f479a174bb179c0da4bf1 SHA512 25a76d781e0336acf8311df5563cb11f2c1d2be01a79048333f467d1d9696a2ec3b8ad62fb2177dcb0ecb3e0623f97bb29987a030170053b9f2b135dac6a8e56 WHIRLPOOL b17b24fe9eb2dfbbe029110b74c214f82cfc1512ea4e41970e84d876965a4f81cdec7cb12df42a78b32242d4f5fc6a434bdd848fcda324465985a950cbcce59d
 EBUILD xcb-proto-1.7.1.ebuild 1052 SHA256 ae528efb8f628dcd9eb6c1b3568a33e21622c54445e52f8178eb59277d5b2b82 SHA512 b57e6351727852dc96f398f0ebf3e0585990ac0a42f25b6927768871045b82e71f4bfa33b2ddbe69439a548b4ea240222a7e191ad6b07e57bbe97d4abd15f515 WHIRLPOOL ef6f26bf65c99035cbf949a8040f4036d87e55d0d6c749870e1e3734507e6d471bb3ce6e79042c25479d688785474544728999f0d537a42a8786f4a587151d3d
 EBUILD xcb-proto-1.7.ebuild 1102 SHA256 76f08f91c67abf9cff9baccb2621c68fd02e6061572f941acb4715863ecaad86 SHA512 74fe1243e48931f9c6cbb3bb5bf77062344fa21ab4d08a3c71c23339511b5a707ea1e6b3a9c2fb4202f1dcd7264bd3efed6ddbe44d98cd3827cc4ea55fe9bea9 WHIRLPOOL d47ba6bf4eb84df698d7ab8a2b0042e7056d8df3f37c6adf0ec59702894c9ad716e345f4492f9df0ac5f9644e1229e8a5b12fc6d8128fd97fedd207ed2e92eb0
-EBUILD xcb-proto-1.8-r1.ebuild 1068 SHA256 a3c1db44e15c3f7f2c2ce4aed0309c7dc5866f9aeb65498e6da721cff202b297 SHA512 9271ca52a6d8190d1121a2a05edb3eeef9e471491564de08ae9e853f14f0222c594a5b83a22149ad7fe5736ac387a024284999f472b83eccbf64484f15369ed0 WHIRLPOOL f1173069390e01244cc706145f77f26986b2a12e2932e23c9518afbaa679e8da9ef9ad6d0eb8667a8cde7d81788e2a0f47e1fe74c17b7871ca29809cf4f1ef20
+EBUILD xcb-proto-1.8-r1.ebuild 1049 SHA256 f0563ad2154dcb6fe0eae71bb0a211b50a7e8241bc1f828cad619d170f18c62d SHA512 7574a88b69faa2931d74e6642ff638677328441c7a20daaa1e05f71eb5ee9e2ca7a98da4c5c4ef5925d596d9ccef400c476aa28d85d4a837aeb3202167e1eefc WHIRLPOOL d21efc3602e4840b2e93558631a38a4ffbe62943764c630baf4c877ca1f95e5a095fea8d83eab8d4722831b2345dfd5965027595187d9ed1a2cf69a5081697de
+EBUILD xcb-proto-1.8-r2.ebuild 1067 SHA256 8852ad5b3683ece9f2d9d63bec5c975c3247a7b8a6e0a8f1c17b778b221f08d7 SHA512 bbc6cd773f5aee5911b8eb1e7cc0d08059c941720b5c67405b5492ad63855649d9052919879a1ec8a5eceb277831a2bbf6229d2dbfada17fc9f9472d99e2d1f1 WHIRLPOOL 8daf8502372b3aae616a3ee1e4c91bf4772d3458d8cdac465dc85da3efa5b6010e3a982c1fe397c984716c4ed3801167dd42f470972bbd014b694c21e45623a5
 EBUILD xcb-proto-1.8.ebuild 1062 SHA256 3f185d24651463b3fa86e5f88face6f51e824798cd6e10ec16f9255e25f07ca2 SHA512 0a97ee0cb879f3f98f8d6c1ae47111091f053486a5756da782799160cc9048e1a4677f1f626de1dde75f3a1da0c51dbaa4e0e65e8570a820822a1833b5b86550 WHIRLPOOL f1f82618e4fd6d5ee866007947b396e8faa0060b57c9389c1c85fe41fb7e08049a4c0fe7bfe8d96ba5b993585ce6e0f7983f2aee11418cb74c554fcd81ba457b
-MISC ChangeLog 11276 SHA256 0d017bb723edb9307d132ad71bb68d06fd5288dd3997d5ada1204d078c35bc40 SHA512 a739dfd072909ee499e7056e275fc3d9968104421245d40e4cf20d1de2455d150f1e0e67f30dc40ee9e224433ab9fd274f2750ccdbde4a714f1bcf182544c211 WHIRLPOOL 84183af419035a56c6e459d3d08208bcc61c683b53b5d343fbd237299253b0e2eb5f61aba29d4bf1b6022e1d7856739572131e0a6674782e104edc5569233ad6
+MISC ChangeLog 11509 SHA256 535628ffc2517117063c8b2cde842bb69314febe697c9221554ee69adc91e1bf SHA512 8198768e5b5eff6ec4f459cd4d8c2bd764df63219e9bad2876a54c95e1c7070a199eba8551efc94ca486e70ba3464160e5f31f80002a52722cf57c3e20807bbf WHIRLPOOL 72350ad9fb879c32d8922fd12ce008a4ffbefcc874c9e0db6f1584b30acf4567fe46f61113a8f1c5bbdf9dc4a8be676487056bf243e9a6b99f8ab77711be8321
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRNz9VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDhJwQALjt72QA6we1GSKtC2aVnFmU
-arXJn1P8IJqkxgsiF0eNlgBLIq9/EDvIBGovX8oesyLYuSRKO/tfeoahFcgrmjo0
-U3m4u4v8mbfvnH70WpxgSLqHInp4inVUpqAD1SlClnaLIZW+V4hlm5S56HYUpbHZ
-MKjqPJaJOPpgWX5gCOZDAZVW6g/OounSYwso9sLGrUUf9Jili48Ai8eOmpsfP5+p
-4GopfRK+SCCSjXUulOH8KF7nR67rBGM+FQRX8YAmgPUuMlCdIuLcHgn926R034fL
-vDLWliPQjsWJMwASQLd4ZpXM1Hwnb2FB4Ddd5sgp6BRy+5r1bXGrsxPNVzZ4oseb
-fuzNu4pTinAHq1Rh19beIC8d/z2LBYdMxuxGqK6Va8gSax3huE3pgZVOqbX35tiV
-fLQjt6lNGgkSFNhBVJc+u2Bpfi5y+kLy2Gzo7K06yTVkifZ4GRHD1p5YY/QWeSuc
-4j4XYWppLvU7BKQpFQEkxNJagZ/TUR1CLn//8drbuPj7sgRnmY0OqUGbLjcJCa50
-2/v6Bfe/kZ8nXuwek8SX2+kraMSZHURLJFey0dj7WGLwHCZ9o+L/5s83IssmppKj
-3QtrA9YXAF1EVH6uCbyEtW0zxT1ioSer8Yd/JjC0/GTna5YoRAK7nmNzLOLQav1G
-CPDnJLH9xfcdNXEAt+4j
-=q7DC
+iEYEAREIAAYFAlFN+GUACgkQCaWpQKGI+9T4FQCeMSZsSVa+mjJua2DqCqmX1req
+2c0AmwVYhrUb+fzmX0Ew/LjxPoahSeZs
+=+UFy
 -----END PGP SIGNATURE-----
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"
+}