From c20e28fa762828e7e508d424090f021db6866e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= Date: Wed, 25 Jan 2012 15:23:10 -0800 Subject: [PATCH] Update x11-apps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have a number of outdated X tools; let's update them in one swoop since it's backwards compatible anyway. Change-Id: I35f6f3f7688fcb26730688588d2dbb4de9d77600 Reviewed-on: https://gerrit.chromium.org/gerrit/14829 Reviewed-by: Stuart Abercrombie Tested-by: Stéphane Marchesin Commit-Ready: Stéphane Marchesin --- ...{xauth-1.0.5.ebuild => xauth-1.0.6.ebuild} | 9 ++++--- ...nfo-1.2.0.ebuild => xdpyinfo-1.3.0.ebuild} | 10 ++++---- .../x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild | 15 +++++++++++ ...{xprop-1.2.0.ebuild => xprop-1.2.1.ebuild} | 11 ++++---- ...randr-1.3.4.ebuild => xrandr-1.3.5.ebuild} | 6 ++--- ...xset-1.2.1-r1.ebuild => xset-1.2.2.ebuild} | 15 ++++++----- .../x11-apps/xwininfo/xwininfo-1.1.2.ebuild | 25 +++++++++++++++++++ 7 files changed, 67 insertions(+), 24 deletions(-) rename sdk_container/src/third_party/portage-stable/x11-apps/xauth/{xauth-1.0.5.ebuild => xauth-1.0.6.ebuild} (73%) rename sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/{xdpyinfo-1.2.0.ebuild => xdpyinfo-1.3.0.ebuild} (75%) create mode 100644 sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild rename sdk_container/src/third_party/portage-stable/x11-apps/xprop/{xprop-1.2.0.ebuild => xprop-1.2.1.ebuild} (60%) rename sdk_container/src/third_party/portage-stable/x11-apps/xrandr/{xrandr-1.3.4.ebuild => xrandr-1.3.5.ebuild} (73%) rename sdk_container/src/third_party/portage-stable/x11-apps/xset/{xset-1.2.1-r1.ebuild => xset-1.2.2.ebuild} (60%) create mode 100644 sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.ebuild index 2f20bc2f00..6bd2474341 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.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-apps/xauth/xauth-1.0.5.ebuild,v 1.9 2011/02/14 23:41:01 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.6.ebuild,v 1.8 2011/08/20 15:45:11 jer Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 @@ -18,5 +18,8 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND}" pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable ipv6)" + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + ) + xorg-2_pkg_setup } diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild similarity index 75% rename from sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild index 7f1cef2aab..e6e9ec9629 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild,v 1.7 2011/04/16 17:54:58 armin76 Exp $ - -EAPI=3 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild,v 1.5 2011/12/27 20:53:50 maekke Exp $ +EAPI=4 inherit xorg-2 DESCRIPTION="Display information utility for X" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt" IUSE="dga dmx xinerama" RDEPEND=" @@ -18,6 +17,7 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm + x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} " pkg_setup() { - CONFIGURE_OPTIONS="--without-xf86misc + XORG_CONFIGURE_OPTIONS="--without-xf86misc $(use_with dga) $(use_with dmx) $(use_with xinerama) diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild new file mode 100644 index 0000000000..83783e4504 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild,v 1.7 2011/10/03 17:56:28 josejx Exp $ + +EAPI=4 + +inherit xorg-2 + +DESCRIPTION="compile XKB keyboard description" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" +RDEPEND="x11-libs/libX11 + x11-libs/libxkbfile" +DEPEND="${RDEPEND} + sys-devel/bison" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild index 6886ef6460..11aeda528b 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild @@ -1,15 +1,16 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.0.ebuild,v 1.9 2011/02/14 18:54:49 xarthisius Exp $ - -EAPI=3 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.1.ebuild,v 1.9 2011/10/03 17:57:35 josejx Exp $ +EAPI=4 inherit xorg-2 DESCRIPTION="property displayer for X" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + >=x11-proto/xproto-7.0.17 +" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.ebuild index 2d2187e0b3..bcaa80fcff 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.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-apps/xrandr/xrandr-1.3.4.ebuild,v 1.9 2011/02/14 23:41:03 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.5.ebuild,v 1.7 2011/10/03 17:58:09 josejx Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 @@ -18,5 +18,5 @@ DEPEND="${RDEPEND}" src_install() { xorg-2_src_install - rm -f "${ED}"/usr/bin/xkeystone + rm -f "${ED}"/usr/bin/xkeystone || die } diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild index 0d66ed2e40..0f4af999de 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.2.1-r1.ebuild,v 1.7 -# 2011/04/16 17:57:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.2.2.ebuild,v 1.9 2011/10/03 17:58:43 josejx Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 DESCRIPTION="X.Org xset application" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" @@ -18,7 +17,7 @@ RDEPEND=" x11-libs/libXext" DEPEND="${RDEPEND}" -pkg_setup() { - CONFIGURE_OPTIONS="--without-xf86misc --without-fontcache" - xorg-2_pkg_setup -} +XORG_CONFIGURE_OPTIONS=( + --without-xf86misc + --without-fontcache +) diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild new file mode 100644 index 0000000000..d911f67d3a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.2.ebuild,v 1.8 2011/10/03 17:59:17 josejx Exp $ + +EAPI=4 + +inherit xorg-2 flag-o-matic + +DESCRIPTION="window information utility for X" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND=">=x11-libs/libxcb-1.6" +DEPEND="${RDEPEND} + x11-libs/libX11 + >=x11-proto/xproto-7.0.17" + +pkg_setup() { + # interix has a _very_ old iconv in libc, however, including + # iconv.h redefines those symbols to libiconv_*, which then + # are unresolved, as the configure check is old and dumb. + [[ ${CHOST} == *-interix* ]] && + append-libs -liconv +}