Transfer prefix keywords, switch to EAPI=3, use "exec" in /etc/X11/Sessions/evilwm

(Portage version: v2.2_rc67-475-g06c7c90/cvs/Linux i686)

3 files changed, 19 insertions, 15 deletions

diff --git a/x11-wm/evilwm/ChangeLog b/x11-wm/evilwm/ChangeLog
index 9469f128b92e..13aebd9d4414 100644
--- a/x11-wm/evilwm/ChangeLog
+++ b/x11-wm/evilwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/evilwm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.52 2010/07/06 21:09:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.53 2010/08/16 19:15:27 abcd Exp $
+
+  16 Aug 2010; Jonathan Callen <abcd@gentoo.org> evilwm-1.0.1.ebuild,
+  evilwm-1.1.0_pre8.ebuild:
+  Transfer prefix keywords, switch to EAPI=3, use "exec" in
+  /etc/X11/Sessions/evilwm
 
   06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   evilwm-1.1.0_pre8.ebuild:
diff --git a/x11-wm/evilwm/evilwm-1.0.1.ebuild b/x11-wm/evilwm/evilwm-1.0.1.ebuild
index 126a0bca6579..0b2908f0e11f 100644
--- a/x11-wm/evilwm/evilwm-1.0.1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.0.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-1.0.1.ebuild,v 1.5 2010/01/05 22:02:54 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-1.0.1.ebuild,v 1.6 2010/08/16 19:15:27 abcd Exp $
 
+EAPI=3
 inherit toolchain-funcs multilib
 
 DESCRIPTION="A minimalist, no frills window manager for X."
@@ -11,7 +12,7 @@ HOMEPAGE="http://evilwm.sourceforge.net"
 IUSE=""
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr"
@@ -20,9 +21,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' evilwm.h \
 		|| die "sed font failed"
 	sed -i -e '/^CFLAGS/s/ -Os/ /' \
@@ -30,15 +29,15 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" XROOT="/usr" LDPATH="-L/usr/$(get_libdir)" || die
+	emake CC="$(tc-getCC)" prefix="\$(DESTDIR)/${EPREFIX}/usr" XROOT="${EPREFIX}/usr" LDPATH="-L${EPREFIX}/usr/$(get_libdir)" || die
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" prefix="\$(DESTDIR)/${EPREFIX}/usr" install || die "make install failed"
 
 	dodoc ChangeLog README TODO || die "dodoc failed"
 
-	echo -e "#!/bin/sh\n/usr/bin/${PN}" > "${T}/${PN}"
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}"
 	exeinto /etc/X11/Sessions
 	doexe "${T}/${PN}" || die "/etc/X11/Sessions failed"
 
diff --git a/x11-wm/evilwm/evilwm-1.1.0_pre8.ebuild b/x11-wm/evilwm/evilwm-1.1.0_pre8.ebuild
index c55abb26b3d5..5d9b9ea12732 100644
--- a/x11-wm/evilwm/evilwm-1.1.0_pre8.ebuild
+++ b/x11-wm/evilwm/evilwm-1.1.0_pre8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-1.1.0_pre8.ebuild,v 1.3 2010/07/06 21:09:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-1.1.0_pre8.ebuild,v 1.4 2010/08/16 19:15:27 abcd Exp $
 
-EAPI=2
+EAPI=3
 inherit toolchain-funcs
 
 MY_P=${P/_}
@@ -14,7 +14,7 @@ SRC_URI="http://www.6809.org.uk/${PN}/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+#KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
@@ -34,14 +34,14 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" prefix="\$(DESTDIR)/${EPREFIX}/usr" || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" INSTALL_STRIP="" install || die
+	emake DESTDIR="${D}" prefix="\$(DESTDIR)/${EPREFIX}/usr" INSTALL_STRIP="" install || die
 	dodoc ChangeLog README TODO || die
 
-	echo ${PN} > "${T}"/${PN}
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}"/${PN}
 	exeinto /etc/X11/Sessions
 	doexe "${T}"/${PN} || die
 }