x11-libs/libxcb: bump to 1.3, add xcb-rebuilder.sh from the x11 overlay

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 121 insertions, 2 deletions

diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
index 971b0ea47beb..180ff8ef540d 100644
--- a/x11-libs/libxcb/ChangeLog
+++ b/x11-libs/libxcb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxcb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.30 2009/05/04 17:06:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.31 2009/06/07 21:06:29 remi Exp $
+
+*libxcb-1.3 (07 Jun 2009)
+
+  07 Jun 2009; Rémi Cardona <remi@gentoo.org> +libxcb-1.3.ebuild,
+  +files/xcb-rebuilder.sh:
+  bump to 1.3, add xcb-rebuilder.sh from the x11 overlay
 
   04 May 2009; Samuli Suominen <ssuominen@gentoo.org> libxcb-1.1.ebuild,
   libxcb-1.1.90.1.ebuild:
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 2738f8d6b423..f02ce24cb2dd 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,8 +1,11 @@
+AUX xcb-rebuilder.sh 1349 RMD160 cda40e55be6129e437e0401fbaadc5d7abbffa9e SHA1 3dc59f8ad94d3acace4722f0705773276d59fb18 SHA256 491845ec800fc7e14215d9871ae1a6892da769508eb87807b808ea4ce9043c5b
 DIST libxcb-1.0.tar.bz2 419355 RMD160 ec5913c0d081395f8d79ba5c02d30bf346c40e49 SHA1 0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e SHA256 19d6b2ac380fd3e613a3730e791f197f186f940bffec97f8a4f9443bb727d11d
 DIST libxcb-1.1.90.1.tar.bz2 475250 RMD160 3e0639b4348fb8041b970d64ef28f23080c29884 SHA1 5d34433f5cb7febac9b3713c1549f53357fdeef7 SHA256 7ccd862a295562412e9fe75cb83cc593db5c88d162b3ce1f7a326dd116381e88
 DIST libxcb-1.1.tar.bz2 442755 RMD160 1c8c1d83ec71f7d1906373a679906615d9440f01 SHA1 b27c7eb86fd2ea43cea83cadcf20cc77abf5defe SHA256 338b9cb7886b49a5674881cd929def07449e47ffcc1886f4363359883c82d93f
+DIST libxcb-1.3.tar.bz2 308179 RMD160 90b15625000c35982d56a9018b72f3cdb97f340d SHA1 6fd426cfa32460de36a9b40c6e9be8154ad7455d SHA256 9bb1b65bdeccf448c5a3993fe4eabe12801851fc47933f854a64f674d84419e5
 EBUILD libxcb-1.0.ebuild 685 RMD160 6f644816a47de563e21ad1f73052f41a90048dc9 SHA1 a5fb9257a532bc0b89a9e77d681368d8fc0c8550 SHA256 e441cb4e5c160c1c3f99c4edaf18dfdec73223c23606dcc9f9cd6aefdefcc55a
 EBUILD libxcb-1.1.90.1.ebuild 1222 RMD160 acc8d9aa6859f6b605ea3fd0155f8c2659a3d5dd SHA1 38998e4c10c1f39ef78e2ae4e32023248ea0dccb SHA256 2f5ddb524be3befd6ee695e7adb2f660ea30d9626855e70075522f38bbf70672
 EBUILD libxcb-1.1.ebuild 1147 RMD160 efca7c88a3e35f13d236823c2477536111956023 SHA1 43023cd2b6e12302df7aef86464d46c27aa53826 SHA256 f6a7d4d2debab171d46576b23573915a59dce4f7d8547f45e4e779448f32a890
-MISC ChangeLog 3890 RMD160 6380078018924ac78067c869c45f5aa07bd51116 SHA1 103b2fc020d18270ea6c321716dae8643e33d6ac SHA256 835587a121a5ba3076a77ad5f92412e8fbff19f6900bba2aeaeaa5ad005751da
+EBUILD libxcb-1.3.ebuild 1174 RMD160 cee3621164fb901359d9ed85c1ddba9cd2d39160 SHA1 58d92943b0810939e3ad920d1185bad2c43115d0 SHA256 fb944ab3d3d36da18af78f9e7b2bf8ca8bc2dfb8d38e97bf56f5f7a8657dcbc6
+MISC ChangeLog 4064 RMD160 1c1e673523f9880dfbd77c501eaac9f7b4f4e211 SHA1 ac7f9295e77ac850cf53c797c924c69acb25dfb7 SHA256 26b046375177007388cbb4eb88053f7123af960c7220cdb451d6fa26e9a35538
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libxcb/files/xcb-rebuilder.sh b/x11-libs/libxcb/files/xcb-rebuilder.sh
new file mode 100755
index 000000000000..0f1a3aa753e4
--- /dev/null
+++ b/x11-libs/libxcb/files/xcb-rebuilder.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# To use something besides `emerge` to install packages, set
+# XCB_REBUILDER_INSTALL to that binary.
+
+. /etc/init.d/functions.sh
+
+case ${1} in
+	'') ;;
+	*)
+		einfo 'Rebuilds broken packages from the XCB library renaming'
+		einfo
+		einfo 'To use something besides `emerge`, set the INSTALL variable to their binary.'
+		exit 1
+		;;
+esac
+
+if ! type -p qfile >/dev/null; then
+	einfo "Please install app-portage/portage-utils."
+	exit 1
+fi
+
+if ! type -p scanelf >/dev/null; then
+	einfo "Please install app-misc/pax-utils."
+	exit 1
+fi
+
+einfo "Fixing broken libtool archives (.la)"
+for i in $(qlist -a | grep "\.la$"); do
+	sed -i \
+		-e "s:[^[:space:]]*xcb-xlib[^[:space:]]*::g" \
+		"${i}" 2>/dev/null
+done
+
+einfo "Scanning for libraries requiring libxcb-xlib.so..."
+for i in $(qlist -a | grep "\.so$"); do
+	scanelf -n $i \
+	| grep -q xcb-xlib \
+	&& XCB_LIBS="${XCB_LIBS} ${i}"
+done
+
+if [[ -n ${XCB_LIBS} ]]; then
+	einfo "Broken libraries:"
+	for lib in ${XCB_LIBS}; do
+		echo "  ${lib}"
+	done
+	ebegin "Scanning for packages installing broken libraries"
+	XCB_PACKAGES=$(qfile -qC ${XCB_LIBS} | sort | uniq)
+	eend 0
+else
+	einfo "No broken libraries detected"
+	exit 0
+fi
+
+
+einfo "Broken packages:"
+for pkg in ${XCB_PACKAGES}; do
+	echo "  ${pkg}"
+done
+
+ebegin "Rebuilding broken packages"
+${XCB_REBUILDER_INSTALL:-emerge -1} ${XCB_PACKAGES}
+eend $?
diff --git a/x11-libs/libxcb/libxcb-1.3.ebuild b/x11-libs/libxcb/libxcb-1.3.ebuild
new file mode 100644
index 000000000000..877209df17b1
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.3.ebuild,v 1.1 2009/06/07 21:06:29 remi Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+LICENSE="X11"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc selinux"
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-libs/libxslt
+	>=x11-proto/xcb-proto-1.5
+	>=dev-lang/python-2.5[xml]"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable doc build-docs)
+		$(use_enable selinux xselinux)
+		--enable-xinput"
+}
+
+src_install() {
+	x-modular_src_install
+	dobin "${FILESDIR}"/xcb-rebuilder.sh || die
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	ewarn "libxcb-1.2 removed libxcb-xlib.so. Run xcb-rebuilder.sh to rebuild"
+	ewarn "packages that broke. revdep-rebuild may also work."
+	ebeep 5
+	epause 5
+}