Version bump to 1.4.0. Also adjusted 1.3.0 and 1.4.0_beta2 for modular X.

Package-Manager: portage-2.1_pre7-r4

6 files changed, 99 insertions, 16 deletions

diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog
index 4888ae9b9955..e7a30eb681d8 100644
--- a/x11-wm/ratpoison/ChangeLog
+++ b/x11-wm/ratpoison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ratpoison
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.34 2006/02/13 18:50:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.35 2006/04/06 03:14:31 weeve Exp $
+
+*ratpoison-1.4.0 (06 Apr 2006)
+
+  06 Apr 2006; Jason Wever <weeve@gentoo.org> ratpoison-1.3.0.ebuild,
+  ratpoison-1.4.0_beta2.ebuild, +ratpoison-1.4.0.ebuild:
+  Version bump to 1.4.0.  Also adjusted 1.3.0 and 1.4.0_beta2 for modular X.
 
   13 Feb 2006; Jeroen Roovers <jer@gentoo.org> ratpoison-1.4.0_beta4.ebuild:
   Marked ~hppa (bug #114474).
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 0063a1c3bb95..992f88c04019 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -1,12 +1,15 @@
-MD5 9ceedd3e2b9c88a36c08ddd0edfa2b0a ChangeLog 4472
-RMD160 dc2caa7270ef204e528f83c4383aff3e2ce086ac ChangeLog 4472
-SHA256 30fdf35eaae0da7af9002212593d3c159905a66e4aa800cd7cc463aa0212893f ChangeLog 4472
+MD5 0fd0bd30ae66b44e76bdccd1b66a12e6 ChangeLog 4711
+RMD160 9a95b0d40dabb7ff922dfed2e520116fdfa662fb ChangeLog 4711
+SHA256 b0e51ce07c20b4d339ede72484a21bcb3bb8f821559f6cec80828d776d106b4a ChangeLog 4711
 MD5 608274a76e39130af139a7a1f12ab564 files/50ratpoison-gentoo.el 524
 RMD160 9d3dddea32f2607f9df8507cd9ba4f5d700805b8 files/50ratpoison-gentoo.el 524
 SHA256 ac355a0e2eed6612552d2cfd861c2deb142ba6cab852de04a29b8ff820c2da59 files/50ratpoison-gentoo.el 524
 MD5 e4205db91428787672e5463c32d4b701 files/digest-ratpoison-1.3.0 67
 RMD160 a420c1ec926e5b81bed6f1366700178e2f9973c3 files/digest-ratpoison-1.3.0 67
 SHA256 bf44fa9a30d9b1358117029dde859951619ae421d7d0765d5c78ccb4db9bdd3b files/digest-ratpoison-1.3.0 67
+MD5 5a66865c6b5ff3fbc7d40bca6b94fae5 files/digest-ratpoison-1.4.0 247
+RMD160 7ac4375221e49391e9d95dabda588ddfbd0c5c7b files/digest-ratpoison-1.4.0 247
+SHA256 dc3134444ea8a9bfcd4a5e317e71bd2085049a0063850e3bcaaf5f94e1621061 files/digest-ratpoison-1.4.0 247
 MD5 e97b940b1d366b59e727dd7c8f727874 files/digest-ratpoison-1.4.0_beta2 73
 RMD160 d5ce43acbc5cbfb1f3033ffb5f0a5192483c54db files/digest-ratpoison-1.4.0_beta2 73
 SHA256 80d63dbe532d4e98faa184c2bcdf858936e6e3e95845666fec65143b70128cda files/digest-ratpoison-1.4.0_beta2 73
@@ -25,12 +28,15 @@ SHA256 6293a54a5960dc48a834ffb777994a485d19f80a6db410137b94c96fe2eeab8b files/ra
 MD5 0dc401dca3401344d482d660aedf9b3b metadata.xml 829
 RMD160 96c0c374bb400eaf60bbba1fc3f982ba3620eff6 metadata.xml 829
 SHA256 60b523261f09a32095e56a8233fd50ae8a21ba8c94ed454b3d9c0bd7aa7e3a6c metadata.xml 829
-MD5 d6dc62049d4af16eb42ce96b3aee90cd ratpoison-1.3.0.ebuild 1443
-RMD160 df31c01b089824df2a52d33736033dfc8ef00c2b ratpoison-1.3.0.ebuild 1443
-SHA256 0719486de1877c5d68b7bec33d78ac48ebbdcfcaea4ec7cf2f4d0830e95d3a4c ratpoison-1.3.0.ebuild 1443
-MD5 8e71189578c6957a1a66541c432f8b86 ratpoison-1.4.0_beta2.ebuild 1499
-RMD160 a2668a3210443f7ad9582a333f3c4b72d40d351c ratpoison-1.4.0_beta2.ebuild 1499
-SHA256 9de76b7b7edb3fb96a6eba48c7bb4cb49be729891a13ac2988ca30583c70e6cd ratpoison-1.4.0_beta2.ebuild 1499
+MD5 326f5f4487965fbebd3b4e64be8827ea ratpoison-1.3.0.ebuild 1492
+RMD160 9ebbc1798e96b424954133ea0a7324a51e50ad63 ratpoison-1.3.0.ebuild 1492
+SHA256 23f51837c5b50a7bc9f45694b8cd00aff04cb9ba831c19bd3d16f93a35f1aeaf ratpoison-1.3.0.ebuild 1492
+MD5 e79a2f7c172ba7e281bb274c64c52f4e ratpoison-1.4.0.ebuild 1569
+RMD160 d265104c4b55d4c95977c73a5afed818905e9550 ratpoison-1.4.0.ebuild 1569
+SHA256 eb14246d6da9f54862561c5e9bc9df6bd24998e0af89efb8a36dece4c8e97a13 ratpoison-1.4.0.ebuild 1569
+MD5 1266666d1ef3996c1b5f0e52367ad398 ratpoison-1.4.0_beta2.ebuild 1548
+RMD160 0069a909b8975876d47285672c25ef4fd63b1836 ratpoison-1.4.0_beta2.ebuild 1548
+SHA256 f540507165630810f29722b032c647ae4124cf4ce837d2cc51ecaf16ca322c1a ratpoison-1.4.0_beta2.ebuild 1548
 MD5 dda0687bcb944c8e42bbe16f946fe258 ratpoison-1.4.0_beta4.ebuild 1552
 RMD160 2d73073d3550ddf6c518af7495d2815b5f889c0e ratpoison-1.4.0_beta4.ebuild 1552
 SHA256 ae63ac512d54b8936abbbe43ddeb12a0ae6279adddc5d836dcbd723c34cbafb4 ratpoison-1.4.0_beta4.ebuild 1552
diff --git a/x11-wm/ratpoison/files/digest-ratpoison-1.4.0 b/x11-wm/ratpoison/files/digest-ratpoison-1.4.0
new file mode 100644
index 000000000000..34f2eb441c17
--- /dev/null
+++ b/x11-wm/ratpoison/files/digest-ratpoison-1.4.0
@@ -0,0 +1,3 @@
+MD5 358abef81387f2d554f4a397dee968b1 ratpoison-1.4.0.tar.gz 375793
+RMD160 723f3d4fb92a4ff7bec48062fa179bddd3eafe42 ratpoison-1.4.0.tar.gz 375793
+SHA256 8ca95d315498bd441966387104a46249f4a646e8575c5f8a244e609aa12348e2 ratpoison-1.4.0.tar.gz 375793
diff --git a/x11-wm/ratpoison/ratpoison-1.3.0.ebuild b/x11-wm/ratpoison/ratpoison-1.3.0.ebuild
index 86091f977017..0099863a430b 100644
--- a/x11-wm/ratpoison/ratpoison-1.3.0.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.3.0.ebuild,v 1.6 2005/05/08 15:07:35 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.3.0.ebuild,v 1.7 2006/04/06 03:14:31 weeve Exp $
 
 inherit elisp-common eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 sparc ppc amd64"
 IUSE="emacs"
 
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXinerama x11-libs/libXtst ) virtual/x11 )
 	emacs? ( virtual/emacs )"
 
 SITEFILE=50ratpoison-gentoo.el
diff --git a/x11-wm/ratpoison/ratpoison-1.4.0.ebuild b/x11-wm/ratpoison/ratpoison-1.4.0.ebuild
new file mode 100644
index 000000000000..0143c0e86b73
--- /dev/null
+++ b/x11-wm/ratpoison/ratpoison-1.4.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/04/06 03:14:31 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="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="emacs"
+
+DEPEND="|| ( ( x11-libs/libXinerama x11-libs/libXtst ) virtual/x11 )
+	perl-core/PodParser
+	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
+}
diff --git a/x11-wm/ratpoison/ratpoison-1.4.0_beta2.ebuild b/x11-wm/ratpoison/ratpoison-1.4.0_beta2.ebuild
index 81a8d962200a..96ffc07291de 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.0_beta2.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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_beta2.ebuild,v 1.1 2005/03/26 04:02:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.0_beta2.ebuild,v 1.2 2006/04/06 03:14:31 weeve Exp $
 
 inherit elisp-common eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="emacs"
 
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXinerama x11-libs/libXtst ) virtual/x11 )
 	emacs? ( virtual/emacs )"
 
 SITEFILE=50ratpoison-gentoo.el