Bug #286073, version bump.

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 124 insertions, 2 deletions

diff --git a/net-misc/suite3270/ChangeLog b/net-misc/suite3270/ChangeLog
index 5e8aa7b36b56..9a1172ad66bd 100644
--- a/net-misc/suite3270/ChangeLog
+++ b/net-misc/suite3270/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/suite3270
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.35 2009/12/15 19:28:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.36 2009/12/26 01:28:48 robbat2 Exp $
+
+*suite3270-3.3.10_p3 (26 Dec 2009)
+
+  26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +suite3270-3.3.10_p3.ebuild,
+  +files/suite3270-3.3.10_p3-fix-x3270-dbcs.patch:
+  Bug #286073, version bump.
 
   15 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   suite3270-3.3.5_p8.ebuild, suite3270-3.3.6.ebuild, suite3270-3.3.7.ebuild,
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 6f4df3a63523..586816857bfb 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,5 +1,7 @@
 AUX configure-3.3.5.patch 2695 RMD160 bfed8a0f0d86ae4164484f1adcd1fe5917f9a5f6 SHA1 00723cf4711aa454f66ccd822cb14cbddbab83b7 SHA256 7cae5b1c5223a80e6cb9f9bd11907ff797ba25c3428041d1ac3770f4c3c504ed
 AUX makeconv-3.3.5.patch 3467 RMD160 067944c92a735f962ad84de560d4fa26b493f2f2 SHA1 f349b9419d65ea07b577da262c06e21ef4278c60 SHA256 320821f1bd97ecc585eecf1aebbafa876bf9280ee9ca740b9696826ab4493692
+AUX suite3270-3.3.10_p3-fix-x3270-dbcs.patch 431 RMD160 50eb9c909f7e7836fe181e3f694c132317d3e325 SHA1 2e161a3ad926872039f65065ee7f7cbf3350b419 SHA256 45c14459adc46badbb1f70f7905a6a31abe2b5d97e0065ae0453fe97ae3308a3
+DIST suite3270-3.3.10ga3-src.tgz 6419282 RMD160 f5af9967e87cc30ab588bcddbd473a0645beb0e0 SHA1 50f0e21f33caf0526aa01f3c90dac9bbac5f8d92 SHA256 c94cd13e82f6f335461f1de7a816e627fa7e55f68852a5f513194067bccc4408
 DIST suite3270-3.3.5p8.tgz 3244414 RMD160 5f6b204d7c5898b07799178dd1c9d917201f21cf SHA1 2de880a3db12e3af27d2afc72ccb72254fb56dc4 SHA256 c33acfecab9b720d9fbc342d2c53c4c3ff999f67b6f2e387dd27b97f2c49eeed
 DIST suite3270-3.3.6.tgz 3315214 RMD160 72a1ef82af8398a4792ed4047bb2b72fad4951ee SHA1 e9d7bd5654aebece15a42d8efe808983b273706b SHA256 189f0f639186060b7bbb3093fce60bfb7f35fa147e051a24753236358f609b5e
 DIST suite3270-3.3.7.tgz 3357492 RMD160 c6a8b7645ee0971ad2a9292ed2865e11b8092e0a SHA1 ed65e8b980a6877a817fd32666c7d5f02c0795b9 SHA256 5b5c3b57cdc3a8e4c2fdd9fa59ef198a5a2ca73f4ad49a42869b709c47318444
@@ -7,6 +9,7 @@ DIST suite3270-3.3.7p5.tgz 3357564 RMD160 cb49a233af9d4c0b1dedee2c50eacf3ffd0750
 DIST suite3270-3.3.7p8.tgz 3362264 RMD160 69e79f56c61d2c74c612908495863cdf32fc5a3f SHA1 1540cc006d99d448ae06d144fa5070ae5e7234b7 SHA256 44fc1b167188c9c5b592c266f7dda391628a72bfbab7b1815bf511f7569ffa4b
 DIST suite3270-3.3.8.tgz 3958021 RMD160 094e50154b8ec8510475cb34ef75c36e484cdf3c SHA1 79164625d193fa7c95c02eb8d406df4dfc715186 SHA256 e37fde24e4b9eec494b58be54b9c3e06d518d66201ece718fcd6259d051dfe93
 DIST suite3270-3.3.9ga12.tgz 6305237 RMD160 4571717bb34a1fe6e43d52d70844033b0e7e164d SHA1 25f1dff877d2af17e0f50433cb5f91006f6ab682 SHA256 256b3e3e51cdde716173bc99cbc08958369bc3b993f0b1aafc50e20d8f17ad2c
+EBUILD suite3270-3.3.10_p3.ebuild 2219 RMD160 4379da6d294d71d5a53b9cd7ddc8dbbb921db576 SHA1 534a8fb5856548235d7d401bb9521c663de157dc SHA256 d750bb1bb4e8e3d634dc537a52454117dba3cde289cfa186b19fd59d0d7c488b
 EBUILD suite3270-3.3.5_p8.ebuild 2213 RMD160 82537e1fa30b86e896cdb1935ad2ab2aed862014 SHA1 64ce905177a4d16ae0541c4207be462fad954083 SHA256 0e252a656cd99bf0402466669364253e1efc908a2cfac5d8e802863dd329b38d
 EBUILD suite3270-3.3.6.ebuild 1965 RMD160 546ccb416f7070ec1507a9faf000a498fd009dc5 SHA1 2fac745ffcfa9cd7133a4b43ff5196d6371e00c1 SHA256 4743829e4511e22f468eedeb1a184bf817e19c806ed62c15ed06f2547b29ca41
 EBUILD suite3270-3.3.7.ebuild 1961 RMD160 c2f0821a9054e5fa37fa3b9ff7290b2e933a6e8e SHA1 d870bb37981b751bf0c9df355377f4ba6b340291 SHA256 529341f565fe16dafaf987504a524f4ea3cf6cdd49ddbe6acf8019fdd8050622
@@ -14,5 +17,5 @@ EBUILD suite3270-3.3.7_p5.ebuild 1972 RMD160 72f46b8c5b62106ba5c25b686bbfde8b507
 EBUILD suite3270-3.3.7_p8.ebuild 1977 RMD160 cab3867c45190bc0956e02d4bf254e6ae8e593f6 SHA1 f2c056d63f002e945f8a08c068e82d82a6c93f16 SHA256 edcb1814c0c7cd1702fceb8ca7da968b704710eef450e9fb823d5e442194c1c6
 EBUILD suite3270-3.3.8.ebuild 1949 RMD160 93d326b7b444d2f08be4d916fa89b2fabdd7a494 SHA1 c42cf0f798dae13167bec01dea16ee59637c6ce9 SHA256 fb4d949b9317e0fccfc7035541f59331dee7cca2aea25a9615e1d80582e34ece
 EBUILD suite3270-3.3.9_p12.ebuild 1982 RMD160 ff8e2b64d783828dfb2d952cd82e7b0c4bee6bcc SHA1 f6954ec1be0243b68041c2130616e542d52fed75 SHA256 0f90911418b70df785525a4bf76dd5a0e82e8c9bba447648db0df49989f80038
-MISC ChangeLog 5216 RMD160 1d2b6060048d09702258890b0cc29933b6ddba7d SHA1 c937dcccffd8b9fb3e0579a4b4870bb425b79816 SHA256 83e952008ddfd1672edddd74623ffd8a00817b92739615a9cc050539a6f3c20a
+MISC ChangeLog 5415 RMD160 87de94824c1a22b4cca6ab6bb556b1fd01d40946 SHA1 05e4c6d691156092ce1fa5b203fb4f57bd0fc62c SHA256 3e567e32dd9158f18c53da046c921b1b17d180c0518645fb1aa05acfe924a9de
 MISC metadata.xml 482 RMD160 7fc419fab5394897351e5461ee492164549b9edc SHA1 c8d14dfbbad0f4cd3d7756e3147c5cdaf41efd1e SHA256 95e3b9f880bbed9a36738693c42b0b96693d5f49bd6d60321d4ef227f1f5ac38
diff --git a/net-misc/suite3270/files/suite3270-3.3.10_p3-fix-x3270-dbcs.patch b/net-misc/suite3270/files/suite3270-3.3.10_p3-fix-x3270-dbcs.patch
new file mode 100644
index 000000000000..cfe8170c44dc
--- /dev/null
+++ b/net-misc/suite3270/files/suite3270-3.3.10_p3-fix-x3270-dbcs.patch
@@ -0,0 +1,18 @@
+diff -Naur a/x3270-3.3/screen.c b/x3270-3.3/screen.c
+--- a/x3270-3.3/screen.c	2009-09-05 23:04:21.000000000 -0400
++++ b/x3270-3.3/screen.c	2009-09-23 08:15:40.000000000 -0400
+@@ -2322,12 +2322,14 @@
+ void
+ screen_flip(void)
+ {
++#if defined(X3270_DBCS) /*[*/
+ 	/* Flip mode is broken in the DBCS version. */
+ 	if (!dbcs) {
+ 		flipped = !flipped;
+ 
+ 		action_internal(PA_Expose_action, IA_REDRAW, CN, CN);
+ 	}
++#endif /*]*/
+ }
+ 
+ /*
diff --git a/net-misc/suite3270/suite3270-3.3.10_p3.ebuild b/net-misc/suite3270/suite3270-3.3.10_p3.ebuild
new file mode 100644
index 000000000000..1db98e071125
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.3.10_p3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.10_p3.ebuild,v 1.1 2009/12/26 01:28:48 robbat2 Exp $
+
+inherit eutils
+
+IUSE="cjk doc ncurses ssl tcl X"
+
+MY_PV="${PV/_p/ga}"
+MY_P="${PN}-${MY_PV}"
+
+S="${WORKDIR}"
+DESCRIPTION="Complete 3270 access package"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+HOMEPAGE="http://x3270.bgp.nu/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+
+RDEPEND="X? ( x11-libs/libX11
+			  x11-libs/libXaw
+			  x11-libs/libXmu
+			  x11-libs/libXt )
+		 ncurses? ( sys-libs/ncurses
+					sys-libs/readline )
+		 ssl? ( dev-libs/openssl )
+		 tcl? ( dev-lang/tcl )"
+
+DEPEND="${RDEPEND}
+		X? ( x11-misc/imake
+			 x11-misc/xbitmaps
+			 x11-proto/xproto
+			 app-text/rman
+			 x11-apps/mkfontdir
+			 x11-apps/bdftopcf )"
+
+SUB_PV="3.3"
+MY_FONTDIR="/usr/share/fonts/x3270"
+
+suite3270_makelist() {
+	MY_PLIST="pr3287 s3270"
+	use ncurses && MY_PLIST="${MY_PLIST} c3270"
+	use tcl && MY_PLIST="${MY_PLIST} tcl3270"
+	use X && MY_PLIST="${MY_PLIST} x3270"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Patches were sent upstream to maintainer
+	# as of 23 September 2009, by Jesse Farinacci <jieryn@gmail.com>
+	use X && ! use cjk && epatch "${FILESDIR}/$P-fix-x3270-dbcs.patch"
+	return 0
+}
+
+src_compile() {
+	local myconf
+
+	myconf="--without-pr3287"
+	myconf="${myconf} --cache-file=${S}/config.cache"
+	myconf="${myconf} $(use_enable cjk dbcs)"
+	myconf="${myconf} $(use_enable ssl)"
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with X fontdir ${MY_FONTDIR})"
+
+	suite3270_makelist
+	for p in ${MY_PLIST} ; do
+		cd "${S}/${p}-${SUB_PV}"
+		econf ${myconf} || die "econf failed on ${p}"
+		emake || die "emake faild on ${p}"
+	done
+}
+
+src_install () {
+	suite3270_makelist
+	use X && dodir ${MY_FONTDIR}
+	for p in ${MY_PLIST} ; do
+		cd "${S}/${p}-${SUB_PV}"
+		emake DESTDIR="${D}" install install.man \
+			|| die "emake failed on ${p}"
+		use doc && docinto ${p} && dohtml html/*
+	done
+
+	use X && rm -f "${D}/${MY_FONTDIR}/fonts.dir"
+	return 0
+}
+
+pkg_postinst() {
+	if use X ; then
+		einfo "Running mkfontdir on ${MY_FONTDIR}"
+		mkfontdir ${MY_FONTDIR}
+	fi
+}