old

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

3 files changed, 5 insertions, 67 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 9da48c9bb7cb..918ccc791f6c 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.193 2010/11/13 19:22:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.194 2010/11/20 16:23:45 scarabeus Exp $
+
+  20 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xinit-1.2.0-r3.ebuild:
+  old
 
   13 Nov 2010; Raúl Porcel <armin76@gentoo.org> xinit-1.2.0-r4.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #343911
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index a381fae20d1c..c7f41c710180 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -11,8 +11,7 @@ AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845
 AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3bc8abbaade83cd2583d16e8887e15b SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387
 DIST xinit-1.2.0.tar.bz2 136781 RMD160 c2895db985482c13ef300a037bf2e182aeda1442 SHA1 85a838c2010f27ef6d09d6ec4b1208a66cc8d697 SHA256 ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
 DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
-EBUILD xinit-1.2.0-r3.ebuild 1889 RMD160 120478ef87a845a1c614a219b66089873339b2fc SHA1 85e5f1304ab5bd87ce36455be440272c3f5d0f9b SHA256 7deb616d0216b3b1d1459d27e88dceeb04b0c57ceaa98f1c6099789200987734
 EBUILD xinit-1.2.0-r4.ebuild 1889 RMD160 4fc9db08d40c52d0929cd42430264bd51e47e98f SHA1 8636696d917514d52399fb613ae91b2c3a7a7ac9 SHA256 a5b50e1b5ab9de96f23ec7b70f3bdb974aef28f09e9c629b3d76767a08eb63c3
 EBUILD xinit-1.3.0-r1.ebuild 1695 RMD160 d66edd6419fc223b5a26ea0b6cbfbf4863cd7ccd SHA1 9e5fbd9232f9134b223372442368632bc86068ab SHA256 d2a1f5e9ea7e82acd6619fb447871bfa354625fb795e22fb1bece916bc316dde
-MISC ChangeLog 30279 RMD160 0d87a82870d6c2a19a0a8971dcf7917b086b3b90 SHA1 781e83033da13f58d03d31688a24fdf981e31b2e SHA256 0835e89bca0c80e886910f2c942c632b7cff72cf4ffb54a196ac914363c123db
+MISC ChangeLog 30367 RMD160 3e712d02e890172fac34d36783c6fec730b13676 SHA1 ecc89d207b81bc87167215217857891029450748 SHA256 474aa26e93decc505e4da8f6643ebc6f175dd53c42ad93540a0e2c0fc76e07d1
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
diff --git a/x11-apps/xinit/xinit-1.2.0-r3.ebuild b/x11-apps/xinit/xinit-1.2.0-r3.ebuild
deleted file mode 100644
index 8021ab498175..000000000000
--- a/x11-apps/xinit/xinit-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.0-r3.ebuild,v 1.9 2010/01/19 18:48:35 armin76 Exp $
-
-EAPI="2"
-
-inherit x-modular pam
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="+minimal pam"
-
-RDEPEND="
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	!minimal? (
-		x11-apps/xclock
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-Gentoo-specific-customizations.patch"
-)
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
-}
-
-src_install() {
-	x-modular_src_install
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession || die
-	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xserverrc || die
-	newinitd "${FILESDIR}"/xdm.initd-4 xdm || die
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
-	newconfd "${FILESDIR}"/xdm.confd-2 xdm || die
-	newpamd "${FILESDIR}"/xserver.pamd xserver
-	dodir /etc/X11/xinit/xinitrc.d
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/00-xhost"
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
-}