From 106f2847fe7a25a7ccd80c321285bd457771bf37 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Thu, 25 Jan 2007 03:35:57 +0000 Subject: [PATCH] Bump for 7.2. Package-Manager: portage-2.1.2-r4 --- x11-base/xorg-x11/ChangeLog | 8 +- x11-base/xorg-x11/Manifest | 15 ++- x11-base/xorg-x11/files/digest-xorg-x11-7.2 | 0 x11-base/xorg-x11/xorg-x11-7.2.ebuild | 122 ++++++++++++++++++++ 4 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 x11-base/xorg-x11/files/digest-xorg-x11-7.2 create mode 100644 x11-base/xorg-x11/xorg-x11-7.2.ebuild diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 7c0a75aeb192..583a097c2c69 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.578 2007/01/24 19:42:04 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.579 2007/01/25 03:35:57 joshuabaergen Exp $ + +*xorg-x11-7.2 (25 Jan 2007) + + 25 Jan 2007; Joshua Baergen + +xorg-x11-7.2.ebuild: + Bump for 7.2. 24 Jan 2007; Donnie Berkholz ; -xorg-x11-7.0-r1.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index d630aaef33a3..2655117390a7 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -36,10 +36,14 @@ EBUILD xorg-x11-7.1.ebuild 3839 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a MD5 403830badf415ead887a0933ad19fedd xorg-x11-7.1.ebuild 3839 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a xorg-x11-7.1.ebuild 3839 SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7 xorg-x11-7.1.ebuild 3839 -MISC ChangeLog 124989 RMD160 3098cf850bba57e0ef6c2c659539a2ca55ba1dd2 SHA1 eae3bc2a6e9ae366b4098d835e3bf31a3815ec0a SHA256 51ccd8fceec258c1f4dd5df34375fa96f2b45cefd7013527de3891c0458c66b9 -MD5 e78a7d68799751918fe910c7d74c3d78 ChangeLog 124989 -RMD160 3098cf850bba57e0ef6c2c659539a2ca55ba1dd2 ChangeLog 124989 -SHA256 51ccd8fceec258c1f4dd5df34375fa96f2b45cefd7013527de3891c0458c66b9 ChangeLog 124989 +EBUILD xorg-x11-7.2.ebuild 3854 RMD160 4ac18c1e14a99bb5288a3e789028a8e680bb3da7 SHA1 7249a3e0a05da7541e29ade6ff9f04af3daacb24 SHA256 b1b88bbb858fd8d02287f0ed07897903ae073757e04d0d29be5c5bf4ba7fb8a2 +MD5 5ca121d9405e70a539b5078946f3da75 xorg-x11-7.2.ebuild 3854 +RMD160 4ac18c1e14a99bb5288a3e789028a8e680bb3da7 xorg-x11-7.2.ebuild 3854 +SHA256 b1b88bbb858fd8d02287f0ed07897903ae073757e04d0d29be5c5bf4ba7fb8a2 xorg-x11-7.2.ebuild 3854 +MISC ChangeLog 125120 RMD160 8d580e8e4b5a00dbe6f18ce8c757107e600ecf26 SHA1 cac29327cbe5aeb326961b425b0d62f587b67224 SHA256 e22d881f39e8a95222f74f049e43e90877bb7e1aa0b6cecb5668e366363c9e99 +MD5 7d624fa6d2d612f182c04df5b1ca5c82 ChangeLog 125120 +RMD160 8d580e8e4b5a00dbe6f18ce8c757107e600ecf26 ChangeLog 125120 +SHA256 e22d881f39e8a95222f74f049e43e90877bb7e1aa0b6cecb5668e366363c9e99 ChangeLog 125120 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230 @@ -53,3 +57,6 @@ SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/di MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.1 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.1 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.1 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.2 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.2 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.2 0 diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.2 b/x11-base/xorg-x11/files/digest-xorg-x11-7.2 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/x11-base/xorg-x11/xorg-x11-7.2.ebuild b/x11-base/xorg-x11/xorg-x11-7.2.ebuild new file mode 100644 index 000000000000..682883dd9a5d --- /dev/null +++ b/x11-base/xorg-x11/xorg-x11-7.2.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.2.ebuild,v 1.1 2007/01/25 03:35:57 joshuabaergen Exp $ + +inherit eutils + +DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" +HOMEPAGE="http://xorg.freedesktop.org" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +# Collision protect will scream bloody murder if we install over old versions +RDEPEND="!<=x11-base/xorg-x11-6.9" + +# Server +RDEPEND="${RDEPEND} + >=x11-base/xorg-server-1.2" + +# Common Applications +RDEPEND="${RDEPEND} + >=x11-apps/mesa-progs-6.5.2 + >=x11-apps/setxkbmap-1.0.2 + >=x11-apps/xauth-1.0.2 + >=x11-apps/xhost-1.0.1 + >=x11-apps/xinit-1.0.3 + >=x11-apps/xmodmap-1.0.2 + >=x11-apps/xrandr-1.0.2" + +# Common Libraries - move these to eclass eventually +RDEPEND="${RDEPEND} + >=x11-libs/libSM-1.0.2 + >=x11-libs/libXcomposite-0.3.1 + >=x11-libs/libXcursor-1.1.8 + >=x11-libs/libXdamage-1.1 + >=x11-libs/libXfixes-4.0.3 + >=x11-libs/libXp-1 + >=x11-libs/libXv-1.0.3 + >=x11-libs/libXxf86dga-1.0.1 + >=x11-libs/libXinerama-1.0.1 + >=x11-libs/libXScrnSaver-1.1.2" + +# Some fonts +RDEPEND="${RDEPEND} + media-fonts/ttf-bitstream-vera + >=media-fonts/font-bh-type1-1 + >=media-fonts/font-adobe-utopia-type1-1.0.1 + >=media-fonts/font-adobe-100dpi-1" + +# Documentation +RDEPEND="${RDEPEND} + >=app-doc/xorg-docs-1.2" + +DEPEND="${RDEPEND}" + +src_install() { + # Make /usr/X11R6 a symlink to ../usr. + dodir /usr + dosym ../usr /usr/X11R6 +} + +pkg_preinst() { + # Check for /usr/X11R6 -> /usr symlink + if [[ -e "${ROOT}usr/X11R6" ]] && + [[ $(readlink "${ROOT}usr/X11R6") != "../usr" ]]; then + eerror "${ROOT}usr/X11R6 isn't a symlink to ../usr. Please delete it." + ewarn "First, save a list of all the packages installing there:" + ewarn " equery belongs ${ROOT}usr/X11R6 > usr-x11r6-packages" + ewarn "This requires gentoolkit to be installed." + die "${ROOT}usr/X11R6 is not a symlink to ../usr." + fi + + # Filter out ModulePath line since it often holds a now-invalid path + # Bug #112924 + # For RC3 - filter out RgbPath line since it also seems to break things + XORGCONF="/etc/X11/xorg.conf" + if [ -e ${XORGCONF} ]; then + mkdir -p "${IMAGE}/etc/X11" + sed "/ModulePath/d" ${XORGCONF} > ${IMAGE}${XORGCONF} + sed -i "/RgbPath/d" ${IMAGE}${XORGCONF} + fi +} + +pkg_postinst() { + # I'm not sure why this was added, but we don't inherit x-modular + # x-modular_pkg_postinst + + echo + einfo "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}." + einfo "Any custom cursor sets should be placed in that directory." + echo + einfo "If you wish to set system-wide default cursors, please create" + einfo "${ROOT}usr/local/share/cursors/${PN}/default/index.theme" + einfo "with content: \"Inherits=theme_name\" so that future" + einfo "emerges will not overwrite those settings." + echo + einfo "Listening on TCP is disabled by default with startx." + einfo "To enable it, edit ${ROOT}usr/bin/startx." + echo + + ewarn "Please read the modular X migration guide at" + ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/modular-x-howto.xml" + echo + einfo "If you encounter any non-configuration issues, please file a bug at" + einfo "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux" + einfo "and attach ${ROOT}etc/X11/xorg.conf, ${ROOT}var/log/Xorg.0.log and emerge info" + echo + einfo "You can now choose which drivers are installed with the VIDEO_CARDS" + einfo "and INPUT_DEVICES settings. Set these like any other Portage" + einfo "variable in ${ROOT}etc/make.conf or on the command line." + echo + + # (#76985) + einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop" + einfo "for more information on configuring X." + echo + + # Try to get people to read this, pending #11359 + ebeep 5 + epause 10 +} -- 2.26.2