mrueg       15/07/10 18:24:36

  Modified:             ChangeLog
  Added:                xorg-server-1.17.2.ebuild
  Log:
  Version bump. See bug #551680.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.853                x11-base/xorg-server/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.853&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.853&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.852&r2=1.853

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- ChangeLog   3 Jul 2015 09:56:57 -0000       1.852
+++ ChangeLog   10 Jul 2015 18:24:36 -0000      1.853
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.852 
2015/07/03 09:56:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.853 
2015/07/10 18:24:36 mrueg Exp $
+
+*xorg-server-1.17.2 (10 Jul 2015)
+
+  10 Jul 2015; Manuel RĂ¼ger <mr...@gentoo.org> +xorg-server-1.17.2.ebuild:
+  Version bump. See bug #551680.
 
   03 Jul 2015; Agostino Sarubbo <a...@gentoo.org> xorg-server-1.12.4-r5.ebuild:
   Stable for alpha, wrt bug #548002



1.1                  x11-base/xorg-server/xorg-server-1.17.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.17.2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.17.2.ebuild?rev=1.1&content-type=text/plain

Index: xorg-server-1.17.2.ebuild
===================================================================
# Copyright 1999-2015 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.17.2.ebuild,v 1.1 
2015/07/10 18:24:36 mrueg Exp $

EAPI=5

XORG_DOC=doc
inherit xorg-2 multilib versionator flag-o-matic
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"

DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"

IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib 
+udev unwind wayland"

CDEPEND=">=app-eselect/eselect-opengl-1.3.0
        dev-libs/openssl
        media-libs/freetype
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3
        x11-apps/xkbcomp
        >=x11-libs/libdrm-2.4.46
        >=x11-libs/libpciaccess-0.12.901
        >=x11-libs/libXau-1.0.4
        >=x11-libs/libXdmcp-1.0.2
        >=x11-libs/libXfont-1.4.2
        >=x11-libs/libxkbfile-1.0.4
        >=x11-libs/libxshmfence-1.1
        >=x11-libs/pixman-0.27.2
        >=x11-libs/xtrans-1.3.5
        >=x11-misc/xbitmaps-1.0.1
        >=x11-misc/xkeyboard-config-2.4.1-r3
        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.99.4
                >=x11-libs/libXfixes-5.0
                >=x11-libs/libXi-1.2.99.1
                >=x11-libs/libXmu-1.0.3
                x11-libs/libXrender
                >=x11-libs/libXres-1.0.3
                >=x11-libs/libXtst-1.0.99.2
        )
        glamor? (
                media-libs/libepoxy
                >=media-libs/mesa-10.3.4-r1[egl,gbm]
                !x11-libs/glamor
        )
        kdrive? (
                >=x11-libs/libXext-1.0.5
                x11-libs/libXv
        )
        xephyr? (
                x11-libs/libxcb
                x11-libs/xcb-util
                x11-libs/xcb-util-image
                x11-libs/xcb-util-keysyms
                x11-libs/xcb-util-renderutil
                x11-libs/xcb-util-wm
        )
        !minimal? (
                >=x11-libs/libX11-1.1.5
                >=x11-libs/libXext-1.0.5
                >=media-libs/mesa-10.3.4-r1[nptl=]
        )
        tslib? ( >=x11-libs/tslib-1.0 )
        udev? ( >=virtual/udev-150 )
        unwind? ( sys-libs/libunwind )
        wayland? (
                >=dev-libs/wayland-1.3.0
                media-libs/libepoxy
        )
        >=x11-apps/xinit-1.3.3-r1
        systemd? (
                sys-apps/dbus
                sys-apps/systemd
        )"

DEPEND="${CDEPEND}
        sys-devel/flex
        >=x11-proto/bigreqsproto-1.1.0
        >=x11-proto/compositeproto-0.4
        >=x11-proto/damageproto-1.1
        >=x11-proto/fixesproto-5.0
        >=x11-proto/fontsproto-2.1.3
        >=x11-proto/glproto-1.4.17-r1
        >=x11-proto/inputproto-2.2.99.1
        >=x11-proto/kbproto-1.0.3
        >=x11-proto/randrproto-1.4.0
        >=x11-proto/recordproto-1.13.99.1
        >=x11-proto/renderproto-0.11
        >=x11-proto/resourceproto-1.2.0
        >=x11-proto/scrnsaverproto-1.1
        >=x11-proto/trapproto-3.4.3
        >=x11-proto/videoproto-2.2.2
        >=x11-proto/xcmiscproto-1.2.0
        >=x11-proto/xextproto-7.2.99.901
        >=x11-proto/xf86dgaproto-2.0.99.1
        >=x11-proto/xf86rushproto-1.1.2
        >=x11-proto/xf86vidmodeproto-2.2.99.1
        >=x11-proto/xineramaproto-1.1.3
        >=x11-proto/xproto-7.0.26
        >=x11-proto/presentproto-1.0
        >=x11-proto/dri3proto-1.0
        dmx? (
                >=x11-proto/dmxproto-2.2.99.1
                doc? (
                        || (
                                www-client/links
                                www-client/lynx
                                www-client/w3m
                        )
                )
        )
        !minimal? (
                >=x11-proto/xf86driproto-2.1.0
                >=x11-proto/dri2proto-2.8
        )"

RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-xserver )
        !x11-drivers/xf86-video-modesetting
"

PDEPEND="
        xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"

REQUIRED_USE="!minimal? (
                || ( ${IUSE_SERVERS} )
        )
        xephyr? ( kdrive )"

#UPSTREAMED_PATCHES=(
#       "${WORKDIR}/patches/"
#)

PATCHES=(
        "${UPSTREAMED_PATCHES[@]}"
        "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
        "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
        # needed for new eselect-opengl, bug #541232
        "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
)

pkg_pretend() {
        # older gcc is not supported
        [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
                die "Sorry, but gcc earlier than 4.0 will not work for 
xorg-server."
}

src_configure() {
        # 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
        # NOTE: fop is used for doc generating ; and i have no idea if gentoo
        #       package it somewhere
        XORG_CONFIGURE_OPTIONS=(
                $(use_enable ipv6)
                $(use_enable dmx)
                $(use_enable glamor)
                $(use_enable kdrive)
                $(use_enable kdrive kdrive-kbd)
                $(use_enable kdrive kdrive-mouse)
                $(use_enable kdrive kdrive-evdev)
                $(use_enable suid install-setuid)
                $(use_enable tslib)
                $(use_enable unwind libunwind)
                $(use_enable wayland xwayland)
                $(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 xephyr)
                $(use_enable xnest)
                $(use_enable xorg)
                $(use_enable xvfb)
                $(use_enable nptl glx-tls)
                $(use_enable udev config-udev)
                $(use_with doc doxygen)
                $(use_with doc xmlto)
                $(use_with systemd systemd-daemon)
                $(use_enable systemd systemd-logind)
                --enable-libdrm
                --sysconfdir="${EPREFIX}"/etc/X11
                --localstatedir="${EPREFIX}"/var
                --with-fontrootdir="${EPREFIX}"/usr/share/fonts
                --with-xkb-output="${EPREFIX}"/var/lib/xkb
                --disable-config-hal
                --disable-linux-acpi
                --without-dtrace
                --without-fop
                --with-os-vendor=Gentoo
                --with-sha1=libcrypto
        )

        xorg-2_src_configure
}

src_install() {
        xorg-2_src_install

        server_based_install

        if ! use minimal &&     use xorg; then
                # Install xorg.conf.example into docs
                dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
        fi

        newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
        newinitd "${FILESDIR}"/xdm.initd-11 xdm
        newconfd "${FILESDIR}"/xdm.confd-4 xdm

        # install the @x11-module-rebuild set for Portage
        insinto /usr/share/portage/config/sets
        newins "${FILESDIR}"/xorg-sets.conf xorg.conf
}

pkg_postinst() {
        # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
        eselect opengl set xorg-x11 --use-old
}

pkg_postrm() {
        # Get rid of module dir to ensure opengl-update works properly
        if [[ -z ${REPLACED_BY_VERSION} && -e 
${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
                rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
        fi
}

server_based_install() {
        if ! use xorg; then
                rm "${ED}"/usr/share/man/man1/Xserver.1x \
                        "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
                        "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
                        "${ED}"/usr/share/man/man1/Xserver.1x
        fi
}




Reply via email to