Version bump. Drop older.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 40 insertions, 62 deletions

diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
index 2e76fd1c9dff..ff8c448f684a 100644
--- a/x11-libs/libxcb/ChangeLog
+++ b/x11-libs/libxcb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxcb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.65 2010/08/02 18:30:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.66 2010/08/14 22:26:41 scarabeus Exp $
+
+*libxcb-1.7 (14 Aug 2010)
+
+  14 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libxcb-1.4-r1.ebuild, +libxcb-1.7.ebuild:
+  Version bump. Drop older.
 
   02 Aug 2010; Raúl Porcel <armin76@gentoo.org> libxcb-1.5.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #308521
diff --git a/x11-libs/libxcb/libxcb-1.4-r1.ebuild b/x11-libs/libxcb/libxcb-1.4-r1.ebuild
deleted file mode 100644
index d07b34af6b44..000000000000
--- a/x11-libs/libxcb/libxcb-1.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.10 2009/12/15 19:52:48 ranger 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"
-
-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
-
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libxcb-xlib.so.0.0.0 ]]; then
-		echo
-		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
-}
diff --git a/x11-libs/libxcb/libxcb-1.7.ebuild b/x11-libs/libxcb/libxcb-1.7.ebuild
new file mode 100644
index 000000000000..7f18d34155b8
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.7.ebuild,v 1.1 2010/08/14 22:26:41 scarabeus Exp $
+
+EAPI=3
+
+inherit python xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${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 ~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.6
+	=dev-lang/python-2*[xml]"
+
+pkg_setup() {
+	python_set_active_version 2
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="$(use_enable doc build-docs)
+		$(use_enable selinux)
+		--enable-xinput"
+}