multilib fix for #202840; thanks to Eric Lesage for reporting

Package-Manager: portage-2.1.3.19

4 files changed, 81 insertions, 5 deletions

diff --git a/app-misc/ckermit/ChangeLog b/app-misc/ckermit/ChangeLog
index 8cb67b3cb08a..a51598b85a72 100644
--- a/app-misc/ckermit/ChangeLog
+++ b/app-misc/ckermit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/ckermit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ChangeLog,v 1.25 2007/09/03 23:16:19 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ChangeLog,v 1.26 2007/12/22 14:54:57 mjolnir Exp $
+
+  22 Dec 2007; Martin Jackson <mjolnir@gentoo.org>
+  +ckermit-8.0.211-r3.ebuild:
+  multilib fix for #202840; thanks to Eric Lasage for reporting
+
+*ckermit-8.0.211-r3 (22 Dec 2007)
 
   03 Sep 2007; Martin Jackson <mjolnir@gentoo.org> -ckermit-8.0.211.ebuild:
   Remove old version, now that the real 211 is stable
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 8b8b7ace7d58..511ab19464d8 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -3,10 +3,14 @@ EBUILD ckermit-8.0.211-r2.ebuild 1307 RMD160 09ff22cf19431b696671f6db5fd78be8610
 MD5 3582061acc5d6907ef0c2a221131bbee ckermit-8.0.211-r2.ebuild 1307
 RMD160 09ff22cf19431b696671f6db5fd78be86101e363 ckermit-8.0.211-r2.ebuild 1307
 SHA256 15f2ec6d0273f57f6f32bac4358b398245b44447646a19db2a4d776e11ce20e2 ckermit-8.0.211-r2.ebuild 1307
-MISC ChangeLog 3816 RMD160 8448a13951252ce6f29ac42a2660a9587dbf05a7 SHA1 5183cf19e9f34f785e7fe7f91da53d399a05026d SHA256 9aa61889c53c5f030e65d95479fee14200adf52f4cda2bcfaf8363dbc4230587
-MD5 239ea0b699c1f5cc6ef03d78925b4ce4 ChangeLog 3816
-RMD160 8448a13951252ce6f29ac42a2660a9587dbf05a7 ChangeLog 3816
-SHA256 9aa61889c53c5f030e65d95479fee14200adf52f4cda2bcfaf8363dbc4230587 ChangeLog 3816
+EBUILD ckermit-8.0.211-r3.ebuild 1599 RMD160 864139a80c7bbc7607bc70dd542e98843b5526b8 SHA1 8c2969544fc86f8582fc1fe77d8fdac716f77d4c SHA256 163035d6a9c8c9d173dce0d3939e28d7fcd0497a494676d9a2e8690d99302f63
+MD5 42e9222482cdc44798a79a83c031fb75 ckermit-8.0.211-r3.ebuild 1599
+RMD160 864139a80c7bbc7607bc70dd542e98843b5526b8 ckermit-8.0.211-r3.ebuild 1599
+SHA256 163035d6a9c8c9d173dce0d3939e28d7fcd0497a494676d9a2e8690d99302f63 ckermit-8.0.211-r3.ebuild 1599
+MISC ChangeLog 3997 RMD160 d9acccddbe59152fe6c7aa05f9827090a4ace0f1 SHA1 5e6436a02ee955cf675912f20df0fc903ebb3984 SHA256 d41ad197fcde3acfe21803481708d834ed68c22a119e0a7ae4a6e240e3255086
+MD5 abc5093f5bc4216f02e4aafa14cef952 ChangeLog 3997
+RMD160 d9acccddbe59152fe6c7aa05f9827090a4ace0f1 ChangeLog 3997
+SHA256 d41ad197fcde3acfe21803481708d834ed68c22a119e0a7ae4a6e240e3255086 ChangeLog 3997
 MISC metadata.xml 253 RMD160 548143f34075d159d3466e6f9a8d7e017918f250 SHA1 5fd9ee4c361f9069d102f6bf1f40b5c5ca2f0676 SHA256 622760ebb0f359923ce69e157ce6f7ca45baed3f3d4ec590e95ef39e30946484
 MD5 a71739eb78a524507606adc92f8a125c metadata.xml 253
 RMD160 548143f34075d159d3466e6f9a8d7e017918f250 metadata.xml 253
@@ -14,3 +18,6 @@ SHA256 622760ebb0f359923ce69e157ce6f7ca45baed3f3d4ec590e95ef39e30946484 metadata
 MD5 94f4f262cd083242d74624f2098791bc files/digest-ckermit-8.0.211-r2 223
 RMD160 1cd6759b502af7f4bc5d87ae7b2a7413e376d274 files/digest-ckermit-8.0.211-r2 223
 SHA256 e4168b672a6fc8aa8d3bee39f0e26bec58018a7681139651a4fcc43d673e91b8 files/digest-ckermit-8.0.211-r2 223
+MD5 94f4f262cd083242d74624f2098791bc files/digest-ckermit-8.0.211-r3 223
+RMD160 1cd6759b502af7f4bc5d87ae7b2a7413e376d274 files/digest-ckermit-8.0.211-r3 223
+SHA256 e4168b672a6fc8aa8d3bee39f0e26bec58018a7681139651a4fcc43d673e91b8 files/digest-ckermit-8.0.211-r3 223
diff --git a/app-misc/ckermit/ckermit-8.0.211-r3.ebuild b/app-misc/ckermit/ckermit-8.0.211-r3.ebuild
new file mode 100644
index 000000000000..5b6cfd50faf6
--- /dev/null
+++ b/app-misc/ckermit/ckermit-8.0.211-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ckermit-8.0.211-r3.ebuild,v 1.1 2007/12/22 14:54:57 mjolnir Exp $
+
+inherit versionator multilib
+
+# Columbia University only uses the third component, e.g. cku211.tar.gz for
+# what we would call 8.0.211.
+MY_P="cku$( get_version_component_range 3 ${PV} )"
+
+DESCRIPTION="combined serial and network communication software package"
+SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
+HOMEPAGE="http://www.kermit-project.org/"
+
+LICENSE="Kermit"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:-O:${CFLAGS}:" makefile
+
+	# Look for grantpt in the right place - amd64 specific, for #202840
+	stdlibdir=$(get_ml_incdir /usr/include)
+	sed -i -e "s:grep grantpt /usr/include:grep grantpt ${stdlibdir}:" makefile
+	sed -i -e "s:then HAVE_PTMX=':then HAVE_PTMX='-D_XOPEN_SOURCE -D_BSD_SOURCE :" makefile
+}
+
+src_compile() {
+	emake KFLAGS="-DCK_SHADOW" linux || die
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake \
+		DESTDIR=${D} \
+		BINDIR=/usr/bin \
+		MANDIR=${D}/usr/share/man/man1 \
+		MANEXT=1 \
+		install || die
+
+	# make the correct symlink
+	rm -f ${D}/usr/bin/kermit-sshsub
+	dosym /usr/bin/kermit /usr/bin/kermit-sshsub
+
+	#the ckermit.ini script is calling the wrong kermit binary -- the one
+	# from ${D}
+	dosed /usr/bin/ckermit.ini
+	dodoc COPYING.TXT UNINSTALL *.txt
+}
diff --git a/app-misc/ckermit/files/digest-ckermit-8.0.211-r3 b/app-misc/ckermit/files/digest-ckermit-8.0.211-r3
new file mode 100644
index 000000000000..6ce8c568609d
--- /dev/null
+++ b/app-misc/ckermit/files/digest-ckermit-8.0.211-r3
@@ -0,0 +1,3 @@
+MD5 5767ec5e6ff0857cbfe2d3ec1ee0e2bc cku211.tar.gz 2878523
+RMD160 c80de6eeec3b4d87a09946a4d440da3b4faaa3b2 cku211.tar.gz 2878523
+SHA256 39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93 cku211.tar.gz 2878523