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

Package-Manager: portage-v2.2_rc67-475-g06c7c90/cvs/Linux i686

4 files changed, 42 insertions, 18 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/Manifest b/x11-wm/evilwm/Manifest
index 13ecdc4c9c64..188b6d1e130f 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX evilwm.desktop 182 RMD160 dab3a82cac2809d19b1ac05061fe622ec87e22b9 SHA1 3fb51a3657db60c06d458463302a6569c64f332b SHA256 2c033978db6abc4bc3aa99851e956ad0cd68d540202823af0839508ddb415816
 DIST evilwm-1.0.1.tar.gz 31468 RMD160 da850746a3c2af462105b6353e8af900b336403c SHA1 35e380b059ac6030460a4bdc85cbde4e7f36146c SHA256 79640a68f6dd7e67a1767767aba486e192d7663ccb2588154d2419b47b9ec457
 DIST evilwm-1.1.0pre8.tar.gz 40669 RMD160 5f5c8a1da658815e3cc4a27a2e6bf3ee5fdeb78b SHA1 1add8be881620db8260fa8870d64dab3558ce99c SHA256 b260f71ad7e235b1d5c6c3e153b59e5fdda6bc90c2deaf8f2683054272028f3f
-EBUILD evilwm-1.0.1.ebuild 1282 RMD160 c30c3057d6f0f722342745f4ec9a48b7268ee37a SHA1 7bcf55c1b1370bc42acd2786d5194ffdcbd10552 SHA256 197d54f7d2cb1429942c7423d5d443a1d75d54d5f933418dd9b32ba75f590455
-EBUILD evilwm-1.1.0_pre8.ebuild 1060 RMD160 f2bf182765643abd13b9905b10d89246064bfcef SHA1 d2729cdf9e21711c5ab6637d707d86078279d0ba SHA256 1eba2cb332bb6df290bc2d073311d776822db9747d1e5a53ebdc1ad6e8dd6739
-MISC ChangeLog 6485 RMD160 879c61ff9b078d2bbd59c904e45b5fb91ac412fa SHA1 ec3435b1c8824d69afa4aa8cee105a99a398badc SHA256 e5787ad235bf6e55ae0bd62003c95b13a2fd2c935a9c33cdf02ccf0b6d655774
+EBUILD evilwm-1.0.1.ebuild 1450 RMD160 dd6566227ca09b1bf3e7ec88f798d5452a57f23f SHA1 609afc3533f23645f5920fa56edfec9f1e58d9c5 SHA256 0ced0e84bdd09d0b178ec07717c2520ce748ab70dfaee889895351a00bb3d266
+EBUILD evilwm-1.1.0_pre8.ebuild 1246 RMD160 0af84ef4bcd3b7fcf9001b2a31c4d8720ca718bc SHA1 f0a5c012df3e5aec4801bc31ffe383ff9422a5f6 SHA256 f3f05996f5e81811793743f23418b398c3e03dcbdcbb73641c41e206933ac7b8
+MISC ChangeLog 6666 RMD160 2a5660aa6c69118db042cb98144d2bf316358fad SHA1 78068c4f20d468d4b33904837a0e3c81786f938f SHA256 9cbd9534954e14533470766dbd5ef3f84efd5f6e673a876103787a5f6bac6583
 MISC metadata.xml 360 RMD160 b5ebb7c354adb9b7e7ce3e110835f8f08bc0af24 SHA1 71a3e8d535e0cb2bfc44b370dbd5785c683e6e54 SHA256 634576adf481fa9e17e5b0ec600305539a6405bc8329d376fabfa28573b3d4df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMaY5bAAoJELHSF2kinlg4mQkP/R8GZsu8lozwi9czWjSA+BM6
+NBqb3P2l8VwY2Q9MeSfbiC4TO1Q6oy4L+1yMoVztG9Cz4M6HwZ9+c+aZni4DEWgG
+Lhjx2G1LunbomBUs5J8IYp1JlX1zvnAOP1WZuAniw8Y3ou+HlMChHFAZCYsYNtPu
+loZSOsTIXdCLb8X0YzVLSQ1FD8BNdrQuUCMap6Pfv/n1XM4A1HvDg9QACjH+88HF
+NMleZbeoNeB2lKxUZwKXFLgKQRW6aCWqEuP/LEiDg8/Nv+Fyj3l0D8f88D4ng/89
+MsVVArf1hcWaa20FkXIngw1v+nHRSV+5qTUxvTuhlN/9/mXQEG16Uj7PT23RKjXy
+DShI7eEuAsgxk5R5PCdYWVdrUFC/pm/072IHsPM5NCCixC5mt05EV7QLWlY/Psdt
+CuMrH/7UWyhWZGPmNv50kuUzu/9YfWgrk19cDprF2SLi4444+74+LmE8UnFZMl0p
+IqtEeCQ4jZPMyswixLahQWIDMjXTpCK+jHHweNd9sb6EGOejYwPKjTvd8HngWgKh
+rMXFK4zZCULUculQGSqFZDHmX2xNJq9m/KvzaBiK4ylbQDyzdx15hDBMxaXL+gDs
+piP8m84aa+l6mSmoidLFeC7ytxPtvMjwo8rGUra9NuP/Ly/IN6o0mZFsFM9gUYXc
+j2Ilo/Cd+mvrOM66CW2H
+=KR6k
+-----END PGP SIGNATURE-----
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
 }