diff options
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild | 40 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.4.2.ebuild | 42 |
4 files changed, 18 insertions, 77 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 4d0a858b7c08..0e4666a4640e 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.399 2009/05/10 22:18:05 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.400 2009/05/13 08:53:59 remi Exp $ + + 13 May 2009; Rémi Cardona <remi@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild: + drop XPrint support from 1.3 and 1.4, no-one missed it in 1.5 and dropping + it in the older servers will help with portage-wide clean-ups 10 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r5.ebuild, xorg-server-1.5.3-r6.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 9b18b9e0545d..ff6501af9701 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -55,10 +55,10 @@ DIST xorg-server-1.5.3-gentoo-patches-06.tar.bz2 55438 RMD160 a6ef6cf863df995917 DIST xorg-server-1.5.3-gentoo-patches-07.tar.bz2 56276 RMD160 97afcb579d9ee10f4b2c715538557faa5d5f0eb6 SHA1 b48ea89f36e53062c4b903e613da48791bc36f64 SHA256 b80b45acb18068e7b4516cb58253f4cf1cd505f4d1a1b0b1c53e22ec7c12315b DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb -EBUILD xorg-server-1.3.0.0-r6.ebuild 18332 RMD160 dcb87d12e9bde7f7580ab594be30015caaf32582 SHA1 ba7ee79ea7f7462299e2838a4b100f82e1306220 SHA256 db1d21e2a5f99b813227d2ce32294f19ec79cdee0198a7df909c207cf36a770c -EBUILD xorg-server-1.4.2.ebuild 18259 RMD160 6aada909523f3941c0cb32332bb68407e6964814 SHA1 39d925056c108f0478f1e594bd9d178c7fb0f9f5 SHA256 b8700d79414cdf78f2a5a00a4c3b5a56a9ce96334277c0e668e96600cff0ef80 +EBUILD xorg-server-1.3.0.0-r6.ebuild 17164 RMD160 bef98d1c48882c0e72a20506bf0f1f636d0ee5c9 SHA1 5f28673354394dedd53e9019dc62b84d7583e3ac SHA256 63099fbc0624662ab267753bb423a46f636220ee303c09e9afbf0d74f4bd1fbe +EBUILD xorg-server-1.4.2.ebuild 17051 RMD160 738a10147fd3cad02c38741c3121a3ebf0644fb4 SHA1 9dda0f9aedb0761edc7287b0f4810faca97e36f3 SHA256 dd5034d1e31a56257904734ee66827d5cb2de751d5ff6fd264bb2499e2345178 EBUILD xorg-server-1.5.3-r4.ebuild 16847 RMD160 138b4d01c414af00202ed4c862a8ab32478d1a91 SHA1 1d9adcfd151eecab16b0bf68be57ef2680198fc4 SHA256 eca029f6fa3f70d9a9ff801fee48ec9aad9d2a43cd8c369a327955489db841a0 EBUILD xorg-server-1.5.3-r5.ebuild 17002 RMD160 47d9dd7d6af789f22208ce906e8facde51c328b7 SHA1 2e5b9383f9cd9fed0a8d260e3521ca121a79358b SHA256 f513aaa4adbff8cbee7b0a24d54b4227624b700197123184bbd369c3787a0ce9 EBUILD xorg-server-1.5.3-r6.ebuild 17009 RMD160 4ef9066a86ef56fb419956a1af7103c414db2fb7 SHA1 84c663fd12db525440e22cb1833251e7e9d16c39 SHA256 86eefbde11d8a00b1edc557985d085d8a3179de724524282a5af9d9a185dfeee -MISC ChangeLog 93546 RMD160 38fe691df83739b6aab7ec4c1d1bafb7ceb117da SHA1 48f57ebd8780838673081e610010cb466833a2f3 SHA256 a8b25c22bcd71d4db50a2236229137e2ba7bc8aa8de0b596868c597864640bea +MISC ChangeLog 93794 RMD160 9d7c6e8a783e696775a2a28dfccd670774bdff93 SHA1 1eb63e7a231a7e2224f53e59b737a8411c55d86a SHA256 b65f3c62b68eeca2c74cdf3ae619b65383edc1db6aa218ce73b4ea9f11738f87 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild index 8b9f64dda6dc..fda29a6c4b64 100644 --- a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild +++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.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.3.0.0-r6.ebuild,v 1.9 2009/05/05 16:17:13 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild,v 1.10 2009/05/13 08:53:59 remi Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -104,7 +104,7 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} ${IUSE_SERVERS} 3dfx - dri ipv6 minimal nptl sdl xprint" + dri ipv6 minimal nptl sdl" RDEPEND=">=x11-libs/libXfont-1.2.5 x11-libs/xtrans x11-libs/libXau @@ -171,11 +171,7 @@ DEPEND="${RDEPEND} >=x11-proto/glproto-1.4.8 dmx? ( x11-proto/dmxproto ) dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2.3 ) - xprint? ( =x11-proto/printproto-1.0.3 - x11-apps/mkfontdir - x11-apps/mkfontscale - x11-apps/xplsprinters )" + >=x11-libs/libdrm-2.3 )" # Drivers PDEPEND=" @@ -325,7 +321,7 @@ pkg_setup() { $(use_enable !minimal install-libxf86config) $(use_enable dri) $(use_enable xorg) - $(use_enable xprint) + --disable-xprint $(use_enable nptl glx-tls) $(use_enable !minimal xorgcfg) --sysconfdir=/etc/X11 @@ -370,12 +366,6 @@ src_unpack() { fi fi x-modular_reconf_source - #do not install xprint's Xsession.d files, we'll do it later - if use xprint; then - sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \ - -i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \ - || die "sed of Xsession.d makefile failed" - fi } src_install() { @@ -511,8 +501,6 @@ dynamic_libgl_install() { } server_based_install() { - use xprint && xprint_src_install - if ! use xorg; then rm "${D}"/usr/share/man/man1/Xserver.1x \ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ @@ -530,26 +518,6 @@ switch_opengl_implem() { eselect opengl set ${OLD_IMPLEM} } -xprint_src_install() { - # RH-style init script, we provide a wrapper - exeinto /usr/$(get_libdir)/misc - doexe "${S}"/hw/xprint/etc/init.d/xprint - # Install the wrapper - newinitd "${FILESDIR}"/xprint.init xprint - # Install profile scripts - insinto /etc/profile.d - doins "${S}"/hw/xprint/etc/profile.d/xprint* - insinto /etc/X11/xinit/xinitrc.d - doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist - # Patch profile scripts - sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ - get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ - "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist - # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo - dodoc "${D}"/etc/profile.d/xprint* - rm -f "${D}"/etc/profile.d/xprint* -} - ensure_a_server_is_building() { for server in ${IUSE_SERVERS}; do use ${server} && return; diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild index bf7e10a58008..6de9e7bb24ce 100644 --- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.4.2.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.4.2.ebuild,v 1.11 2009/05/05 15:05:50 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.12 2009/05/13 08:53:59 remi Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -108,7 +108,7 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} ${IUSE_SERVERS} 3dfx tslib - dri hal ipv6 minimal nptl sdl xprint" + dri hal ipv6 minimal nptl sdl" RDEPEND="hal? ( sys-apps/hal ) tslib? ( x11-libs/tslib ) >=x11-libs/libXfont-1.3.1 @@ -179,11 +179,7 @@ DEPEND="${RDEPEND} >=x11-proto/glproto-1.4.8 dmx? ( >=x11-proto/dmxproto-2.2.2 ) dri? ( >=x11-proto/xf86driproto-2.0.3 - >=x11-libs/libdrm-2.3 ) - xprint? ( =x11-proto/printproto-1.0.3 - >=x11-apps/mkfontdir-1.0.3 - >=x11-apps/mkfontscale-1.0.3 - >=x11-apps/xplsprinters-1.0.1 )" + >=x11-libs/libdrm-2.3 )" # Drivers PDEPEND=" @@ -311,7 +307,7 @@ pkg_setup() { $(use_enable !minimal install-libxf86config) $(use_enable dri) $(use_enable xorg) - $(use_enable xprint) + --disable-xprint $(use_enable nptl glx-tls) $(use_enable !minimal xorgcfg) $(use_enable hal config-dbus) @@ -369,7 +365,7 @@ src_unpack() { # Make sure eautoreconf gets run if we need the autoconf/make # changes. if [[ ${SNAPSHOT} != "yes" ]]; then - if use kdrive || use dmx || use xprint; then + if use kdrive || use dmx ; then SNAPSHOT="yes" fi fi @@ -383,12 +379,6 @@ src_unpack() { fi x-modular_reconf_source - #do not install xprint's Xsession.d files, we'll do it later - if use xprint; then - sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \ - -i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \ - || die "sed of Xsession.d makefile failed" - fi } src_install() { @@ -529,8 +519,6 @@ dynamic_libgl_install() { } server_based_install() { - use xprint && xprint_src_install - if ! use xorg; then rm "${D}"/usr/share/man/man1/Xserver.1x \ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ @@ -548,26 +536,6 @@ switch_opengl_implem() { eselect opengl set ${OLD_IMPLEM} } -xprint_src_install() { - # RH-style init script, we provide a wrapper - exeinto /usr/$(get_libdir)/misc - doexe "${S}"/hw/xprint/etc/init.d/xprint - # Install the wrapper - newinitd "${FILESDIR}"/xprint.init xprint - # Install profile scripts - insinto /etc/profile.d - doins "${S}"/hw/xprint/etc/profile.d/xprint* - exeinto /etc/X11/xinit/xinitrc.d - doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist - # Patch profile scripts - sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ - get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ - "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist - # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo - dodoc "${D}"/etc/profile.d/xprint* - rm -f "${D}"/etc/profile.d/xprint* -} - ensure_a_server_is_building() { for server in ${IUSE_SERVERS}; do use ${server} && return; |