From 363a5363ae0bb7a9d97cf7459fbce37b92b82b72 Mon Sep 17 00:00:00 2001
From: Mamoru Komachi <usata@gentoo.org>
Date: Sat, 2 Jul 2005 06:42:04 +0000
Subject: Added line-scroll patch; bug #97408. Thanks to James Kyte
 <james.kyte@gmail.com>. (Portage version: 2.0.51.22-r1)

---
 x11-terms/rxvt/ChangeLog                           | 10 ++-
 x11-terms/rxvt/Manifest                            |  5 +-
 x11-terms/rxvt/files/digest-rxvt-2.7.10-r1         |  1 -
 x11-terms/rxvt/files/digest-rxvt-2.7.10-r3         |  2 +
 x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch | 13 ++++
 x11-terms/rxvt/rxvt-2.7.10-r1.ebuild               | 83 --------------------
 x11-terms/rxvt/rxvt-2.7.10-r2.ebuild               |  4 +-
 x11-terms/rxvt/rxvt-2.7.10-r3.ebuild               | 89 ++++++++++++++++++++++
 8 files changed, 118 insertions(+), 89 deletions(-)
 delete mode 100644 x11-terms/rxvt/files/digest-rxvt-2.7.10-r1
 create mode 100644 x11-terms/rxvt/files/digest-rxvt-2.7.10-r3
 create mode 100644 x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch
 delete mode 100644 x11-terms/rxvt/rxvt-2.7.10-r1.ebuild
 create mode 100644 x11-terms/rxvt/rxvt-2.7.10-r3.ebuild

(limited to 'x11-terms')

diff --git a/x11-terms/rxvt/ChangeLog b/x11-terms/rxvt/ChangeLog
index 3ddd882dfe5b..572c9d6a4fa6 100644
--- a/x11-terms/rxvt/ChangeLog
+++ b/x11-terms/rxvt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/rxvt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.34 2005/04/06 04:11:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.35 2005/07/02 06:42:04 usata Exp $
+
+*rxvt-2.7.10-r3 (02 Jul 2005)
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/rxvt-2.7.10-line-scroll.patch, -rxvt-2.7.10-r1.ebuild,
+  rxvt-2.7.10-r2.ebuild, +rxvt-2.7.10-r3.ebuild:
+  Added line-scroll patch; bug #97408. Thanks to James Kyte
+  <james.kyte@gmail.com>.
 
   06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> rxvt-2.7.10-r2.ebuild:
   Added uclibctoolize; bug #74517.
diff --git a/x11-terms/rxvt/Manifest b/x11-terms/rxvt/Manifest
index 3cc0bfb6b517..1adc083dc560 100644
--- a/x11-terms/rxvt/Manifest
+++ b/x11-terms/rxvt/Manifest
@@ -1,10 +1,11 @@
 MD5 dcc6040c07751ed76667a361cacbb05c rxvt-2.7.10.ebuild 1731
 MD5 f4d7ec55ec3fb0855c4325e84e600a23 ChangeLog 6109
 MD5 cd46a87805d1d53c2c0e5f9d9169b9ae metadata.xml 491
-MD5 703a6aec964a2d2ca232d606db090f8f rxvt-2.7.10-r1.ebuild 1821
+MD5 b4eef207cec76e7bc4b6ede73fb60f63 rxvt-2.7.10-r3.ebuild 2118
 MD5 0d8d563457e8e7f1ec43dd78764198f9 rxvt-2.7.10-r2.ebuild 2075
 MD5 291517d74d27db9317081ea6cdbea0bb files/digest-rxvt-2.7.10-r2 133
 MD5 783f67501d23b6516ec6a923b96e2b6a files/digest-rxvt-2.7.10 63
 MD5 a38b2f365a55cad915e1e503466ab029 files/rxvt-2.7.10-azz4.diff 5072
-MD5 783f67501d23b6516ec6a923b96e2b6a files/digest-rxvt-2.7.10-r1 63
+MD5 291517d74d27db9317081ea6cdbea0bb files/digest-rxvt-2.7.10-r3 133
+MD5 02ae23d7da7a8289fef1da4ec68d69fb files/rxvt-2.7.10-line-scroll.patch 438
 MD5 16be90450ba268312bb146b3d4e7b6e9 files/rxvt-2.7.10-rk.patch 2772
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r1 b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r1
deleted file mode 100644
index d2a15ace7df8..000000000000
--- a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3 b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3
new file mode 100644
index 000000000000..bf6f14517115
--- /dev/null
+++ b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r3
@@ -0,0 +1,2 @@
+MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
+MD5 299ecbc322232d4031c02c72981fb193 rxvt-2.7.10-xim-fix.patch.gz 602
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch b/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch
new file mode 100644
index 000000000000..5d874d57f61a
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch
@@ -0,0 +1,13 @@
+--- src/feature.h.orig	2005-06-29 11:58:06.000000000 -0400
++++ src/feature.h	2005-06-29 11:58:41.000000000 -0400
+@@ -211,8 +211,8 @@
+  * SCROLL_ON_* defines above.). 
+  * Also for modifier+Home/End keys to move to top/bottom
+  */
+-/* #define SCROLL_ON_UPDOWN_KEYS */
+-/* #define SCROLL_ON_HOMEEND_KEYS */
++#define SCROLL_ON_UPDOWN_KEYS */
++#define SCROLL_ON_HOMEEND_KEYS */
+
+ /*
+  * Allow unshifted Next/Prior keys to scroll forward/back
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild
deleted file mode 100644
index c7d5d665c9c9..000000000000
--- a/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild,v 1.4 2004/12/29 17:08:40 usata Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="rxvt -- nice small x11 terminal"
-HOMEPAGE="http://www.rxvt.org/"
-SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~amd64 ~ppc64"
-IUSE="motif cjk xgetdefault"
-
-DEPEND="virtual/libc
-	virtual/x11
-	motif? ( x11-libs/openmotif )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use motif && epatch ${FILESDIR}/${P}-azz4.diff
-	use cjk && epatch ${FILESDIR}/${P}-rk.patch
-}
-
-src_compile() {
-
-	local term
-	if [ -n "${RXVT_TERM}" ] ; then
-		term="${RXVT_TERM}"
-	else
-		term="rxvt"
-	fi
-
-	# bug #22325
-	append-flags -DLINUX_KEYS
-	append-ldflags -Wl,-z,now
-
-	econf \
-		--enable-everything \
-		--enable-rxvt-scroll \
-		--enable-next-scroll \
-		--enable-xterm-scroll \
-		--enable-transparency \
-		--enable-xpm-background \
-		--enable-utmp \
-		--enable-wtmp \
-		--enable-mousewheel \
-		--enable-slipwheeling \
-		--enable-smart-resize \
-		--enable-256-color \
-		--enable-menubar \
-		--enable-languages \
-		--enable-xim \
-		--enable-shared \
-		--enable-keepscrolling \
-		--with-term=${term} \
-		$(use_enable xgetdefault) || die
-
-	emake || die
-}
-
-src_install() {
-
-	einstall mandir=${D}/usr/share/man/man1 || die
-
-	cd ${S}/doc
-	dodoc README* *.txt BUGS FAQ
-	dohtml *.html
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "If you want to change default TERM variable other than rxvt,"
-	einfo "set RXVT_TERM environment variable and then emerge rxvt."
-	einfo "Especially, if you use rxvt under monochrome X you might need to run"
-	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt"
-	einfo "otherwise curses based program will not work."
-	einfo
-}
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild
index 13b95f6c5695..bff000f1afd8 100644
--- a/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild,v 1.2 2005/04/06 04:11:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r2.ebuild,v 1.3 2005/07/02 06:42:04 usata Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~amd64 ~ppc64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~mips ~amd64 ~ppc64"
 IUSE="motif cjk xgetdefault linuxkeys"
 
 DEPEND="virtual/libc
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
new file mode 100644
index 000000000000..f2b4ff2dc73f
--- /dev/null
+++ b/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r3.ebuild,v 1.1 2005/07/02 06:42:04 usata Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="rxvt -- nice small x11 terminal"
+HOMEPAGE="http://www.rxvt.org/
+	http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/"
+SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz
+	http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/${P}-xim-fix.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~amd64 ~ppc64"
+IUSE="motif cjk xgetdefault linuxkeys"
+
+DEPEND="virtual/libc
+	virtual/x11
+	motif? ( x11-libs/openmotif )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-line-scroll.patch
+	use motif && epatch ${FILESDIR}/${P}-azz4.diff
+	use cjk && epatch ${DISTDIR}/${P}-xim-fix.patch.gz
+	use linguas_ja && epatch ${FILESDIR}/${P}-rk.patch
+
+	uclibctoolize
+}
+
+src_compile() {
+
+	local term
+	if [ -n "${RXVT_TERM}" ] ; then
+		term="${RXVT_TERM}"
+	else
+		term="rxvt"
+	fi
+
+	# bug #22325
+	use linuxkeys && append-flags -DLINUX_KEYS
+	append-ldflags -Wl,-z,now
+
+	econf \
+		--enable-everything \
+		--enable-rxvt-scroll \
+		--enable-next-scroll \
+		--enable-xterm-scroll \
+		--enable-transparency \
+		--enable-xpm-background \
+		--enable-utmp \
+		--enable-wtmp \
+		--enable-mousewheel \
+		--enable-slipwheeling \
+		--enable-smart-resize \
+		--enable-256-color \
+		--enable-menubar \
+		--enable-languages \
+		--enable-xim \
+		--enable-shared \
+		--enable-keepscrolling \
+		--with-term=${term} \
+		$(use_enable xgetdefault) || die
+
+	emake || die
+}
+
+src_install() {
+
+	einstall mandir=${D}/usr/share/man/man1 || die
+
+	cd ${S}/doc
+	dodoc README* *.txt BUGS FAQ
+	dohtml *.html
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "If you want to change default TERM variable other than rxvt,"
+	einfo "set RXVT_TERM environment variable and then emerge rxvt."
+	einfo "Especially, if you use rxvt under monochrome X you might need to run"
+	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt"
+	einfo "otherwise curses based program will not work."
+	einfo
+}
-- 
cgit v1.2.3-65-gdbad