x11-base/xorg-server: 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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 15 insertions, 74 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/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;