Version bump.

(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 27 insertions, 96 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 3e3a20a4df88..263d3e98f3df 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.239 2013/06/09 23:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.240 2013/09/11 20:18:36 chithanh Exp $
+
+*xinit-1.3.3 (11 Sep 2013)
+*xinit-1.3.3 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xinit-1.3.3.ebuild, +xinit-1.3.3.ebuild,
+  -files/xinit-1.3.1-prio-process.patch, -xinit-1.3.0-r2.ebuild,
+  -xinit-1.3.1-r1.ebuild, -xinit-1.3.1.ebuild:
+  Version bump.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
deleted file mode 100644
index 838171bb67f9..000000000000
--- a/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/xinit.c b/xinit.c
-index 42ff008..2ab817f 100644
---- a/xinit.c
-+++ b/xinit.c
-@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group.
- #endif
- 
- /* For PRIO_PROCESS and setpriority() */
--#ifdef __DragonFly__
- #include <sys/time.h>
- #include <sys/resource.h>
--#endif /* __DragonFly__ */
- 
- #include <stdlib.h>
diff --git a/x11-apps/xinit/xinit-1.3.1.ebuild b/x11-apps/xinit/files/xinit-1.3.3.ebuild
index 048d0af7f632..1411770b3159 100644
--- a/x11-apps/xinit/xinit-1.3.1.ebuild
+++ b/x11-apps/xinit/files/xinit-1.3.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.9 2011/10/03 17:55:53 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xinit-1.3.3.ebuild,v 1.1 2013/09/11 20:18:36 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
@@ -28,16 +28,14 @@ PDEPEND="x11-apps/xrdb
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
-	"${FILESDIR}/${P}-prio-process.patch"
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		--with-xinitdir=/etc/X11/xinit
 	)
+	xorg-2_src_configure
 }
 
 src_install() {
@@ -51,6 +49,9 @@ src_install() {
 	doexe "${FILESDIR}"/xserverrc
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/00-xhost"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/Xsession.desktop"
 }
 
 pkg_postinst() {
diff --git a/x11-apps/xinit/xinit-1.3.0-r2.ebuild b/x11-apps/xinit/xinit-1.3.0-r2.ebuild
deleted file mode 100644
index c0bc82e9f2c3..000000000000
--- a/x11-apps/xinit/xinit-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r2.ebuild,v 1.8 2011/09/05 07:14:05 naota Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="+minimal"
-
-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-customizations.patch"
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
-}
-
-src_install() {
-	xorg-2_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
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/00-xhost"
-}
-
-pkg_postinst() {
-	xorg-2_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.3.1-r1.ebuild b/x11-apps/xinit/xinit-1.3.3.ebuild
index 6640c4c97b9d..00b22ce7ebc4 100644
--- a/x11-apps/xinit/xinit-1.3.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.3.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1-r1.ebuild,v 1.8 2012/03/03 16:27:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3.ebuild,v 1.1 2013/09/11 20:18:36 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
@@ -28,16 +28,14 @@ PDEPEND="x11-apps/xrdb
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
-	"${FILESDIR}/${P}-prio-process.patch"
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		--with-xinitdir=/etc/X11/xinit
 	)
+	xorg-2_src_configure
 }
 
 src_install() {