Version bump, resolves bug #92386.

(Portage version: 2.0.51.22-r1)

5 files changed, 83 insertions, 18 deletions

diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog
index ae7955eab193..055cf88443f4 100644
--- a/x11-wm/ratpoison/ChangeLog
+++ b/x11-wm/ratpoison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ratpoison
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.29 2005/05/08 15:07:35 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.30 2005/05/21 23:01:54 weeve Exp $
+
+*ratpoison-1.4.0_beta4 (21 May 2005)
+
+  21 May 2005; Jason Wever <weeve@gentoo.org> files/ratpoison.xsession,
+  +ratpoison-1.4.0_beta4.ebuild:
+  Version bump, resolves bug #92386.
 
   08 May 2005; Herbie Hopkins <herbs@gentoo.org> ratpoison-1.3.0.ebuild:
   Stable on amd64.
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 2218baa64c09..3abd867bdd81 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8e71189578c6957a1a66541c432f8b86 ratpoison-1.4.0_beta2.ebuild 1499
-MD5 d6dc62049d4af16eb42ce96b3aee90cd ratpoison-1.3.0.ebuild 1443
 MD5 cadddd14c50f3aea357f151a1d74e3bd ChangeLog 3827
 MD5 0dc401dca3401344d482d660aedf9b3b metadata.xml 829
+MD5 d6dc62049d4af16eb42ce96b3aee90cd ratpoison-1.3.0.ebuild 1443
+MD5 8e71189578c6957a1a66541c432f8b86 ratpoison-1.4.0_beta2.ebuild 1499
+MD5 8e71189578c6957a1a66541c432f8b86 ratpoison-1.4.0_beta4.ebuild 1499
 MD5 ab1a7f36971489b5cffb75d84a2b2d0a files/50ratpoison-gentoo.el 82
+MD5 f2ca283925e8bbb408427e4a29c8592d files/ratpoison.xsession 19
+MD5 e4205db91428787672e5463c32d4b701 files/digest-ratpoison-1.3.0 67
 MD5 129f353e076455306b034fd577a6cdd2 files/ratpoison.el-gentoo.patch 273
-MD5 e97b940b1d366b59e727dd7c8f727874 files/digest-ratpoison-1.4.0_beta2 73
 MD5 a7dd337c32ae9d2fe627cf230b77965c files/ratpoisonrc 609
-MD5 a03e9a6eb4cf2a842fb1b5c33c3758a5 files/ratpoison.xsession 36
-MD5 e4205db91428787672e5463c32d4b701 files/digest-ratpoison-1.3.0 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfitr2G5bA0cA/ScRAg3+AJ9ws0i15mRaLdd4uAimrWXXXrUMIwCfauo/
-e4XZDTDPO8UF139H/5u5qKs=
-=CWfO
------END PGP SIGNATURE-----
+MD5 e97b940b1d366b59e727dd7c8f727874 files/digest-ratpoison-1.4.0_beta2 73
+MD5 68d1d603290ff4bc9e9221078e552364 files/digest-ratpoison-1.4.0_beta4 73
diff --git a/x11-wm/ratpoison/files/digest-ratpoison-1.4.0_beta4 b/x11-wm/ratpoison/files/digest-ratpoison-1.4.0_beta4
new file mode 100644
index 000000000000..b264777b921f
--- /dev/null
+++ b/x11-wm/ratpoison/files/digest-ratpoison-1.4.0_beta4
@@ -0,0 +1 @@
+MD5 fe319e5072fb42fa944ad904dfec6ff8 ratpoison-1.4.0-beta4.tar.gz 373068
diff --git a/x11-wm/ratpoison/files/ratpoison.xsession b/x11-wm/ratpoison/files/ratpoison.xsession
index 13162614fa99..664edf72a543 100644
--- a/x11-wm/ratpoison/files/ratpoison.xsession
+++ b/x11-wm/ratpoison/files/ratpoison.xsession
@@ -1,2 +1 @@
-#!/bin/bash
-exec /usr/bin/ratpoison
+/usr/bin/ratpoison
diff --git a/x11-wm/ratpoison/ratpoison-1.4.0_beta4.ebuild b/x11-wm/ratpoison/ratpoison-1.4.0_beta4.ebuild
new file mode 100644
index 000000000000..482c5a0a0f0d
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.4.0_beta4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.0_beta4.ebuild,v 1.1 2005/05/21 23:01:54 weeve Exp $
+
+inherit elisp-common eutils
+
+MY_P=${P/_beta/-beta}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Ratpoison is an extremely light-weight and barebones wm modelled after screen"
+HOMEPAGE="http://www.nongnu.org/ratpoison/"
+LICENSE="GPL-2"
+
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="emacs"
+
+DEPEND="virtual/x11
+	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 || die "econf failed"
+	emake CFLAGS="${CFLAGS} -I/usr/X11R6/include" || die
+	if use emacs; then
+		cd contrib && elisp-comp ratpoison.el
+	fi
+}
+
+src_install() {
+	einstall
+
+	exeinto /etc/X11/Sessions
+	newexe ${FILESDIR}/ratpoison.xsession 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
+}