Major update of gpm ebuild and included patches

6 files changed, 86 insertions, 71 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 75cc393ccdfa..2ab2d41fcdde 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2003/05/02 10:57:49 naz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.18 2003/06/04 06:52:12 naz Exp $
+
+*gpm-1.20.1 (03 Jun 2003)
+
+  03 Jun 2003; Michael Nazaroff <naz@gentoo.org> gpm-1.20.1.ebuild :
+  Did a major overhall of gpm ebuild and bumped up to a newer version 
+  application.  The patches include fixes for mc and various other issues.
 
 *gpm-1.20.0-r6 (13 Jan 2002)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 5d7bb0812ea0..4d9c051ac55f 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,14 +1,12 @@
 MD5 d558c42e39bd827ca7a52b8f97a3aefb gpm-1.20.0-r6.ebuild 1727
-MD5 38b5b16fa338334b81edea77877e2899 gpm-1.20.0-r3.ebuild 1833
 MD5 f3faa6d25c9293b2d06fa42002ee6a3a gpm-1.20.1.ebuild 1825
 MD5 a4ae79deb3c02a0ebb6a4ebc3a436357 gpm-1.20.0-r5.ebuild 1596
 MD5 465f57ee59485ee34d7cd68a12697750 gpm-1.20.0-r4.ebuild 1532
 MD5 d8c7388a48a23e5d89702d18ac60ce53 gpm-1.19.6.ebuild 1965
-MD5 04c73a2e949eb7cc6c97bded2a494eb4 ChangeLog 3195
+MD5 4d1507d91264efde95426b399cc81cd7 ChangeLog 3438
 MD5 d562712814b13d09904823bd3eb31269 files/gpm.conf.d 570
 MD5 c1d5de8b9dede53724d8a7dbd7192a7f files/digest-gpm-1.19.6 63
 MD5 97f0853f825f506bf47be3b8ce6f9ce9 files/digest-gpm-1.20.1 136
-MD5 69b1b0ae0692f03bd3685a6159b7938d files/digest-gpm-1.20.0-r3 130
 MD5 69b1b0ae0692f03bd3685a6159b7938d files/digest-gpm-1.20.0-r4 130
 MD5 69b1b0ae0692f03bd3685a6159b7938d files/digest-gpm-1.20.0-r5 130
 MD5 711d69ceb7b4ebb63732d86b2e573bcd files/digest-gpm-1.20.0-r6 207
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.0-r3 b/sys-libs/gpm/files/digest-gpm-1.20.0-r3
deleted file mode 100644
index 77ba65782919..000000000000
--- a/sys-libs/gpm/files/digest-gpm-1.20.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ab33423219cfef97fce158af48d3ad8c gpm-1.20.0.tar.bz2 390987
-MD5 efed498fca612e0d08824f26fad1d2d3 gpm-1.20.1-patch.tar.bz2 5171
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.1 b/sys-libs/gpm/files/digest-gpm-1.20.1
new file mode 100644
index 000000000000..96743d4bb18e
--- /dev/null
+++ b/sys-libs/gpm/files/digest-gpm-1.20.1
@@ -0,0 +1,2 @@
+MD5 2c63e827d755527950d9d13fe3d87692 gpm-1.20.1.tar.bz2 565014
+MD5 8fadbd10aaba0925fd4fa2556b99fca2 gpm-1.20.1-patches-1.0.tar.bz2 7306
diff --git a/sys-libs/gpm/gpm-1.20.0-r3.ebuild b/sys-libs/gpm/gpm-1.20.0-r3.ebuild
deleted file mode 100644
index 7892dcfea86b..000000000000
--- a/sys-libs/gpm/gpm-1.20.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.0-r3.ebuild,v 1.12 2003/02/13 16:49:03 vapier 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"
-HOMEPAGE="ftp://arcana.linux.it/pub/gpm/"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-devel/autoconf"
-	
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-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 \
-
-	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
-	# manpages)
-	cp doc/Makefile doc/Makefile.orig
-	sed -e 's:all\: $(srcdir)/gpmdoc.ps:all\::' \
-		doc/Makefile.orig > doc/Makefile
-
-	emake || make || 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.1.ebuild b/sys-libs/gpm/gpm-1.20.1.ebuild
new file mode 100644
index 000000000000..b4d9a2a91a7e
--- /dev/null
+++ b/sys-libs/gpm/gpm-1.20.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+# Please use this variable to keep patch names sane for our patches!
+PATCH_VER="1.0"
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Console-based mouse driver"
+# Future patch's for gpm should keep this format.  This should help others
+# maintain the ebuild and keep patch's simple and and easy to read.
+SRC_PATH="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2"
+GPM_PATCHES="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+
+SRC_URI="${SRC_PATH}
+		${GPM_PATCHES}"
+
+
+HOMEPAGE="ftp://arcana.linux.it/pub/gpm/"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	sys-devel/autoconf"
+	
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm"
+
+PATCHDIR=${WORKDIR}/patches
+
+src_unpack() {
+	unpack ${A}
+	unpack ${P}-patches-${PATCH_VER}.tar.bz2
+	
+	# This little hack turns off EMACS byte compilation.  We really
+	# don't want this thing auto-detecting emacs.
+	cd ${S}; epatch ${WORKDIR}/patches
+
+	# Add missing 'mkinstalldirs' script
+	cp -f /usr/share/automake/mkinstalldirs ${S}
+}
+
+src_compile() {
+	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
+	# manpages)
+	cp doc/Makefile doc/Makefile.orig
+	sed -e 's:all\: $(srcdir)/gpmdoc.ps:all\::' \
+		doc/Makefile.orig > doc/Makefile
+
+	MAKEOPTS="-j1" emake || die
+}
+
+src_install() {
+	einstall
+	
+	chmod 755 ${D}/usr/lib/*
+	# Fix missing /usr/lib/libgpm.so.1
+	preplib
+	
+	dodoc BUGS COPYING ChangeLog Changes MANIFEST README TODO
+	dodoc doc/Announce doc/FAQ doc/README*
+	doinfo doc/gpm.info
+
+	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
+}
+