emake -> make

6 files changed, 18 insertions, 157 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 752a2f731012..996b518bd78f 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,17 +1,22 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.7 2002/07/16 04:12:54 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.8 2002/09/11 14:16:09 seemant Exp $
 
 *gpm-1.20.0-r3 (3 Jun 2002)
 
- 15 Jul 2002; Mark Guertin <gerk@gentoo.org>
- Added ppc to keywords
+  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> gpm-1.20.0-r3.ebuild :
 
- 3 Jun 2002; Micahel Nazaroff <naz@gentoo.org> gpm-1.20.0-r3.ebuild :
+  emake->make, as suggested by j2ee to: filippo@esaurito.net (Filippo
+  Giunchedi) in bug #7762.
 
- Well I added more fix's to my patch to fix a intellimouse ps2 timeout problem
- the seems to only pop up occasionally.  This code patch add's retries to ps2
- imps/2 protocol section in the mice.c file.
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
+  Added ppc to keywords
+
+  3 Jun 2002; Micahel Nazaroff <naz@gentoo.org> gpm-1.20.0-r3.ebuild :
+
+  Well I added more fix's to my patch to fix a intellimouse ps2 timeout problem
+  the seems to only pop up occasionally.  This code patch add's retries to ps2
+  imps/2 protocol section in the mice.c file.
 
 
 *gpm-1.20.0-r2 (29 May 2002)
@@ -41,7 +46,7 @@
 *gpm-1.19.6-r2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+   
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.0-r1 b/sys-libs/gpm/files/digest-gpm-1.20.0-r1
deleted file mode 100644
index 6a189ae63add..000000000000
--- a/sys-libs/gpm/files/digest-gpm-1.20.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab33423219cfef97fce158af48d3ad8c gpm-1.20.0.tar.bz2 390987
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.0-r2 b/sys-libs/gpm/files/digest-gpm-1.20.0-r2
deleted file mode 100644
index f36460fcaee3..000000000000
--- a/sys-libs/gpm/files/digest-gpm-1.20.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ab33423219cfef97fce158af48d3ad8c gpm-1.20.0.tar.bz2 390987
-MD5 a7c1229098f051bf1ffcc959d308f3ae gpm-1.20.0-patch.tar.bz2 4701
diff --git a/sys-libs/gpm/gpm-1.20.0-r1.ebuild b/sys-libs/gpm/gpm-1.20.0-r1.ebuild
deleted file mode 100644
index 7413fb2b017a..000000000000
--- a/sys-libs/gpm/gpm-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.0-r1.ebuild,v 1.5 2002/07/16 04:12:54 gerk Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Console-based mouse driver"
-SRC_URI="ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
-	sys-devel/autoconf"
-	
-RDEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-src_compile() {
-	#this little hack turns off EMACS byte compilation.  Really don't want
-	#this thing auto-detecting emacs
-	env ac_cv_path_emacs=no \
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/gpm || die
-
-	# Do not create gpmdoc.ps, as it cause build to fail with our version
-	# of tetex (it is already there, so this will only create missing
-	# manpages)
-	cp doc/Makefile doc/Makefile.orig
-	sed -e 's:all\: $(srcdir)/gpmdoc.ps:all\::' \
-		doc/Makefile.orig > doc/Makefile
-
-	emake || die
-}
-
-src_install() {
-	if [ ! -e ${S}/mkinstalldirs ]
-	then
-		#create missing script
-		echo 'mkdir -p "$@"' > ${S}/mkinstalldirs
-		chmod u+x ${S}/mkinstalldirs
-	fi
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/gpm \
-		install || die
-	chmod 755 ${D}/usr/lib/libgpm.so.*
-	dodoc BUGS COPYING ChangeLog Changes MANIFEST README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-#	doman doc/gpm.8 doc/mev.1 doc/gpm-root.1 doc/gpm-types.7 doc/mouse-test.1
-	doinfo doc/gpm.info
-#	docinto txt
-#	dodoc doc/gpmdoc.txt
-#	docinto ps
-#	dodoc doc/gpmdoc.ps
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gpm.rc6 gpm
-	insinto /etc/conf.d
-	newins ${FILESDIR}/gpm.conf.d gpm
-}
diff --git a/sys-libs/gpm/gpm-1.20.0-r2.ebuild b/sys-libs/gpm/gpm-1.20.0-r2.ebuild
deleted file mode 100644
index f2ac2ee399f4..000000000000
--- a/sys-libs/gpm/gpm-1.20.0-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.0-r2.ebuild,v 1.6 2002/08/14 04:19:39 murphy Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Console-based mouse driver"
-SRC_URI="ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2
-	http://www.ibiblio.org/gentoo/distfiles/gpm-1.20.0-patch.tar.bz2"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
-	sys-devel/autoconf"
-	
-RDEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-src_compile() {
-	#this little hack turns off EMACS byte compilation.  Really don't want
-	#this thing auto-detecting emacs
-	patch -p1 < ${WORKDIR}/gpm.patch || die
-	env ac_cv_path_emacs=no \
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/gpm || die
-
-	# Do not create gpmdoc.ps, as it cause build to fail with our version
-	# of tetex (it is already there, so this will only create missing
-	# manpages)
-	cp doc/Makefile doc/Makefile.orig
-	sed -e 's:all\: $(srcdir)/gpmdoc.ps:all\::' \
-		doc/Makefile.orig > doc/Makefile
-
-	emake || die
-}
-
-src_install() {
-	if [ ! -e ${S}/mkinstalldirs ]
-	then
-		#create missing script
-		echo 'mkdir -p "$@"' > ${S}/mkinstalldirs
-		chmod u+x ${S}/mkinstalldirs
-	fi
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/gpm \
-		install || die
-	chmod 755 ${D}/usr/lib/libgpm.so.*
-	dodoc BUGS COPYING ChangeLog Changes MANIFEST README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-#	doman doc/gpm.8 doc/mev.1 doc/gpm-root.1 doc/gpm-types.7 doc/mouse-test.1
-	doinfo doc/gpm.info
-#	docinto txt
-#	dodoc doc/gpmdoc.txt
-#	docinto ps
-#	dodoc doc/gpmdoc.ps
-
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gpm.rc6 gpm
-	insinto /etc/conf.d
-	newins ${FILESDIR}/gpm.conf.d gpm
-}
diff --git a/sys-libs/gpm/gpm-1.20.0-r3.ebuild b/sys-libs/gpm/gpm-1.20.0-r3.ebuild
index 1003dbacf986..642a4dd846d1 100644
--- a/sys-libs/gpm/gpm-1.20.0-r3.ebuild
+++ b/sys-libs/gpm/gpm-1.20.0-r3.ebuild
@@ -1,18 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.0-r3.ebuild,v 1.5 2002/08/14 04:19:39 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.0-r3.ebuild,v 1.6 2002/09/11 14:16:09 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console-based mouse driver"
 SRC_URI="ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2
 	http://www.ibiblio.org/gentoo/distfiles/gpm-1.20.1-patch.tar.bz2"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2
 	sys-devel/autoconf"
 	
-RDEPEND="virtual/glibc"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
@@ -22,10 +19,8 @@ src_compile() {
 	#this thing auto-detecting emacs
 	patch -p1 < ${WORKDIR}/gpm.patch || die
 	env ac_cv_path_emacs=no \
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/gpm || die
+
+	econf --sysconfdir=/etc/gpm || die
 
 	# Do not create gpmdoc.ps, as it cause build to fail with our version
 	# of tetex (it is already there, so this will only create missing
@@ -34,7 +29,7 @@ src_compile() {
 	sed -e 's:all\: $(srcdir)/gpmdoc.ps:all\::' \
 		doc/Makefile.orig > doc/Makefile
 
-	emake || die
+	emake || make || die
 }
 
 src_install() {