Patch to prevent #91431

Package-Manager: portage-2.0.51.21

6 files changed, 88 insertions, 4 deletions

diff --git a/app-i18n/xvnkb/ChangeLog b/app-i18n/xvnkb/ChangeLog
index fe5ebb3c2a28..eea1a0fa4423 100644
--- a/app-i18n/xvnkb/ChangeLog
+++ b/app-i18n/xvnkb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/xvnkb
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.7 2005/04/24 11:21:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.8 2005/05/04 15:34:19 pclouds Exp $
+
+*xvnkb-0.2.8a-r1 (04 May 2005)
+
+  04 May 2005; <pclouds@gentoo.org> +files/0.2.8a-putenv.patch,
+  xvnkb-0.2.8a.ebuild, +xvnkb-0.2.8a-r1.ebuild:
+  Patch to prevent #91431
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> xvnkb-0.2.8a.ebuild:
   Stable on ppc.
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 4012d33b60e9..aaae6914caa9 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,5 +1,8 @@
-MD5 cf088c077a4ad64c5e05b316ef3cf9cc xvnkb-0.2.8a.ebuild 1390
+MD5 21e85d1ca3540a1860350a2e3953f43d xvnkb-0.2.8a-r1.ebuild 1433
+MD5 f24f4bbb54d434602ba3f77b263cc61c xvnkb-0.2.8a.ebuild 1430
+MD5 e0185132d1cba361af4c9103ae9b2044 ChangeLog 1038
 MD5 a4ed50393aff561363e1175069e94196 metadata.xml 219
-MD5 2aa4695361f7a4c7c282bff0fd0f99d5 ChangeLog 866
 MD5 64e027bb9e5675302566859249f186b9 files/xvnkb-0.2.8a.patch 562
+MD5 0faefa232848cec1a17d870c714d3610 files/digest-xvnkb-0.2.8a-r1 64
 MD5 0faefa232848cec1a17d870c714d3610 files/digest-xvnkb-0.2.8a 64
+MD5 9106bce464fc57ab32f419bfc472bc37 files/0.2.8a-putenv.patch 337
diff --git a/app-i18n/xvnkb/files/0.2.8a-putenv.patch b/app-i18n/xvnkb/files/0.2.8a-putenv.patch
new file mode 100644
index 000000000000..ef7827e20fe8
--- /dev/null
+++ b/app-i18n/xvnkb/files/0.2.8a-putenv.patch
@@ -0,0 +1,11 @@
+--- xvnkb.c.old	2005-05-04 22:11:50.323413496 +0700
++++ xvnkb.c	2005-05-04 22:12:01.212758064 +0700
+@@ -77,7 +77,7 @@
+ static void __attribute__ ((constructor)) xvnkb_init(void)
+ {
+ 	static char gtk_xim_env[24] = "GTK_IM_MODULE=xim";
+-	putenv(gtk_xim_env);
++	/*putenv(gtk_xim_env);*/
+ 	/* TODO:
+ 	 - Initialize some more variables
+ 	 */
diff --git a/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1 b/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1
new file mode 100644
index 000000000000..a29f0d100239
--- /dev/null
+++ b/app-i18n/xvnkb/files/digest-xvnkb-0.2.8a-r1
@@ -0,0 +1 @@
+MD5 9a94de76689b3ea12a688d4602fc019e xvnkb-0.2.8a.tar.bz2 76221
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
new file mode 100644
index 000000000000..359341654e6e
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild,v 1.1 2005/05/04 15:34:19 pclouds Exp $
+
+inherit eutils
+
+IUSE="truetype spell"
+
+DESCRIPTION="Vietnamese input keyboard for X"
+SRC_URI="http://xvnkb.sourceforge.net/xvnkb/${P}.tar.bz2"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="x86 ppc"
+DEPEND="virtual/x11
+	truetype? ( virtual/xft )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${PV}-putenv.patch
+}
+
+
+src_compile() {
+	local myconf
+
+	use spell || myconf="${myconf} --no-spellcheck"
+	use truetype || myconf="${myconf} --no-xft"
+
+	econf --use-extstroke ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	dobin xvnkb
+	dobin tools/xvnkb_ctrl
+
+	dolib xvnkb.so.${PV}
+	dosym /usr/lib/xvnkb.so.${PV} /usr/lib/xvnkb.so
+
+	dodoc LICENSE ChangeLog AUTHORS THANKS TODO INSTALL* README* doc/*
+	docinto scripts
+	dodoc scripts/*
+	docinto contrib
+	dodoc contrib/*
+}
+
+pkg_postinst() {
+	einfo "Remember to"
+	einfo "$ export LANG=en_US.UTF-8"
+	einfo "(or any other UTF-8 locale) and"
+	einfo "$ export LD_PRELOAD=${DESTTREE}/lib/xvnkb.so"
+	einfo "before starting X Window"
+	einfo "More documents are in /usr/share/doc/${PF}"
+	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
+	ewarn "You have to unset suid/sgid to use with xvnkb"
+}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a.ebuild
index c7e560954e8f..eeab641712be 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.8a.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a.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/app-i18n/xvnkb/xvnkb-0.2.8a.ebuild,v 1.8 2005/04/24 11:21:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.8a.ebuild,v 1.9 2005/05/04 15:34:19 pclouds Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${PV}-putenv.patch
 }