summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2014-10-23 13:39:48 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2014-10-23 13:39:48 +0000
commit24de223a9d52e5572a79f249a1b0515156321399 (patch)
tree5dff75135a54b4133fe5c3f1ea7faeff4a7ecca8 /x11-apps
parentupdate abi_x86_32 masks (diff)
downloadgentoo-2-24de223a9d52e5572a79f249a1b0515156321399.tar.gz
gentoo-2-24de223a9d52e5572a79f249a1b0515156321399.tar.bz2
gentoo-2-24de223a9d52e5572a79f249a1b0515156321399.zip
Version bump. Remove old.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/xinit/ChangeLog8
-rw-r--r--x11-apps/xinit/xinit-1.3.4.ebuild (renamed from x11-apps/xinit/xinit-1.3.2.ebuild)23
2 files changed, 18 insertions, 13 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 5e47ed6834ac..faafd57df17a 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-apps/xinit
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.254 2014/03/14 14:38:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.255 2014/10/23 13:39:48 chithanh Exp $
+
+*xinit-1.3.4 (23 Oct 2014)
+
+ 23 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +xinit-1.3.4.ebuild, -xinit-1.3.2.ebuild:
+ Version bump. Remove old.
14 Mar 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+files/xserverrc.1, files/xserverrc, xinit-1.3.3-r1.ebuild:
diff --git a/x11-apps/xinit/xinit-1.3.2.ebuild b/x11-apps/xinit/xinit-1.3.4.ebuild
index 1e22975a86ef..423168a03eb3 100644
--- a/x11-apps/xinit/xinit-1.3.2.ebuild
+++ b/x11-apps/xinit/xinit-1.3.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.2.ebuild,v 1.12 2013/02/27 06:12:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.4.ebuild,v 1.1 2014/10/23 13:39:48 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 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+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,15 +28,14 @@ PDEPEND="x11-apps/xrdb
"
PATCHES=(
- "${FILESDIR}/0001-Gentoo-customizations.patch"
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
)
-pkg_setup() {
- xorg-2_pkg_setup
-
+src_configure() {
XORG_CONFIGURE_OPTIONS=(
- --with-xinitdir="${EPREFIX}"/etc/X11/xinit
+ --with-xinitdir=/etc/X11/xinit
)
+ xorg-2_src_configure
}
src_install() {
@@ -47,12 +46,12 @@ src_install() {
exeinto /etc/X11/Sessions
doexe "${FILESDIR}"/Xsession
exeinto /etc/X11/xinit
- doexe "${FILESDIR}"/xserverrc
+ newexe "${FILESDIR}"/xserverrc.1 xserverrc
exeinto /etc/X11/xinit/xinitrc.d/
- doexe "${FILESDIR}/00-xhost"
+ doexe "${FILESDIR}"/00-xhost
insinto /usr/share/xsessions
- doins "${FILESDIR}/Xsession.desktop"
+ doins "${FILESDIR}"/Xsession.desktop
}
pkg_postinst() {