added emacs support via USE flag, use exec within session file, fixed depends

6 files changed, 97 insertions, 3 deletions

diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog
index 7fe89815037d..8f94eef0413d 100644
--- a/x11-wm/ratpoison/ChangeLog
+++ b/x11-wm/ratpoison/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/ratpoison
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.16 2003/11/08 17:06:51 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.17 2003/11/11 16:24:25 mkennedy Exp $
+
+*ratpoison-1.3.0_beta3-r2 (10 Nov 2003)
+
+  10 Nov 2003; <mkennedy@gentoo.org> ratpoison-1.3.0_beta3-r2.ebuild:
+  added emacs USE flag support
 
   08 Nov 2003; Brad House <brad_mssw@gentoo.org>
   ratpoison-1.3.0_beta3-r1.ebuild:
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index a017482d198b..20928183a208 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -1,4 +1,4 @@
-MD5 a87c4916b1ae45dd36d45a2486a46202 ChangeLog 2047
+MD5 50021ceaa011f0265a8ed83efe2330e3 ChangeLog 2189
 MD5 0dc401dca3401344d482d660aedf9b3b metadata.xml 829
 MD5 65dfeece429e075523a2c1ff839566ee ratpoison-1.1.1.ebuild 879
 MD5 ed0f26e7e30336b6db98115baace2221 ratpoison-1.2.1.ebuild 879
@@ -6,7 +6,7 @@ MD5 f96ef622e678525220c11325b61cfbd0 ratpoison-1.2.2-r1.ebuild 996
 MD5 bacff13c96e8a7d4b60a0ecc0561904c ratpoison-1.2.2.ebuild 879
 MD5 19711b7c40e41d639acb3655426ee612 ratpoison-1.3.0_beta3.ebuild 871
 MD5 ba99af34f560a77af56054f662c64ef4 ratpoison-1.3.0_beta3-r1.ebuild 1059
-MD5 d10dbe14c322044822df6e9fb48fb1da ratpoison-1.3.0_beta3-r2.ebuild 1362
+MD5 b1344ede868162f3058c6a41cfbff0c3 ratpoison-1.3.0_beta3-r2.ebuild 1519
 MD5 824194e6a098216cc47885fbcba7e0c4 files/digest-ratpoison-1.1.1 67
 MD5 6a9de47bfbdffee19f3c1ba571fb3ca3 files/digest-ratpoison-1.2.1 67
 MD5 7c03ae06718549d84c38d181a7192156 files/digest-ratpoison-1.2.2 67
@@ -15,3 +15,5 @@ MD5 e78e20c1c269d953a74e5cbe76ffaa37 files/digest-ratpoison-1.3.0_beta3 73
 MD5 e78e20c1c269d953a74e5cbe76ffaa37 files/digest-ratpoison-1.3.0_beta3-r1 73
 MD5 a7dd337c32ae9d2fe627cf230b77965c files/ratpoisonrc 609
 MD5 e78e20c1c269d953a74e5cbe76ffaa37 files/digest-ratpoison-1.3.0_beta3-r2 73
+MD5 ab1a7f36971489b5cffb75d84a2b2d0a files/50ratpoison-gentoo.el 82
+MD5 129f353e076455306b034fd577a6cdd2 files/ratpoison.el-gentoo.patch 273
diff --git a/x11-wm/ratpoison/files/50ratpoison-gentoo.el b/x11-wm/ratpoison/files/50ratpoison-gentoo.el
new file mode 100644
index 000000000000..300e548d5013
--- /dev/null
+++ b/x11-wm/ratpoison/files/50ratpoison-gentoo.el
@@ -0,0 +1,4 @@
+
+;;; site-lisp configuration for ratpoison
+
+(add-to-list 'load-path "@SITELISP@")
diff --git a/x11-wm/ratpoison/files/digest-ratpoison-1.3.0_beta3-r2 b/x11-wm/ratpoison/files/digest-ratpoison-1.3.0_beta3-r2
new file mode 100644
index 000000000000..e24cb490d391
--- /dev/null
+++ b/x11-wm/ratpoison/files/digest-ratpoison-1.3.0_beta3-r2
@@ -0,0 +1 @@
+MD5 f196e6b06da08391411fbd1899688bb6 ratpoison-1.3.0-beta3.tar.gz 290663
diff --git a/x11-wm/ratpoison/files/ratpoison.el-gentoo.patch b/x11-wm/ratpoison/files/ratpoison.el-gentoo.patch
new file mode 100644
index 000000000000..d211220e649c
--- /dev/null
+++ b/x11-wm/ratpoison/files/ratpoison.el-gentoo.patch
@@ -0,0 +1,11 @@
+--- ratpoison.el	2003-11-10 22:30:44.000000000 -0600
++++ ratpoison.el~	2003-11-10 22:53:30.676457808 -0600
+@@ -44,6 +44,8 @@
+ ;; - auto-completion of commands
+ ;; - probably a bunch of other things
+ 
++(require 'generic)
++
+ (defvar ratpoison-commands-0
+   (list
+    "abort"
diff --git a/x11-wm/ratpoison/ratpoison-1.3.0_beta3-r2.ebuild b/x11-wm/ratpoison/ratpoison-1.3.0_beta3-r2.ebuild
new file mode 100644
index 000000000000..3331fa0c8a6b
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.3.0_beta3-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.3.0_beta3-r2.ebuild,v 1.1 2003/11/11 16:24:25 mkennedy Exp $
+
+inherit elisp-common
+
+DESCRIPTION="Ratpoison is an extremely light-weight and barebones wm modelled after screen"
+HOMEPAGE="http://ratpoison.sourceforge.net/"
+LICENSE="GPL-2"
+
+PV=`echo ${PV} | sed 's/_/-/'`
+P="${PN}-${PV}"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="emacs"
+S=${WORKDIR}/${P}
+
+DEPEND="x11-base/xfree
+	emacs? ( virtual/emacs )"
+
+SITEFILE=50ratpoison-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/contrib
+	epatch ${FILESDIR}/ratpoison.el-gentoo.patch
+}
+
+src_compile() {
+	if [ "${ARCH}" = "amd64" ]
+	then
+		libtoolize -c -f
+	fi
+	econf
+	emake CFLAGS="${CFLAGS} -I/usr/X11R6/include" || die
+	if use emacs; then
+		cd contrib && elisp-comp ratpoison.el
+	fi
+}
+
+src_install() {
+	einstall
+	cat >ratpoison <<EOF
+#!/bin/bash
+exec /usr/bin/ratpoison
+EOF
+	exeinto /etc/X11/Sessions
+	doexe ratpoison
+
+	dodoc INSTALL TODO README NEWS AUTHORS ChangeLog
+	docinto example
+	dodoc contrib/{genrpbindings,split.sh} doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
+
+	rm -rf $D/usr/share/{doc/ratpoison,ratpoison}
+
+	if use emacs; then
+		elisp-install ${PN} contrib/ratpoison.*
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}