Bug #131406, version bump. Update old ebuild for modular X.

(Portage version: 2.1_pre10-r5)

6 files changed, 151 insertions, 4 deletions

diff --git a/net-misc/suite3270/ChangeLog b/net-misc/suite3270/ChangeLog
index 24e871e99db3..6e146e93b798 100644
--- a/net-misc/suite3270/ChangeLog
+++ b/net-misc/suite3270/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/suite3270
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.8 2006/01/26 06:32:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.9 2006/05/13 07:26:07 robbat2 Exp $
+
+*suite3270-3.3.4_p6 (13 May 2006)
+
+  13 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  suite3270-3.2.20.ebuild, +suite3270-3.3.4_p6.ebuild:
+  Bug #131406, version bump.  Update old ebuild for modular X.
 
   26 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   suite3270-3.3.2_p1.ebuild:
diff --git a/net-misc/suite3270/files/digest-suite3270-3.2.20 b/net-misc/suite3270/files/digest-suite3270-3.2.20
index 1cbbd90ce615..ba493a4ae660 100644
--- a/net-misc/suite3270/files/digest-suite3270-3.2.20
+++ b/net-misc/suite3270/files/digest-suite3270-3.2.20
@@ -1 +1,3 @@
 MD5 9036269775a0a14078958e30a0ed4ee6 suite3270-3220.tgz 1608609
+RMD160 ceacf65218458a071cec3c2e08ece51cae6bbd46 suite3270-3220.tgz 1608609
+SHA256 89cafd6bc0da48b528476a4debce7945c4d8ac0432ef55edd3cb2488331679bf suite3270-3220.tgz 1608609
diff --git a/net-misc/suite3270/files/digest-suite3270-3.3.2_p1 b/net-misc/suite3270/files/digest-suite3270-3.3.2_p1
index 479eb5df6314..48ff9b2f5915 100644
--- a/net-misc/suite3270/files/digest-suite3270-3.3.2_p1
+++ b/net-misc/suite3270/files/digest-suite3270-3.3.2_p1
@@ -1 +1,3 @@
 MD5 a1a0260d55c73ceb8e880872d1283f21 suite3270-332p1.tgz 2161146
+RMD160 e6f27eaa700b50cf8a9bcec3ab1bc13636d3fe89 suite3270-332p1.tgz 2161146
+SHA256 b8e8c7c009f2fabe01ff97d437f826f370d8df9107ab46b14e2aaa30f1d7d819 suite3270-332p1.tgz 2161146
diff --git a/net-misc/suite3270/files/digest-suite3270-3.3.4_p6 b/net-misc/suite3270/files/digest-suite3270-3.3.4_p6
new file mode 100644
index 000000000000..66d6c63370cc
--- /dev/null
+++ b/net-misc/suite3270/files/digest-suite3270-3.3.4_p6
@@ -0,0 +1,3 @@
+MD5 127a8b7c376973b3cf18076d5ac7a7e0 suite3270-334p6.tgz 2763166
+RMD160 66d7376be5496c64d85891a47753108369dfede0 suite3270-334p6.tgz 2763166
+SHA256 4f8bb1568670fd13b0eda83833b0bad9cc7495b48cbe9cff46728e50bab556cd suite3270-334p6.tgz 2763166
diff --git a/net-misc/suite3270/suite3270-3.2.20.ebuild b/net-misc/suite3270/suite3270-3.2.20.ebuild
index 6774dacfa2c4..51a9fbce3a08 100644
--- a/net-misc/suite3270/suite3270-3.2.20.ebuild
+++ b/net-misc/suite3270/suite3270-3.2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.2.20.ebuild,v 1.5 2004/06/25 00:14:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.2.20.ebuild,v 1.6 2006/05/13 07:26:07 robbat2 Exp $
 
 IUSE="tcltk X"
 
@@ -13,10 +13,17 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( || ( x11-libs/libXaw virtual/x11 ) )
 		tcltk? ( dev-lang/tcl )
 		sys-libs/ncurses
 		sys-libs/readline"
+DEPEND="${RDEPEND}
+		X? ( || ( ( app-text/rman
+					x11-misc/imake
+					x11-proto/xproto )
+				virtual/x11 ) )
+		sys-apps/sed
+		sys-apps/grep"
 
 suite3270_src_compile() {
 	[ -z "${1}" ] && die "Need a parameter of the item to build!"
diff --git a/net-misc/suite3270/suite3270-3.3.4_p6.ebuild b/net-misc/suite3270/suite3270-3.3.4_p6.ebuild
new file mode 100644
index 000000000000..c3e7c07ebed6
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.3.4_p6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.4_p6.ebuild,v 1.1 2006/05/13 07:26:07 robbat2 Exp $
+
+IUSE="tcltk X cjk ssl debug"
+
+S="${WORKDIR}"
+DESCRIPTION="Complete 3270 access package"
+MY_PV_tmp="${PV//.}"
+MY_PV="${MY_PV_tmp//_}"
+SRC_URI="http://x3270.bgp.nu/download/${PN}-${MY_PV}.tgz"
+HOMEPAGE="http://www.geocities.com/SiliconValley/Peaks/7814/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~s390"
+
+RDEPEND="X? ( || ( x11-libs/libXaw virtual/x11 ) )
+		tcltk? ( dev-lang/tcl )
+		sys-libs/ncurses
+		sys-libs/readline
+		ssl? ( dev-libs/openssl )
+		cjk? ( dev-libs/icu )"
+DEPEND="${RDEPEND}
+		X? ( || ( ( app-text/rman
+					x11-misc/imake
+					x11-proto/xproto )
+				virtual/x11 ) )
+		sys-apps/sed
+		sys-apps/grep"
+
+# for each subitem
+SUB_PV="3.3"
+
+suite3270_src_compile() {
+	[ -z "${1}" ] && die "Need a parameter of the item to build!"
+	local MY_PN="${1}"
+	shift
+	cd ${S}/${MY_PN}-${SUB_PV}
+	local myconf_tmp="${*}"
+	local myconf=""
+	for i in ${myconf_tmp}; do
+		tmpexpr=`echo ${i} | sed -re 's:--([[:alnum:]]+)-([-[:alnum:]]+)(=.*)?:\2:g'`
+		use debug && einfo "Testing ${MY_PN}: ${i} => ${tmpexpr}"
+		grep -q -- ${tmpexpr} configure
+		[ "$?" -eq "0" ] && myconf="${myconf} ${i}"
+	done
+	echo
+	einfo "Compiling ${MY_PN} with ${myconf}"
+	econf ${myconf} || die
+	emake || die
+	cd ${S}
+}
+
+suite3270_src_install() {
+	[ -z "${1}" ] && die "Need a parameter of the item to build!"
+	local MY_PN="${1}"
+	shift
+	cd ${S}/${MY_PN}-${SUB_PV}
+	local myconf="${*}"
+	make DESTDIR=${D} ${myconf} install install.man || die
+	docinto ${MY_PN}
+	dohtml html/*
+}
+
+suite3270_makelist() {
+	MY_PLIST="c3270 pr3287 s3270"
+	use tcltk && MY_PLIST="${MY_PLIST} tcl3270"
+	use X && MY_PLIST="${MY_PLIST} x3270"
+}
+
+src_compile() {
+	suite3270_makelist
+	local myconf_common
+	myconf_common="--without-pr3287 --cache-file=${S}/config.cache"
+	#use X && myconf_common="${myconf_common} --with-x"
+	myconf_common="${myconf_common} `use_with X x`"
+	#myconf_common="${myconf_common} `use_with ssl`"
+	myconf_common="${myconf_common} `use_enable ssl`"
+	if use cjk; then
+		myconf_common="${myconf_common} --with-icu=/usr --enable-dbcs"
+	else
+		myconf_common="${myconf_common} --without-icu --disable-dbcs"
+	fi
+	if use tcltk; then
+		local tclinc
+		for j in `seq 1 5`; do
+			if has_version "=dev-lang/tcl-8.${j}*"; then
+				einfo "Found TCL-8.${j}"
+				tclinc="--with-tcl=8.${j}"
+			fi
+		done
+		if [ -z "${tclinc}" ]; then
+			die "USE=tcltk, but cannot find dev-lang/tcl!"
+		fi
+		myconf_common="${myconf_common} ${tclinc}"
+	else
+		myconf_common="${myconf_common} --without-tcl"
+	fi
+	for i in ${MY_PLIST}; do
+		suite3270_src_compile ${i}  "${myconf_common}"
+	done
+}
+
+src_install () {
+	suite3270_makelist
+	for i in ${MY_PLIST}; do
+		suite3270_src_install ${i}
+	done
+	prepalldocs
+
+	use X && rm ${D}/usr/X11R6/lib/X11/fonts/misc/fonts.dir
+}
+
+pkg_postinst() {
+	if use X; then
+		einfo ">>> Running mkfontdir on /usr/X11R6/lib/X11/fonts/misc"
+		mkfontdir /usr/lib/X11/fonts/misc
+	fi
+}
+
+pkg_postrm() {
+	if use X; then
+		einfo ">>> Running mkfontdir on /usr/X11R6/lib/X11/fonts/misc"
+		mkfontdir /usr/lib/X11/fonts/misc
+	fi
+}