diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-24 13:17:39 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-24 13:17:39 +0000 |
commit | 177cc3e7f78a4615f5071da8dfdf492ec6bd0ad2 (patch) | |
tree | fccfcf904ff044061a2a32c899086de1d97b7f9d /x11-base | |
parent | dont need the binutils-config-1.9 sanity check anymore #297928 by Willard Dawson (diff) | |
download | gentoo-2-177cc3e7f78a4615f5071da8dfdf492ec6bd0ad2.tar.gz gentoo-2-177cc3e7f78a4615f5071da8dfdf492ec6bd0ad2.tar.bz2 gentoo-2-177cc3e7f78a4615f5071da8dfdf492ec6bd0ad2.zip |
Pdepend on mesa instead of rdepend. Drop older versions.
(Portage version: 2.2_rc60/cvs/Linux i686)
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.7.3.901.ebuild | 261 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.7.3.ebuild | 261 |
4 files changed, 9 insertions, 526 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 0be8c1bd34ab..53a160d8b972 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.476 2009/12/16 21:52:49 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.477 2009/12/24 13:17:39 scarabeus Exp $ + + 24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.3.ebuild, -xorg-server-1.7.3.901.ebuild, + xorg-server-1.7.3.901-r1.ebuild: + Pdepend on mesa instead of rdepend. Drop older versions. *xorg-server-1.7.3.901-r1 (16 Dec 2009) diff --git a/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild index a1e605576b6f..c0bcb90cf4e4 100644 --- a/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild,v 1.1 2009/12/16 21:52:49 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild,v 1.2 2009/12/24 13:17:39 scarabeus Exp $ EAPI="2" @@ -52,7 +52,6 @@ RDEPEND="hal? ( sys-apps/hal ) >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=x11-libs/libXres-1.0.3 - >=media-libs/mesa-7.4[nptl=] ) >=x11-libs/libxkbui-1.0.2 kdrive? ( @@ -113,7 +112,8 @@ DEPEND="${RDEPEND} >=x11-libs/libdrm-2.3.0 )" -PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" +PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) ) + !minimal? ( >=media-libs/mesa-7.4[nptl=] )" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" diff --git a/x11-base/xorg-server/xorg-server-1.7.3.901.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.901.ebuild deleted file mode 100644 index 2cb14850704b..000000000000 --- a/x11-base/xorg-server/xorg-server-1.7.3.901.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.901.ebuild,v 1.1 2009/12/13 20:56:54 scarabeus Exp $ - -EAPI="2" - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular multilib versionator - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -OPENGL_DIR="xorg-x11" - -DESCRIPTION="X.Org X servers" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - dev-libs/openssl - >=x11-libs/libXfont-1.3.3 - >=x11-libs/xtrans-1.2.2 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libpciaccess-0.10.3 - >=x11-libs/pixman-0.15.20 - media-libs/freetype - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 - x11-apps/xkbcomp - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - >=x11-apps/xinit-1.0.8-r3 - >=app-admin/eselect-opengl-1.0.8 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.5 - >=x11-libs/libXfixes-4.0.3 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXtst-1.0.3 - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=x11-libs/libXres-1.0.3 - >=media-libs/mesa-7.4[nptl=] - ) - >=x11-libs/libxkbui-1.0.2 - kdrive? ( - >=x11-libs/libXext-1.0.5 - sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent - # Xaw is dmx-dependent - # Xpm is dmx-dependent, pulls in Xt - # xkbcomp is launched at startup but not checked by ./configure - -## Deps that don't have a version in configure.ac but do here: -# x11-proto/resourceproto -# x11-proto/fontsproto -# x11-libs/libXau -# x11-libs/libXfont -# x11-libs/libXdmcp -# x11-libs/libXext -# x11-libs/libX11 -# x11-libs/libXrender -# x11-libs/libXmu -# x11-libs/libXfixes -# x11-libs/libXtst -# x11-proto/xineramaproto -# x11-proto/dmxproto -## Deps that are larger here than in configure.ac -# x11-libs/libpciaccess-0.8.0 -# - -DEPEND="${RDEPEND} - !!net-dialup/dtrace - sys-devel/flex - >=x11-proto/randrproto-1.2.99.3 - >=x11-proto/renderproto-0.11 - >=x11-proto/fixesproto-4.1 - >=x11-proto/damageproto-1.1 - >=x11-proto/xextproto-7.0.99.3 - >=x11-proto/xproto-7.0.13 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/compositeproto-0.4 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/inputproto-1.9.99.902 - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/glproto-1.4.9 - dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.1 - >=x11-libs/libdrm-2.3.0 - )" - -PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" - -# These have been sent upstream -UPSTREAMED_PATCHES=( - #"${WORKDIR}/patches/" - ) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - ) - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts="${conf_opts} --enable-xsdl" - else - conf_opts="${conf_opts} --disable-xsdl" - fi - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # --enable-install-setuid needed because sparcs default off - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xorg) - $(use_enable nptl glx-tls) - $(use_enable hal config-hal) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --without-dtrace - ${conf_opts}" - - # (#121394) Causes window corruption - filter-flags -fweb - - # Incompatible with GCC 3.x SSP on x86, bug #244352 - if use x86 ; then - if [[ $(gcc-major-version) -lt 4 ]]; then - filter-flags -fstack-protector - fi - fi - - OLD_IMPLEM="$(eselect opengl show)" - eselect opengl set ${OPENGL_DIR} -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example (see bugs #151421 and #151670) - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" - fi -} - -pkg_postinst() { - switch_opengl_implem - - echo - ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6" - ewarn "or earlier, because the ABI changed. If you cannot start X because" - ewarn "of module version mismatch errors, this is your problem." - - echo - ewarn "You can generate a list of all installed packages in the x11-drivers" - ewarn "category using this command:" - ewarn "emerge portage-utils; qlist -I -C x11-drivers/" - - ebeep 5 - epause 10 -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if ! has_version x11-base/xorg-server; then - if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules - fi - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - local x="" - for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! use xorg; then - rm "${D}"/usr/share/man/man1/Xserver.1x \ - "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${D}"/usr/share/man/man1/Xserver.1x - fi -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set ${OLD_IMPLEM} -} - -ensure_a_server_is_building() { - for server in ${IUSE_SERVERS}; do - use ${server} && return; - done - eerror "You need to specify at least one server to build." - eerror "Valid servers are: ${IUSE_SERVERS}." - die "No servers were specified to build." -} diff --git a/x11-base/xorg-server/xorg-server-1.7.3.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.ebuild deleted file mode 100644 index 099e3885cb01..000000000000 --- a/x11-base/xorg-server/xorg-server-1.7.3.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.ebuild,v 1.1 2009/12/03 11:40:51 remi Exp $ - -EAPI="2" - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular multilib versionator - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -OPENGL_DIR="xorg-x11" - -DESCRIPTION="X.Org X servers" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - dev-libs/openssl - >=x11-libs/libXfont-1.3.3 - >=x11-libs/xtrans-1.2.2 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libpciaccess-0.10.3 - >=x11-libs/pixman-0.15.20 - media-libs/freetype - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 - x11-apps/xkbcomp - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - >=x11-apps/xinit-1.0.8-r3 - >=app-admin/eselect-opengl-1.0.8 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.5 - >=x11-libs/libXfixes-4.0.3 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXtst-1.0.3 - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=x11-libs/libXres-1.0.3 - >=media-libs/mesa-7.4[nptl=] - ) - >=x11-libs/libxkbui-1.0.2 - kdrive? ( - >=x11-libs/libXext-1.0.5 - sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent - # Xaw is dmx-dependent - # Xpm is dmx-dependent, pulls in Xt - # xkbcomp is launched at startup but not checked by ./configure - -## Deps that don't have a version in configure.ac but do here: -# x11-proto/resourceproto -# x11-proto/fontsproto -# x11-libs/libXau -# x11-libs/libXfont -# x11-libs/libXdmcp -# x11-libs/libXext -# x11-libs/libX11 -# x11-libs/libXrender -# x11-libs/libXmu -# x11-libs/libXfixes -# x11-libs/libXtst -# x11-proto/xineramaproto -# x11-proto/dmxproto -## Deps that are larger here than in configure.ac -# x11-libs/libpciaccess-0.8.0 -# - -DEPEND="${RDEPEND} - !!net-dialup/dtrace - sys-devel/flex - >=x11-proto/randrproto-1.2.99.3 - >=x11-proto/renderproto-0.11 - >=x11-proto/fixesproto-4.1 - >=x11-proto/damageproto-1.1 - >=x11-proto/xextproto-7.0.99.3 - >=x11-proto/xproto-7.0.13 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/compositeproto-0.4 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/inputproto-1.9.99.902 - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/glproto-1.4.9 - dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.1 - >=x11-libs/libdrm-2.3.0 - )" - -PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" - -# These have been sent upstream -UPSTREAMED_PATCHES=( - #"${WORKDIR}/patches/" - ) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - ) - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts="${conf_opts} --enable-xsdl" - else - conf_opts="${conf_opts} --disable-xsdl" - fi - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # --enable-install-setuid needed because sparcs default off - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xorg) - $(use_enable nptl glx-tls) - $(use_enable hal config-hal) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --without-dtrace - ${conf_opts}" - - # (#121394) Causes window corruption - filter-flags -fweb - - # Incompatible with GCC 3.x SSP on x86, bug #244352 - if use x86 ; then - if [[ $(gcc-major-version) -lt 4 ]]; then - filter-flags -fstack-protector - fi - fi - - OLD_IMPLEM="$(eselect opengl show)" - eselect opengl set ${OPENGL_DIR} -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example (see bugs #151421 and #151670) - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" - fi -} - -pkg_postinst() { - switch_opengl_implem - - echo - ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6" - ewarn "or earlier, because the ABI changed. If you cannot start X because" - ewarn "of module version mismatch errors, this is your problem." - - echo - ewarn "You can generate a list of all installed packages in the x11-drivers" - ewarn "category using this command:" - ewarn "emerge portage-utils; qlist -I -C x11-drivers/" - - ebeep 5 - epause 10 -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if ! has_version x11-base/xorg-server; then - if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules - fi - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - local x="" - for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! use xorg; then - rm "${D}"/usr/share/man/man1/Xserver.1x \ - "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${D}"/usr/share/man/man1/Xserver.1x - fi -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set ${OLD_IMPLEM} -} - -ensure_a_server_is_building() { - for server in ${IUSE_SERVERS}; do - use ${server} && return; - done - eerror "You need to specify at least one server to build." - eerror "Valid servers are: ${IUSE_SERVERS}." - die "No servers were specified to build." -} |