Suppress creation of spurious /usr/share/emacs directory, fixes bug 202946.

Finally remove commented lines for Emacs support wrt bug 99533 comment 18.
Add missing app-arch/lzma-utils to DEPEND.
Package-Manager: portage-2.1.5_rc5

4 files changed, 35 insertions, 23 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index ef4b80011175..c80810def662 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.65 2008/04/19 08:23:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.66 2008/04/21 07:08:37 ulm Exp $
+
+  21 Apr 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/gpm-1.20.3-no-emacs-dir.patch, gpm-1.20.3.ebuild:
+  Suppress creation of spurious /usr/share/emacs directory, fixes bug 202946.
+  Finally remove commented lines for Emacs support wrt bug 99533 comment 18.
+  Add missing app-arch/lzma-utils to DEPEND.
 
 *gpm-1.20.3 (19 Apr 2008)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index ad66889f8630..87cb4857ca3f 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gpm-1.20.3-no-emacs-dir.patch 347 RMD160 3f5af18f717c3d0d7ae244a1acd3cfc606898b14 SHA1 71a4d47efb764ffa28d50dbc5967635f8ce95acb SHA256 3c90aaffb2a430e78f92eb7209dc14ac336b6d7fa822fa17670e4722de31149f
 AUX gpm-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
 AUX gpm.conf.d 580 RMD160 5ce706d89a3e2c01b75a01dd614267f918290be9 SHA1 44035e2059ac0fc178bfe427900d43ad33aeaa2a SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8
 AUX gpm.rc6 951 RMD160 770208133f13fd02207095f7b71a63ac790467d7 SHA1 ca001d11faa1e28a16bfffc1ad880763399b354b SHA256 b893aa660a50014ea3dae4ce9925117b3b8bec9d50abf10f2da946a845789d04
@@ -8,13 +9,13 @@ DIST gpm-1.20.1-patches-1.5.tar.bz2 9045 RMD160 911d3e6f2d4c37f9d1fedf436b346969
 DIST gpm-1.20.1.tar.bz2 565014 RMD160 2650ae1e3e87fcf8bdad80acf62777e8a62b6582 SHA1 c48d937e62abb438c2f6439b34ef3332c89af8d1 SHA256 11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936
 DIST gpm-1.20.3.tar.lzma 1139678 RMD160 d3e122b0d3a328a423b3779b070406b43fa8a851 SHA1 17ae1be5e3b30691b7876873eadb4922bd477eb8 SHA256 97daa06c83e9ed26a69058214fba8bb2d2889b6fc0d1c73412ccf3e28dec5ecc
 EBUILD gpm-1.20.1-r6.ebuild 1929 RMD160 6d57060e8cabbf24e4fcb518b828817dda29b415 SHA1 35dd2d3b705c9cef248cef1380be56897991cb9f SHA256 7447e20a91ec43d85b41dc86cc557629e6905acbf5eb68b04e5d079264870450
-EBUILD gpm-1.20.3.ebuild 1675 RMD160 05ad6816ce97c8f38250b2d735b13f83cb6b04af SHA1 9ba07c124d4890a4106516da6b5f4dda8d612386 SHA256 4a389ef8461a4d643da4b64198765ee647de5975199c732a36fcf7ae8b85c145
-MISC ChangeLog 8946 RMD160 2121970873ce80d66800163fb9ad4b4ffd4bd846 SHA1 7ea9e95b1e813471b3c0ee0e5cfb618bbb4b5d9f SHA256 9fbc7a6893db808a9daba4d24addb8fbf11577351eb73e0d6203ca29993ed4cf
+EBUILD gpm-1.20.3.ebuild 1492 RMD160 79239f4a126cb41462a7ef292df9cfecad235961 SHA1 071bd03701b2ec312a18a008c109ac38adf21feb SHA256 6da8b0b85ce03da0c7ba1ee655fff111e059391a59822cbaf8d3b03ae141168d
+MISC ChangeLog 9250 RMD160 cf336aa5e0781282771684b6ea6c0cd95b98b11f SHA1 e5e30d3f4bf1f16355775beedb5b2f4639a5a1fb SHA256 2bb63562cf817395bda3cf7a12c04a5e76b7f5886831dd55c2bb34ca612ffae5
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iD8DBQFIC+DKj9hvisErhMIRAlXBAKDCmUCAmOviaRuNA/RYv/2UJnAVdQCfe53E
-s9FsaJz+qQkuai9QD95bEMM=
-=pr2L
+iEYEARECAAYFAkgMPVgACgkQOeoy/oIi7uwIjQCeMtEvLz6ay2dlDFA91/hXMBW9
+i6AAn1qpaWH1mHMaW2faBegt91LUWJgD
+=J0dF
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/gpm-1.20.3-no-emacs-dir.patch b/sys-libs/gpm/files/gpm-1.20.3-no-emacs-dir.patch
new file mode 100644
index 000000000000..d3edf560d06c
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.3-no-emacs-dir.patch
@@ -0,0 +1,11 @@
+--- gpm-1.20.3-orig/Makefile.in	2008-04-15 16:34:13.000000000 +0200
++++ gpm-1.20.3/Makefile.in	2008-04-20 23:30:30.000000000 +0200
+@@ -51,7 +51,7 @@
+ 
+ installdirs:
+ 	$(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \
+-	if test "x@ELISP@" != "x" ; then \
++	if test "x$(ELISP)" != "x" ; then \
+ 		$(MKDIR) $(lispdir) ; \
+ 	fi
+ 
diff --git a/sys-libs/gpm/gpm-1.20.3.ebuild b/sys-libs/gpm/gpm-1.20.3.ebuild
index 2ec3aeb7d623..bc9f4eafb564 100644
--- a/sys-libs/gpm/gpm-1.20.3.ebuild
+++ b/sys-libs/gpm/gpm-1.20.3.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.3.ebuild,v 1.2 2008/04/21 00:33:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.3.ebuild,v 1.3 2008/04/21 07:08:37 ulm Exp $
 
 # emacs support disabled due to Bug 99533
 
 inherit toolchain-funcs
-#elisp-common
 
 DESCRIPTION="Console-based mouse driver"
 HOMEPAGE="http://linux.schottelius.org/gpm/"
@@ -14,12 +13,18 @@ SRC_URI="http://linux.schottelius.org/gpm/archives/${P}.tar.lzma"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux" # emacs"
+IUSE="selinux"
 
-DEPEND="sys-libs/ncurses"
-#	emacs? ( virtual/emacs )"
+DEPEND="sys-libs/ncurses
+	app-arch/lzma-utils"
 RDEPEND="selinux? ( sec-policy/selinux-gpm )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-emacs-dir.patch
+}
+
 src_compile() {
 	econf \
 		--libdir=/$(get_libdir) \
@@ -32,12 +37,6 @@ src_compile() {
 	emake -j1 -C doc || die
 
 	emake EMACS=: || die "emake failed"
-
-#	local lisp="emacs/t-mouse.el emacs/t-mouse.elc"
-#	if use emacs ; then
-#		cd "${S}"/contrib ; make clean
-#		make EMACS=emacs ELISP="${lisp}" || die
-#	fi
 }
 
 src_install() {
@@ -49,11 +48,6 @@ src_install() {
 	mv "${D}"/$(get_libdir)/libgpm.a "${D}"/usr/$(get_libdir)/ || die
 	gen_usr_ldscript libgpm.so
 
-#	if use emacs ; then
-#		cd "${S}"/contrib/emacs
-#		elisp-install . t-mouse*
-#	fi
-
 	insinto /etc/gpm
 	doins conf/gpm-*.conf