Various epatch sed and cosmetic changes

3 files changed, 9 insertions, 29 deletions

diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
index f4284205fc0e..df586e61a113 100644
--- a/x11-plugins/asapm/Manifest
+++ b/x11-plugins/asapm/Manifest
@@ -1,5 +1,5 @@
-MD5 693c24d1bc9345415bb3439d3e57f340 asapm-2.11.ebuild 639
-MD5 500df70a8d19675a56c9888b540644d8 asapm-2.10.ebuild 763
+MD5 e8b1eaed6d569afec53ac1b5c3901e64 asapm-2.11.ebuild 635
+MD5 0a6f56a846884bfec758dc21ffd3ef7f asapm-2.10.ebuild 759
 MD5 ff9ee836c0d663d309aa0819fb9fd668 ChangeLog 990
 MD5 fda28a37f9d22eaab623916850ab8559 files/asapm-2.10-gentoo.diff 625
 MD5 8421c0b48b3a26caa0993a6d56c448b0 files/digest-asapm-2.10 61
diff --git a/x11-plugins/asapm/asapm-2.10.ebuild b/x11-plugins/asapm/asapm-2.10.ebuild
index cd51c8848ac2..b5b2ef2c81f1 100644
--- a/x11-plugins/asapm/asapm-2.10.ebuild
+++ b/x11-plugins/asapm/asapm-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.10.ebuild,v 1.4 2003/09/06 05:45:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.10.ebuild,v 1.5 2004/01/04 18:36:45 aliz Exp $
 
 S=${WORKDIR}/${P}
 
@@ -17,7 +17,7 @@ DEPEND="virtual/glibc virtual/x11"
 
 src_compile() {
 	./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 	emake || die
 }
 
diff --git a/x11-plugins/asapm/asapm-2.11.ebuild b/x11-plugins/asapm/asapm-2.11.ebuild
index a9adab5a7dbf..f8fa5455239d 100644
--- a/x11-plugins/asapm/asapm-2.11.ebuild
+++ b/x11-plugins/asapm/asapm-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.11.ebuild,v 1.5 2003/09/06 05:45:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-2.11.ebuild,v 1.6 2004/01/04 18:36:45 aliz Exp $
 
 IUSE="jpeg"
 
@@ -10,37 +10,17 @@ SRC_URI="http://www.tigr.net/afterstep/download/asapm/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net/afterstep/list.pl"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc  ppc"
+KEYWORDS="x86 sparc ppc"
 
 DEPEND="virtual/x11
 	jpeg? ( media-libs/jpeg )"
 
 src_compile() {
-
-	local myconf
-
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-
-	./configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myconf} || die
-
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	econf `use_enable jpeg` || die
 	emake || die
 }
 
 src_install () {
-
-	dodir usr/bin
-	dodir usr/share/man/man1
-
-	make \
-		AFTER_BIN_DIR=${D}/usr/bin \
-		AFTER_MAN_DIR=${D}/usr/share/man/man1 \
-		install || die
+	dobin asapm
+	newman asapm.man asapm.1
 }