x11-libs/libxcb: respect ${ROOT}, fixes bug #284950

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

3 files changed, 70 insertions, 2 deletions

diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
index d99087fcb511..cb12941e4525 100644
--- a/x11-libs/libxcb/ChangeLog
+++ b/x11-libs/libxcb/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2009/09/11 18:01:53 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.37 2009/09/14 16:10:44 remi Exp $
+
+*libxcb-1.4-r1 (14 Sep 2009)
+
+  14 Sep 2009; Rémi Cardona <remi@gentoo.org> +libxcb-1.4-r1.ebuild:
+  respect ${ROOT}, fixes bug #284950
 
   11 Sep 2009; Rémi Cardona <remi@gentoo.org> libxcb-1.4.ebuild:
   add preserve_old_lib to libxcb 1.4 and add a link to a proper upgrade
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 940ff003b8a2..9e539a6a9ffa 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -6,6 +6,7 @@ DIST libxcb-1.4.tar.bz2 306116 RMD160 c8ce1e1670c09ded64c9a1642c8ed26403ef9986 S
 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
+EBUILD libxcb-1.4-r1.ebuild 1752 RMD160 8fafa60767f517d004e3ab0164632256ac510bab SHA1 7dd473bd97d829d813aa6dd3eaa4ccb5dc4fb1b5 SHA256 407004ab33793e937cd0b4d8bbc676b8fbe9c3c589c59490e8f825faa4e9ce73
 EBUILD libxcb-1.4.ebuild 1722 RMD160 5a0475b8d3e972a18cbcb7fc26db88314e234fe5 SHA1 fcb81b0d8439629eb1a962ec62cf5f51ca6bff01 SHA256 6c686551fdc319239d63e297146d24dbcf00be6a95a4694478c535fb96479d67
-MISC ChangeLog 4656 RMD160 0b395a9c0a0ceac3d2060cff807aefa8494cd2fb SHA1 883ec35ef299688510a9ad11d903feb8aa55391a SHA256 2c1aacd50d2c6264e235f50f7683d1d3014a7e2062657ed991a67c4c08557de3
+MISC ChangeLog 4794 RMD160 a524b57673cbbe96ef318c8054e96f43e6b22b24 SHA1 ada5f2acc95717af82be59888141fbeed26bf468 SHA256 0a31e852fda5b8f21f77886b3068ea8e2d021e71b4d4ac2369fc237cb70f2177
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libxcb/libxcb-1.4-r1.ebuild b/x11-libs/libxcb/libxcb-1.4-r1.ebuild
new file mode 100644
index 000000000000..9f52889845f8
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.4-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.4-r1.ebuild,v 1.1 2009/09/14 16:10:44 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)
+		--enable-xinput"
+}
+
+src_install() {
+	x-modular_src_install
+	dobin "${FILESDIR}"/xcb-rebuilder.sh || die
+}
+
+pkg_preinst() {
+	x-modular_pkg_preinst
+	preserve_old_lib "${ROOT}"/usr/$(get_libdir)/libxcb-xlib.so.0.0.0
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+	preserve_old_lib_notify "${ROOT}"/usr/$(get_libdir)/libxcb-xlib.so.0.0.0
+
+	if [[ -e "${ROOT}"/usr/$(get_libdir)/libxcb-xlib.so.0.0.0 ]]; then
+		ewarn "libxcb-xlib.so is no longer shipped by ${PN} but was kept on your system"
+		ewarn
+		ewarn "While your system will still work, emerging new packages or updates"
+		ewarn "will likely fail. You can fix broken libtool .la files by running :"
+		ewarn
+		ewarn "  ${FILESDIR}/xcb-rebuilder.sh"
+		ewarn
+		ewarn "To completely get rid of libxcb-xlib.so references, please read :"
+		ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml"
+		ebeep 5
+		epause 5
+	fi
+}