From af431aa03eae5f2cea85c642355c1d2edc9b698d Mon Sep 17 00:00:00 2001 From: Stuart Abercrombie Date: Wed, 18 Jan 2012 15:50:29 -0800 Subject: [PATCH] Update portage-stable x11-proto packages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for X.Org 1.11. Change-Id: I723997fd7ddfa8b66635d1cf4e3a88ae0caa3763 Reviewed-on: https://gerrit.chromium.org/gerrit/14411 Reviewed-by: Stéphane Marchesin Commit-Ready: Stuart Abercrombie Tested-by: Stuart Abercrombie --- ....1.1.ebuild => resourceproto-1.2.0.ebuild} | 4 ++-- ...oto-7.0.17.ebuild => xproto-7.0.22.ebuild} | 20 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/{resourceproto-1.1.1.ebuild => resourceproto-1.2.0.ebuild} (86%) rename sdk_container/src/third_party/portage-stable/x11-proto/xproto/{xproto-7.0.17.ebuild => xproto-7.0.22.ebuild} (58%) diff --git a/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.2.0.ebuild similarity index 86% rename from sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.2.0.ebuild index 7af8c292d8..7e002ed642 100644 --- a/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.2.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/resourceproto-1.1.1.ebuild,v 1.7 2011/03/05 17:49:24 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/resourceproto-1.2.0.ebuild,v 1.8 2011/08/20 15:55:26 jer Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 DESCRIPTION="X.Org Resource protocol headers" diff --git a/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.17.ebuild b/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.22.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.17.ebuild rename to sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.22.ebuild index caa9a16a03..2ba4ef2541 100644 --- a/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.22.ebuild @@ -1,15 +1,25 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.17.ebuild,v 1.10 2010/10/21 01:24:33 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.22.ebuild,v 1.7 2011/10/03 18:09:13 josejx Exp $ -EAPI=3 +EAPI=4 + +XORG_DOC=doc inherit xorg-2 DESCRIPTION="X.Org xproto protocol headers" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/x11proto" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="" DEPEND="${RDEPEND}" + +pkg_setup() { + xorg-2_pkg_setup + + XORG_CONFIGURE_OPTIONS=( + $(use_enable doc specs) + $(use_with doc xmlto) + --without-fop + ) +}