(#127425) Install xprint init scripts and directories, patch by Ed Catmur.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 70 insertions, 8 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 2074a2e12946..fa0499b70533 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.94 2006/03/24 18:31:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.95 2006/03/24 18:45:00 spyderous Exp $
+
+  24 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; +files/xprint.init,
+  xorg-server-1.0.2-r1.ebuild:
+  (#127425) Install xprint init scripts and directories, patch by Ed Catmur.
 
   24 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-1.0.2-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c6209d36cb9e..d89be6c9d505 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
-MD5 2847e040858483ffd1f524bd71e28bdf ChangeLog 19578
-RMD160 38d635afd5bb121e2fc479b5785f5dae76ca01f5 ChangeLog 19578
-SHA256 c6d8bb293f4474c9c3ed0ba1cdb4f520a96b7dfb3ea7ee23518e1ccb76aa5ef2 ChangeLog 19578
+MD5 80f0f4a3d92f7caf7ced24ee2002c21d ChangeLog 19762
+RMD160 da13c37b3790d8fac0f6057cf6b4cb68dfc13864 ChangeLog 19762
+SHA256 b4ad004878f9d0cf06ede4861aedaf4188d37a8d9f732cdf11c1b474e7e2ed43 ChangeLog 19762
 MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
@@ -16,9 +16,12 @@ SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xo
 MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
+MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
+RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
+SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 cd7e0787d6519652bb5ad154ec01f078 xorg-server-1.0.2-r1.ebuild 4490
-RMD160 701e1cf24d8774390fcf9ce6590441c9028538ef xorg-server-1.0.2-r1.ebuild 4490
-SHA256 9e1844a57c266edd120b5261f8ad5d405d9e235426d07afdf52b5ac578763c50 xorg-server-1.0.2-r1.ebuild 4490
+MD5 56dabb9d14e0955848f39e80cbde9bd0 xorg-server-1.0.2-r1.ebuild 5401
+RMD160 2b5dba59a082e4b7776cf93e05dd98394d7bc118 xorg-server-1.0.2-r1.ebuild 5401
+SHA256 9225f21661d7ed337c311ebea694b465aacc821938a97241110ba9e115da8213 xorg-server-1.0.2-r1.ebuild 5401
diff --git a/x11-base/xorg-server/files/xprint.init b/x11-base/xorg-server/files/xprint.init
new file mode 100644
index 000000000000..e5fed1b60c8e
--- /dev/null
+++ b/x11-base/xorg-server/files/xprint.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $
+
+opts="${opts} get_xpserverlist lsprinters"
+
+depend() {
+	use cupsd
+}
+
+start() {
+	ebegin "Starting xprint"
+	/usr/lib/misc/xprint start > /dev/null
+	eend $?
+}
+
+get_xpserverlist() {
+	/usr/lib/misc/xprint get_xpserverlist
+}
+
+lsprinters() {
+	/usr/lib/misc/xprint lsprinters
+}
+
+stop() {
+	ebegin "Stopping xprint"
+	/usr/lib/misc/xprint stop > /dev/null
+	eend $?
+}
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
index 570fb97e4c26..4cf8d25bd443 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.0.2-r1.ebuild,v 1.3 2006/03/24 18:31:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild,v 1.4 2006/03/24 18:45:00 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -126,6 +126,8 @@ src_install() {
 	x-modular_src_install
 
 	dynamic_libgl_install
+
+	use xprint && xprint_src_install
 }
 
 pkg_postinst() {
@@ -161,3 +163,26 @@ switch_opengl_implem() {
 		echo
 		eselect opengl set --use-old ${OPENGL_DIR}
 }
+
+xprint_src_install() {
+	# RH-style init script, we provide a wrapper
+	exeinto /usr/$(get_libdir)/misc
+	# Actually a shell script, someone messed up
+	newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint
+	sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint
+	# Install the wrapper
+	newinitd ${FILESDIR}/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins ${S}/Xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
+		92xprint-xpserverlist.sh
+	# 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.sh
+	# 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*
+}