Bump EAPI, switch to xorg-2.eclass, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 23 insertions, 21 deletions

diff --git a/x11-apps/xrandr/ChangeLog b/x11-apps/xrandr/ChangeLog
index c45eeb1bdcec..c99b6b3f4e3e 100644
--- a/x11-apps/xrandr/ChangeLog
+++ b/x11-apps/xrandr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xrandr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.69 2010/01/23 19:19:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.70 2010/03/23 15:58:07 abcd Exp $
+
+  23 Mar 2010; Jonathan Callen <abcd@gentoo.org> xrandr-1.3.2.ebuild:
+  Bump EAPI, switch to xorg-2.eclass, add prefix keywords
 
   23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xrandr-1.2.2.ebuild,
   -xrandr-1.2.3.ebuild, -xrandr-1.3.0.ebuild:
diff --git a/x11-apps/xrandr/xrandr-1.3.2.ebuild b/x11-apps/xrandr/xrandr-1.3.2.ebuild
index 137df801b035..915d093ab15a 100644
--- a/x11-apps/xrandr/xrandr-1.3.2.ebuild
+++ b/x11-apps/xrandr/xrandr-1.3.2.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.2.ebuild,v 1.8 2009/12/15 19:19:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.2.ebuild,v 1.9 2010/03/23 15:58:07 abcd Exp $
 
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
+EAPI=3
+inherit xorg-2
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-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 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.3
@@ -18,6 +16,6 @@ RDEPEND=">=x11-libs/libXrandr-1.3
 DEPEND="${RDEPEND}"
 
 src_install() {
-	x-modular_src_install
-	rm -f "${D}"/usr/bin/xkeystone
+	xorg-2_src_install
+	rm -f "${ED}"/usr/bin/xkeystone
 }
diff --git a/x11-apps/xsm/ChangeLog b/x11-apps/xsm/ChangeLog
index 9b8b7589c8a4..4f3798758ac1 100644
--- a/x11-apps/xsm/ChangeLog
+++ b/x11-apps/xsm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xsm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.23 2009/04/22 00:47:03 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.24 2010/03/23 16:00:09 abcd Exp $
+
+  23 Mar 2010; Jonathan Callen <abcd@gentoo.org> xsm-1.0.1-r1.ebuild:
+  Bump EAPI, switch to xorg-2.eclass, add prefix keywords
 
   22 Apr 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking xsm-1.0.1-r1 ppc64 stable for bug 264982
diff --git a/x11-apps/xsm/xsm-1.0.1-r1.ebuild b/x11-apps/xsm/xsm-1.0.1-r1.ebuild
index b06b11ee650a..560a329402cf 100644
--- a/x11-apps/xsm/xsm-1.0.1-r1.ebuild
+++ b/x11-apps/xsm/xsm-1.0.1-r1.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-1.0.1-r1.ebuild,v 1.8 2009/04/22 00:47:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-1.0.1-r1.ebuild,v 1.9 2010/03/23 16:00:09 abcd Exp $
 
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
+EAPI=3
+inherit xorg-2
 
 DESCRIPTION="X Session Manager"
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RDEPEND="x11-libs/libXaw
-	net-misc/netkit-rsh"
+	!elibc_Darwin? ( net-misc/netkit-rsh )"
 DEPEND="${RDEPEND}"
 
 CONFIGURE_OPTIONS="--disable-xprint"
 
 pkg_setup() {
 	# (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
-	local XSMPATH="${ROOT}usr/$(get_libdir)/X11/xsm"
+	local XSMPATH="${EROOT}usr/$(get_libdir)/X11/xsm"
 	if [[ -L ${XSMPATH} ]]; then
 		einfo "Removing symlink ${XSMPATH}"
 		rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"