clean up

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

2 files changed, 14 insertions, 17 deletions

diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index dd4d3efbb78b..9ed5fb4980e2 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -5,6 +5,6 @@ DIST jwm-1.7.tar.bz2 121405 RMD160 fca374a54cff0f17eef537a228a696c79ec04fa6 SHA1
 DIST jwm-2.0.1.tar.bz2 248607 RMD160 84d16886056e77abd65717852df1530cebb6817b SHA1 209bc5e8c41f6a827d38a9b365405a2dc9bef082 SHA256 dcd6a6bd519578dfc2f3cfde269cea1f9090c87ebf2940bff26cbcca00f0a5c7
 EBUILD jwm-0.23.ebuild 800 RMD160 ba61f40dc2beb359cc5d296b03ee7fe38efed3d9 SHA1 e8c7808685124956f96790b2e7f90bf1ad946135 SHA256 a69a932839823279d02242ba425f6ff43ba125a20f51a661f604820b5305df51
 EBUILD jwm-1.7.ebuild 1649 RMD160 11d6985abdfc278f3cbcf60d2882fd3bd9f17415 SHA1 799b0530365aafb35035cfab461ef551d6553a19 SHA256 37e4b7f21bd3661a52be77fe1da3c754f4f00d0a7b7610282a63457e76b65afa
-EBUILD jwm-2.0.1.ebuild 1806 RMD160 26b322a1eb171b0e79031edc604af7b882184689 SHA1 1770a6eab5d07f11f68aa47a1d8310777846f11f SHA256 1431fdac6dd1594f873622ab91d5d31a7e31a715ce04d3e609e588e45428caed
+EBUILD jwm-2.0.1.ebuild 1721 RMD160 7cc0824da6c4d8b80ec0fc1a1b31b8111e38999d SHA1 3d0b9f1e105c2236fcefe7fb505f68c67a7638ea SHA256 cadcbeec1c4efbda00f16c7c2ce6a3733e64b822ce8ca5f792c8d1b99a68a351
 MISC ChangeLog 2411 RMD160 2f00cf82676fae7e0026ad3780546215ba003658 SHA1 45dee21c721d58d8082b7469309b63f613a83097 SHA256 636d460f8f5144e0a055b2fbb6c6934b64a30fe1c529931faae30394d56c21b2
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
diff --git a/x11-wm/jwm/jwm-2.0.1.ebuild b/x11-wm/jwm/jwm-2.0.1.ebuild
index deb540e239e3..01bbe2fe6744 100644
--- a/x11-wm/jwm/jwm-2.0.1.ebuild
+++ b/x11-wm/jwm/jwm-2.0.1.ebuild
@@ -1,18 +1,18 @@
-# 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-wm/jwm/jwm-2.0.1.ebuild,v 1.3 2009/08/03 10:19:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-2.0.1.ebuild,v 1.4 2010/06/05 20:42:56 ssuominen Exp $
 
+EAPI=3
 inherit eutils
 
-IUSE="bidi debug jpeg png truetype xinerama xpm"
-
 DESCRIPTION="Very fast and lightweight still powerfull window manager for X"
-SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.bz2"
 HOMEPAGE="http://joewing.net/programs/jwm/"
+SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="bidi debug jpeg png truetype xinerama xpm"
 
 RDEPEND="xpm? ( x11-libs/libXpm )
 	xinerama? ( x11-libs/libXinerama )
@@ -30,13 +30,11 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable jpeg) \
@@ -45,9 +43,8 @@ src_compile() {
 		$(use_enable xinerama) \
 		$(use_enable xpm) \
 		$(use_enable bidi fribidi) \
-		--enable-shape --enable-xrender || die "configure failed"
-
-	emake || die "emake failed"
+		--enable-shape \
+		--enable-xrender
 }
 
 src_install() {
@@ -55,8 +52,8 @@ src_install() {
 	dodir /etc
 	dodir /usr/share/man
 	emake BINDIR="${D}/usr/bin" SYSCONF="${D}/etc" \
-		MANDIR="${D}/usr/share/man" install || die "emake install failed"
-	rm "${D}/etc/system.jwmrc"
+		MANDIR="${D}/usr/share/man" install || die
+	rm "${D}"/etc/system.jwmrc
 
 	echo "#!/bin/sh" > jwm
 	echo "exec /usr/bin/jwm" >> jwm
@@ -69,5 +66,5 @@ src_install() {
 pkg_postrm() {
 	einfo "Put an appropriate configuration file in /etc/system.jwmrc"
 	einfo "or in ~/.jwmrc."
-	einfo "An example file can be found in ${R}/usr/share/doc/${P}/"
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
 }