old

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

3 files changed, 5 insertions, 127 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 439ed75a6a23..fd007ed2ea11 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.186 2010/11/03 09:36:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.187 2010/11/03 13:08:19 scarabeus Exp $
+
+  03 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xinit-1.2.1.ebuild,
+  -xinit-1.2.1-r2.ebuild:
+  old
 
   03 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   xinit-1.2.0-r4.ebuild:
diff --git a/x11-apps/xinit/xinit-1.2.1-r2.ebuild b/x11-apps/xinit/xinit-1.2.1-r2.ebuild
deleted file mode 100644
index 31bea3e5e198..000000000000
--- a/x11-apps/xinit/xinit-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,62 +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.1-r2.ebuild,v 1.1 2010/05/27 08:42:59 scarabeus 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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+minimal pam"
-
-RDEPEND="
-	!<x11-base/xorg-server-1.8.0
-	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
-	newpamd "${FILESDIR}"/xserver.pamd xserver
-	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"
-}
diff --git a/x11-apps/xinit/xinit-1.2.1.ebuild b/x11-apps/xinit/xinit-1.2.1.ebuild
deleted file mode 100644
index 024aae4c0673..000000000000
--- a/x11-apps/xinit/xinit-1.2.1.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.1.ebuild,v 1.1 2010/03/17 15:41:39 scarabeus 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"
-}