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

(Portage version: 2.2_rc31/cvs/Linux i686)

4 files changed, 19 insertions, 143 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/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"