Revision bump to 1.4.4-r1 adding debug USE flag, as well as making libXft support optional (bug #267965 again). Remove old.

Package-Manager: portage-2.2_rc31/cvs/Linux i686

5 files changed, 21 insertions, 149 deletions

diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog
index e464d6318c35..b59f5fea5610 100644
--- a/x11-wm/ratpoison/ChangeLog
+++ b/x11-wm/ratpoison/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/ratpoison
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.65 2009/04/30 12:51:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.66 2009/05/01 11:23:51 jer Exp $
+
+*ratpoison-1.4.4-r1 (01 May 2009)
+
+  01 May 2009; Jeroen Roovers <jer@gentoo.org> -ratpoison-1.4.1.ebuild,
+  -ratpoison-1.4.2.ebuild, -ratpoison-1.4.4.ebuild,
+  +ratpoison-1.4.4-r1.ebuild:
+  Revision bump to 1.4.4-r1 adding debug USE flag, as well as making libXft
+  support optional (bug #267965 again). Remove old.
 
   30 Apr 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Version bump. Make building libhistory support a default option.
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 13672c280b8b..e32f51ce810b 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -2,13 +2,9 @@ AUX 50ratpoison-gentoo.el 524 RMD160 9d3dddea32f2607f9df8507cd9ba4f5d700805b8 SH
 AUX ratpoison.el-gentoo.patch 273 RMD160 cdb728742fba664a757d016c82ef356fee740210 SHA1 622861d32eef2469ff6e3409e700767446063080 SHA256 c465104c584f4259bae2486b7a11dd1f9c971350e754af8bdbb030c71cf2c585
 AUX ratpoison.xsession 19 RMD160 1ede12024b97692c47276dd60b9d92f0271358d2 SHA1 7af0516c0e9f172bf371cd25ff1ea12d078d98cd SHA256 6b8677e8eae6043ebe4e5785b0cdf14e78d070cdcc7c9652640f88fbd58d8424
 AUX ratpoisonrc 609 RMD160 4f0735529d1fc984f759537820a3549d6a456276 SHA1 4cab7b06ff27171f2268abbba0181eecebb98c09 SHA256 6293a54a5960dc48a834ffb777994a485d19f80a6db410137b94c96fe2eeab8b
-DIST ratpoison-1.4.1.tar.gz 401826 RMD160 a9c8a913fcdd234f865f6bf26420fb6a2b15c23c SHA1 d2fae111250d6f455063776676663703e4da51aa SHA256 e713399b381ba0802278b4828e02d997d75823a7fb550b253348e2433f4306fc
-DIST ratpoison-1.4.2.tar.gz 407422 RMD160 de594f65cd0eb81d5a0944020626fc1ec016cf4c SHA1 5a2c096e159421fc9aa964c24cbea54cf74be003 SHA256 829ad385a9433f4b1f1c0fcc8cc7f6b95b6f5b0e16620996ba149d341ff06f20
 DIST ratpoison-1.4.3.tar.gz 418364 RMD160 f17f3db64cb11758e76c875cf1743931a0c623ec SHA1 cde8c14c32da82a04ea921545f999ed83045ef4f SHA256 df91bccf273de6e7c64707458a3dfc8b2258a11242d70b6145c91dd64884c397
 DIST ratpoison-1.4.4.tar.gz 427007 RMD160 8293eda3ed6837f035bb6d4379c61f2c192a178b SHA1 73efa1d4ccbc3a069e846e372c8135ddbdab1d09 SHA256 4897999929b7d989b57a8ae5b33fef02bf55cb3a0513218c38a3d81e774718f0
-EBUILD ratpoison-1.4.1.ebuild 1559 RMD160 57cf9a8889b1c17ae6331acc0ccf379dece87d36 SHA1 e9e384138ec685e32acb1f542bc34fe394b19056 SHA256 038c869d488e335f7a0ef385d44253abad9acaf3564d6f209bef362cf099f6b2
-EBUILD ratpoison-1.4.2.ebuild 1563 RMD160 22edf1465c2ee77059692616be6c4f476a4427ee SHA1 7f2a5c35ef16cb607edfd447b27bc887d025bc2c SHA256 97874fffe257243ea0fdce168db5db8606f8d5bc22605d3d96fdd78d59ca44c3
 EBUILD ratpoison-1.4.3.ebuild 1563 RMD160 50be6af3fcd42f773076925562cc142232f9dd8f SHA1 b8b91bf0f6c52390f0bb5866d53c33d151f1f8e9 SHA256 f63c176333244c145e213ba45f3a7dfd9987375e7b76411e55052e5354f8726f
-EBUILD ratpoison-1.4.4.ebuild 1669 RMD160 57f0bd024c298241127855724f881c683d91cbaa SHA1 31daf54835b6bbd45b5041188f23354b0cfca26c SHA256 6647e77767664311264d5331970e9e0c57b1b25b1991c4b4206f877e78088c87
-MISC ChangeLog 8304 RMD160 622c26dd458fbf3cb4ed972f259a15d38bb671e2 SHA1 1b4b417e14535b6e40533805c6d8757e25baca30 SHA256 0286bb637a08435b02e4513c92b708ca8477905c5d59de29ac70d944ca80531c
+EBUILD ratpoison-1.4.4-r1.ebuild 1765 RMD160 4413cb9391c1898d89d03be0bd204ad8b7662f8e SHA1 85384a8575bd55c7c52ee6251f738e0977d7ba0e SHA256 13c69f1a8570306f7c59a5ad761a912e6a546419810ce39187ed6f2cab68c09c
+MISC ChangeLog 8622 RMD160 0acdba4f4bce13d171bd39ca44d603fc908e933f SHA1 25cf03eddd4c91485475b96f6b7bf02d2c183261 SHA256 73114cf1a0d2b14918e55651971eb07a674cf50dd6e644ccb7e0fa01d10f942b
 MISC metadata.xml 855 RMD160 92d76663ef038b22a671d20d3f70d84240da93e2 SHA1 6acbabb6a36bb2f9fe3f4aa6b21987539b336b81 SHA256 f2072215f84960058f060b081f6a83a58fb628df841d37e7c183da3746fbdc4a
diff --git a/x11-wm/ratpoison/ratpoison-1.4.1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.1.ebuild
deleted file mode 100644
index 8f698b27141e..000000000000
--- a/x11-wm/ratpoison/ratpoison-1.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.1.ebuild,v 1.10 2008/09/15 10:25:13 ulm Exp $
-
-inherit elisp-common eutils autotools
-
-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 ~x86-fbsd"
-IUSE="emacs"
-
-DEPEND="x11-libs/libXinerama
-	x11-libs/libXtst
-	virtual/perl-PodParser
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50ratpoison-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/contrib
-	epatch ${FILESDIR}/ratpoison.el-gentoo.patch
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake CFLAGS="${CFLAGS} -I/usr/X11R6/include" || die
-	if use emacs; then
-		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"
-	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.2.ebuild b/x11-wm/ratpoison/ratpoison-1.4.2.ebuild
deleted file mode 100644
index b8c9485b38b1..000000000000
--- a/x11-wm/ratpoison/ratpoison-1.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.2.ebuild,v 1.2 2008/09/15 10:25:13 ulm Exp $
-
-inherit elisp-common eutils autotools
-
-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 ~x86-fbsd"
-IUSE="emacs"
-
-DEPEND="x11-libs/libXinerama
-	x11-libs/libXtst
-	virtual/perl-PodParser
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50ratpoison-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/contrib
-	epatch ${FILESDIR}/ratpoison.el-gentoo.patch
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake CFLAGS="${CFLAGS} -I/usr/X11R6/include" || die
-	if use emacs; then
-		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"
-	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.4.ebuild b/x11-wm/ratpoison/ratpoison-1.4.4-r1.ebuild
index eea439234286..2c62ad470074 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.4.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.4.ebuild,v 1.1 2009/04/30 12:51:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.4-r1.ebuild,v 1.1 2009/05/01 11:23:51 jer Exp $
 
 EAPI="2"
 
@@ -13,13 +13,14 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="emacs +history"
+IUSE="debug emacs +history xft"
 
 DEPEND="x11-libs/libXinerama
 	x11-libs/libXtst
 	virtual/perl-PodParser
 	emacs? ( virtual/emacs )
-	history? ( sys-libs/readline )"
+	history? ( sys-libs/readline )
+	xft? ( x11-libs/libXft )"
 RDEPEND="${DEPEND}"
 
 SITEFILE=50ratpoison-gentoo.el
@@ -32,10 +33,13 @@ src_prepare() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	use history || myconf="--disable-history"
-	econf ${myconf} || die "econf failed"
+	econf ${myconf} $(use_with xft) $(use_enable debug) || die "econf failed"
+}
+
+src_compile() {
 	emake CFLAGS="${CFLAGS} -I/usr/X11R6/include" || die "emake failed"
 	if use emacs; then
 		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"