Uncomment SNAPSHOT so that Makefile.am patch takes effect.

Package-Manager: portage-2.0.51.22-r3

4 files changed, 57 insertions, 10 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 6b409cb01042..5f85a9460bd3 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.19 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.20 2005/10/20 18:26:34 joshuabaergen Exp $
+
+*xinit-0.99.2-r1 (20 Oct 2005)
+
+  20 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.2-r1.ebuild:
+  Uncomment SNAPSHOT so that Makefile.am patch takes effect.
 
 *xinit-0.99.2 (20 Oct 2005)
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c1a81568fe28..fdbc8da9835a 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,16 +1,18 @@
-MD5 dd8f1550300f5ed119e814a624c26a3f ChangeLog 3253
+MD5 c08f6ab9ce3aaae2908b4e49ae8e4f4a ChangeLog 3435
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 09a425df6f174ca8cca3cd74057060cf xinit-0.99.0-r2.ebuild 936
+MD5 3721f9f754931567329c2ab60c991a2d xinit-0.99.2-r1.ebuild 1095
+MD5 24842248eadf3bcc424755cded866222 xinit-0.99.2.ebuild 1026
+MD5 a3374e889491298e2a12e30a06b3dca1 xinit-0.99.1_pre20050905-r3.ebuild 1250
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
 MD5 2b07bc84cc3afab6b4de90b9e9c597c3 files/chooser.sh 1566
 MD5 a2cf0fce1909bbe52e7485c8143baf66 files/digest-xinit-0.99.0-r2 64
-MD5 b6ebfe34cdd7df554f78ac7973192429 files/digest-xinit-0.99.1_pre20050905-r3 76
-MD5 25ca8e4cacf6c712886ea0e8a69a05fe files/digest-xinit-0.99.2 64
-MD5 c6b1ec1d810ca971703b0cc7291d3e7c files/gentoo-startx-customization.patch 3931
-MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
+MD5 25ca8e4cacf6c712886ea0e8a69a05fe files/digest-xinit-0.99.2-r1 64
 MD5 965333ca03efda8a7302620a63c429f6 files/startDM.sh 922
 MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418
 MD5 49f1bd860cfa5fc4adb6023d8a1bb4f8 files/xinitrc 900
 MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
-MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 09a425df6f174ca8cca3cd74057060cf xinit-0.99.0-r2.ebuild 936
-MD5 a3374e889491298e2a12e30a06b3dca1 xinit-0.99.1_pre20050905-r3.ebuild 1250
-MD5 24842248eadf3bcc424755cded866222 xinit-0.99.2.ebuild 1026
+MD5 b6ebfe34cdd7df554f78ac7973192429 files/digest-xinit-0.99.1_pre20050905-r3 76
+MD5 c6b1ec1d810ca971703b0cc7291d3e7c files/gentoo-startx-customization.patch 3931
+MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
+MD5 25ca8e4cacf6c712886ea0e8a69a05fe files/digest-xinit-0.99.2 64
diff --git a/x11-apps/xinit/files/digest-xinit-0.99.2-r1 b/x11-apps/xinit/files/digest-xinit-0.99.2-r1
new file mode 100644
index 000000000000..4bd0eecd551d
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-0.99.2-r1
@@ -0,0 +1 @@
+MD5 c1934c751cd949c1a9afa3104a7ef357 xinit-0.99.2.tar.bz2 88529
diff --git a/x11-apps/xinit/xinit-0.99.2-r1.ebuild b/x11-apps/xinit/xinit-0.99.2-r1.ebuild
new file mode 100644
index 000000000000..6ebd0198543b
--- /dev/null
+++ b/x11-apps/xinit/xinit-0.99.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.2-r1.ebuild,v 1.1 2005/10/20 18:26:34 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# This is enabled due to modified Makefile.am from the patches
+SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xinit application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
+	${FILESDIR}/gentoo-startx-customization.patch"
+
+src_unpack() {
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /etc/X11
+	doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Xsession
+	exeinto /etc/X11/xinit
+	doexe ${FILESDIR}/xinitrc
+	newinitd ${FILESDIR}/xdm.start xdm
+	newpamd ${FILESDIR}/xserver.pamd xserver
+}