From 7dd993ab60cf0e4fead12331efe9f9e28c6f3672 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Sat, 2 Dec 2006 15:54:33 +0000 Subject: [PATCH] Version bump for 7.2RC3. Includes a minor build fix. Package-Manager: portage-2.1.2_rc2-r3 --- x11-apps/xdm/ChangeLog | 8 +++- x11-apps/xdm/files/digest-xdm-1.1.2 | 3 ++ x11-apps/xdm/xdm-1.1.2.ebuild | 59 +++++++++++++++++++++++++++++ x11-apps/xfs/ChangeLog | 7 +++- x11-apps/xfs/files/digest-xfs-1.0.4 | 3 ++ x11-apps/xfs/xfs-1.0.4.ebuild | 45 ++++++++++++++++++++++ 6 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 x11-apps/xdm/files/digest-xdm-1.1.2 create mode 100644 x11-apps/xdm/xdm-1.1.2.ebuild create mode 100644 x11-apps/xfs/files/digest-xfs-1.0.4 create mode 100644 x11-apps/xfs/xfs-1.0.4.ebuild diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog index b2269a53ddd0..0c62c8b85592 100644 --- a/x11-apps/xdm/ChangeLog +++ b/x11-apps/xdm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-apps/xdm # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.59 2006/11/14 16:29:25 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.60 2006/12/02 15:53:10 joshuabaergen Exp $ + +*xdm-1.1.2 (02 Dec 2006) + + 02 Dec 2006; Joshua Baergen -xdm-1.1.1.ebuild, + +xdm-1.1.2.ebuild: + Version bump for 7.2RC3. Includes a minor build fix. *xdm-1.1.1 (14 Nov 2006) diff --git a/x11-apps/xdm/files/digest-xdm-1.1.2 b/x11-apps/xdm/files/digest-xdm-1.1.2 new file mode 100644 index 000000000000..ce27a2927344 --- /dev/null +++ b/x11-apps/xdm/files/digest-xdm-1.1.2 @@ -0,0 +1,3 @@ +MD5 4db5eb07aad7a7e53f534c95c1c79920 xdm-1.1.2.tar.bz2 385887 +RMD160 bee403e08cfb852206714d5d0d23b7f51ed4acab xdm-1.1.2.tar.bz2 385887 +SHA256 af0aafc172c4b0b2c04059d17e82e8f3e87aa9740d88fa13e981ec7eef5fd529 xdm-1.1.2.tar.bz2 385887 diff --git a/x11-apps/xdm/xdm-1.1.2.ebuild b/x11-apps/xdm/xdm-1.1.2.ebuild new file mode 100644 index 000000000000..ff449b4187d7 --- /dev/null +++ b/x11-apps/xdm/xdm-1.1.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.2.ebuild,v 1.1 2006/12/02 15:53:10 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit multilib x-modular pam + +DEFAULTVT="vt7" + +DESCRIPTION="X.Org xdm application" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="xprint ipv6 pam" + +RDEPEND="x11-apps/xrdb + x11-libs/libXdmcp + x11-libs/libXaw + >=x11-apps/xinit-1.0.2-r3 + x11-libs/libXinerama + x11-libs/libX11 + x11-libs/libXt + x11-apps/sessreg" +DEPEND="${RDEPEND} + x11-proto/xineramaproto + x11-proto/xproto" + +PATCHES="${FILESDIR}/wtmp.patch + ${FILESDIR}/xwilling-hang.patch" + +CONFIGURE_OPTIONS="$(use_enable xprint) + $(use_enable ipv6) + $(use_with pam) + --with-default-vt=${DEFAULTVT} + --with-xdmconfigdir=/etc/X11/xdm" + +pkg_setup() { + if use xprint && ! built_with_use x11-libs/libXaw xprint; then + die "Build x11-libs/libXaw with USE=xprint." + fi +} + +src_install() { + x-modular_src_install + exeinto /usr/$(get_libdir)/X11/xdm + doexe ${FILESDIR}/Xsession + newpamd ${FILESDIR}/xdm.pamd xdm +} + +pkg_preinst() { + x-modular_pkg_preinst + + # Check for leftover /usr/lib/X11/xdm symlink + if [[ -L "/usr/lib/X11/xdm" ]]; then + ewarn "/usr/lib/X11/xdm is a symlink; deleting." + rm /usr/lib/X11/xdm + fi +} diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog index 826d1fd563e9..130d8edc5550 100644 --- a/x11-apps/xfs/ChangeLog +++ b/x11-apps/xfs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-apps/xfs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.22 2006/10/22 17:55:49 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.23 2006/12/02 15:54:33 joshuabaergen Exp $ + +*xfs-1.0.4 (02 Dec 2006) + + 02 Dec 2006; Joshua Baergen +xfs-1.0.4.ebuild: + Version bump for 7.2RC3. Includes a minor build fix. *xfs-1.0.3 (21 Oct 2006) diff --git a/x11-apps/xfs/files/digest-xfs-1.0.4 b/x11-apps/xfs/files/digest-xfs-1.0.4 new file mode 100644 index 000000000000..60d6bd79234a --- /dev/null +++ b/x11-apps/xfs/files/digest-xfs-1.0.4 @@ -0,0 +1,3 @@ +MD5 f43cb64d623b748208dfd9012d17b654 xfs-1.0.4.tar.bz2 149414 +RMD160 389c4c9ebd5242c76585ffefe2fd507e1d7fb09d xfs-1.0.4.tar.bz2 149414 +SHA256 452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b xfs-1.0.4.tar.bz2 149414 diff --git a/x11-apps/xfs/xfs-1.0.4.ebuild b/x11-apps/xfs/xfs-1.0.4.ebuild new file mode 100644 index 000000000000..cb5c55cd56ba --- /dev/null +++ b/x11-apps/xfs/xfs-1.0.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-1.0.4.ebuild,v 1.1 2006/12/02 15:54:33 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X font server" + +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="ipv6" + +RDEPEND="x11-apps/ttmkfdir + x11-libs/libFS + x11-libs/libXfont" +DEPEND="${RDEPEND} + x11-proto/fontsproto" + +CONFIGURE_OPTIONS="$(use_enable ipv6) --libdir=/etc" + +pkg_setup() { + enewgroup xfs 33 + enewuser xfs 33 -1 /etc/X11/fs xfs +} + +src_unpack() { + x-modular_unpack_source + x-modular_patch_source + + sed -i -e "s:^configdir =.*:configdir = \$(sysconfdir)/X11/fs:g" \ + "${S}"/Makefile.am + + x-modular_reconf_source +} + +src_install() { + x-modular_src_install + + insinto /etc/X11/fs + newins "${FILESDIR}"/xfs.config config + newinitd "${FILESDIR}"/xfs.start xfs + newconfd "${FILESDIR}"/xfs.conf.d xfs +} -- 2.26.2