[gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/

[Michael Weber]

commit:     ef07122ab813c5dd9f4ef502ac357436d014931f
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 11:37:31 2013 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 11:37:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ef07122a

inherit readme.gentoo, fix user creation, ease inittab handling

Package-Manager: portage-2.2.0_alpha191
Manifest-Sign-Key: 62EEF090

---
 x11-misc/trivdm/ChangeLog                    |  6 +++
 x11-misc/trivdm/trivdm-0_p20130707-r1.ebuild | 64 ++++++++++++++++++++++++++++
 x11-misc/trivdm/trivdm-0_p20130707.ebuild    | 62 ---------------------------
 3 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 47d3c93..0dc097c 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trivdm-0_p20130707-r1 (01 Aug 2013)
+
+  01 Aug 2013; Michael Weber <xmw@g.o> +trivdm-0_p20130707-r1.ebuild,
+  -trivdm-0_p20130707.ebuild:
+  inherit readme.gentoo, fix user creation, ease inittab handling
+
 *trivdm-0_p20130707 (07 Jul 2013)
 
   07 Jul 2013; Michael Weber <xmw@g.o> +files/trivdm-0_p20130707,

diff --git a/x11-misc/trivdm/trivdm-0_p20130707-r1.ebuild b/x11-misc/trivdm/trivdm-0_p20130707-r1.ebuild
new file mode 100644
index 0000000..e6060e3
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20130707-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils readme.gentoo user
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/sudo
+	app-misc/toilet
+	app-shells/zsh
+	sys-apps/daemonize
+	sys-apps/kbd"
+DEPEND=""
+
+S=${WORKDIR}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
+
+	readme.gentoo_print_elog
+}
+
+src_install() {
+	newbin "${FILESDIR}"/${P} ${PN}
+
+	echo "CONFIG_PROTECT=\"/usr/bin/${PN}\"" > "${T}"/90${PN} || die
+	doenvd "${T}"/90${PN}
+
+	echo "#${PN} ALL=(root) NOPASSWD: /sbin/reboot,/sbin/halt" \
+		> "${T}"/${PN} || die
+	insopts -m0440
+	insinto /etc/sudoers.d
+	doins "${T}"/${PN}
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Your system needs 5 minor adjustments that
+must not be made by Gentoo portage system:
+1) enable xscreensaver->newlogin compartibility
+    ln -s ../../bin/${PN} /usr/local/bin/gdmflexiserver
+2) tune w to display remote login sessions and daemonized X11
+    ln -s ../../bin/${PN} /usr/local/bin/w
+3) set a fancy font on framebuffer console on startup
+    ln -s ../../usr/bin/${PN} /etc/local.d/${PN}.start
+4) grant chvt to everyone
+    chmod u+s /usr/bin/chvt
+5) updated /etc/inittab (etc-update, dispatch-conf, ...) and reload
+    echo \"c7:2345:respawn:/usr/bin/openvt -c 7 -f -w /usr/bin/trivdm\" \
+		> /etc/inittab 
+    kill -HUP 1
+Install app-admin/sudo and review /etc/sudoers.d/${PN}"

diff --git a/x11-misc/trivdm/trivdm-0_p20130707.ebuild b/x11-misc/trivdm/trivdm-0_p20130707.ebuild
deleted file mode 100644
index e69e043..0000000
--- a/x11-misc/trivdm/trivdm-0_p20130707.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="trivial display manager"
-HOMEPAGE="http://xmw.de/tmp/trivdm"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/sudo
-	app-misc/toilet
-	app-shells/zsh
-	sys-apps/daemonize
-	sys-apps/kbd"
-DEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
-}
-
-src_install() {
-	newbin "${FILESDIR}"/${P} ${PN} || die
-	dodir /etc/env.d || die
-	echo "CONFIG_PROTECT=\"/usr/bin/${PN}\"" \
-		> "${D}"/etc/env.d/90${PN} || die
-	dodir /etc/sudoers.d || die
-	echo "#${PN} ALL=(root) NOPASSWD: /sbin/reboot,/sbin/halt" \
-		> "${D}"/etc/sudoers.d/${PN} || die
-	chmod 0440 "${D}"/etc/sudoers.d/${PN} || die
-}
-
-pkg_preinst() {
-	sed -e "/^c7:/d" /etc/inittab > "${ED}"/etc/inittab || die
-	sed -n -e '/c7:/{s/^.*c7:/c7:/ ; s:/local/:/: ; p}' \
-		"${ED}"/usr/bin/${PN} >> "${ED}"/etc/inittab || die
-
-	elog "IMPORTANT NOTE"
-	elog "Your system needs 5 minor adjustments that"
-	elog "must not be made by Gentoo portage system:"
-	elog "1) enable xscreensaver->newlogin compartibility"
-	elog "    ln -s ../../bin/${PN} /usr/local/bin/gdmflexiserver"
-	elog "2) tune w to display remote login sessions and daemonized X11"
-	elog "    ln -s ../../bin/${PN} /usr/local/bin/w"
-	elog "3) set a fancy font on framebuffer console on startup"
-	elog "    ln -s ../../usr/bin/${PN} /etc/local.d/${PN}.start"
-	elog "4) grant chvt to everyone"
-	elog "    chmod u+s /usr/bin/chvt"
-	elog "5) updated /etc/inittab (etc-update, ...) and reload"
-	elog "    kill -HUP 1"
-	elog "Install app-admin/sudo and review /etc/sudoers.d/${PN}"
-}