9 files changed, 39 insertions, 144 deletions
diff --git a/net-im/curphoo/ChangeLog b/net-im/curphoo/ChangeLog
index 511e59a807d9..30a762afca64 100644
--- a/net-im/curphoo/ChangeLog
+++ b/net-im/curphoo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/curphoo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/ChangeLog,v 1.13 2004/09/25 20:45:41 mkennedy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/ChangeLog,v 1.14 2005/08/08 16:13:56 mkennedy Exp $
+
+*curphoo-0.3.12-r1 (08 Aug 2005)
+
+  08 Aug 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.3.12-session-server-gentoo.patch, -files/encodep.py-gentoo.patch,
+  -curphoo-0.3.11.ebuild, -curphoo-0.3.12.ebuild, +curphoo-0.3.12-r1.ebuild:
+  Added patch to follow recent changes in authentication server; Removed old
+  ebuilds; Added metadata.xml.
 
   25 Sep 2004; <mkennedy@gentoo.org> curphoo-0.3.12.ebuild:
   Added patch for 64-bit cleanliness.
diff --git a/net-im/curphoo/Manifest b/net-im/curphoo/Manifest
index 0cfe0acf7d75..84b59de1743e 100644
--- a/net-im/curphoo/Manifest
+++ b/net-im/curphoo/Manifest
@@ -1,8 +1,7 @@
-MD5 9582398f3ece3cfa53550c236f43f497 curphoo-0.3.12.ebuild 968
-MD5 9bd3d2bc0ea773ea219f7185e1ff85a1 curphoo-0.3.11.ebuild 901
-MD5 759d5cafe907d107d08559d6b1ec679a ChangeLog 2537
-MD5 b967810475a0de3912a90f4f4f20ab1c files/digest-curphoo-0.3.12 140
-MD5 7bfb17e560e41bd3286ed9948e874972 files/curphoo.sh 113
-MD5 5ad580535a74a3a5735342833ba01c10 files/digest-curphoo-0.3.11 66
+MD5 f70cfe40c7e6223a96332e064098d511 ChangeLog 2887
+MD5 2bfae1e5bb975f12d5062aa546c12884 metadata.xml 224
+MD5 09e79718749a22863e700a4fa4ec3205 curphoo-0.3.12-r1.ebuild 1029
 MD5 1a18c568484293132a02204630d6324d files/curphoo.1 1755
-MD5 bf702c387489441cb06e3c1239d0ba29 files/encodep.py-gentoo.patch 4290
+MD5 7bfb17e560e41bd3286ed9948e874972 files/curphoo.sh 113
+MD5 b967810475a0de3912a90f4f4f20ab1c files/digest-curphoo-0.3.12-r1 140
+MD5 122cab072db3abe0d1b856902409642f files/0.3.12-session-server-gentoo.patch 507
diff --git a/net-im/curphoo/curphoo-0.3.11.ebuild b/net-im/curphoo/curphoo-0.3.11.ebuild
deleted file mode 100644
index 330be818be31..000000000000
--- a/net-im/curphoo/curphoo-0.3.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/curphoo-0.3.11.ebuild,v 1.7 2004/07/15 00:06:21 agriffis Exp $
-
-DESCRIPTION="Curphoo is a console Yahoo! Chat client written in Python"
-HOMEPAGE="http://savannah.nongnu.org/projects/curphoo/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-IUSE=""
-
-DEPEND="virtual/libc >=dev-lang/python-2.1 >=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/curphoo.sh curphoo.sh.templ
-	sed -e "s#@PHOOPATH@#${P}#" curphoo.sh.templ >curphoo.sh
-}
-
-src_compile() {
-	make || die
-}
-
-src_install () {
-	dodoc BUGS CHANGELOG ChangeLog README TODO floo2phoo
-	dodir /usr/lib/${P}
-	mv curphoo curphoo.py
-	cp *.py *.so ${D}/usr/lib/${P}
-	mv curphoo.sh curphoo
-	dobin curphoo
-	doman ${FILESDIR}/curphoo.1
-}
diff --git a/net-im/curphoo/curphoo-0.3.12.ebuild b/net-im/curphoo/curphoo-0.3.12-r1.ebuild
index c1f6e4ebc98c..03b8684bd3bf 100644
--- a/net-im/curphoo/curphoo-0.3.12.ebuild
+++ b/net-im/curphoo/curphoo-0.3.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/curphoo-0.3.12.ebuild,v 1.5 2004/09/25 20:45:41 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/curphoo-0.3.12-r1.ebuild,v 1.1 2005/08/08 16:13:56 mkennedy Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ DEPEND=">=dev-lang/python-2.1
 src_unpack() {
 	unpack ${A}
 	epatch ${P}-amd64.patch || die
+	epatch ${FILESDIR}/${PV}-session-server-gentoo.patch || die
 	cd ${S}
 	cp ${FILESDIR}/curphoo.sh curphoo.sh.templ
 	sed -e "s#@PHOOPATH@#${P}#" curphoo.sh.templ >curphoo.sh
diff --git a/net-im/curphoo/files/0.3.12-session-server-gentoo.patch b/net-im/curphoo/files/0.3.12-session-server-gentoo.patch
new file mode 100644
index 000000000000..d690ac6d5771
--- /dev/null
+++ b/net-im/curphoo/files/0.3.12-session-server-gentoo.patch
@@ -0,0 +1,12 @@
+diff -u curphoo-0.3.12.orig/driver.py curphoo-0.3.12/driver.py
+--- curphoo-0.3.12.orig/driver.py	2004-04-27 21:38:00.000000000 -0500
++++ curphoo-0.3.12/driver.py	2005-08-08 10:58:05.000000000 -0500
+@@ -46,7 +46,7 @@
+ 	sess.time = time.strftime('%H:%M')
+ 
+ 	y = Yahoo.Client(sess)
+-	sess.server = 'cs1.msg.dcn.yahoo.com'
++	sess.server = 'scs-dcng.msg.yahoo.com'
+ 	y.connect(sess.server)
+ 	y.write_message(type='challenge', user=sess.user)
+ 	#y.write_message(type='login', user=sess.user, cookie=sess.cookie)
diff --git a/net-im/curphoo/files/digest-curphoo-0.3.11 b/net-im/curphoo/files/digest-curphoo-0.3.11
deleted file mode 100644
index e3cf781ab83f..000000000000
--- a/net-im/curphoo/files/digest-curphoo-0.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39c53ad9e5008fe04376e591cfb47a2b curphoo-0.3.11.tar.gz 162371
diff --git a/net-im/curphoo/files/digest-curphoo-0.3.12 b/net-im/curphoo/files/digest-curphoo-0.3.12-r1
index 886552db57fe..886552db57fe 100644
--- a/net-im/curphoo/files/digest-curphoo-0.3.12
+++ b/net-im/curphoo/files/digest-curphoo-0.3.12-r1
diff --git a/net-im/curphoo/files/encodep.py-gentoo.patch b/net-im/curphoo/files/encodep.py-gentoo.patch
deleted file mode 100644
index 7c6b8b73437f..000000000000
--- a/net-im/curphoo/files/encodep.py-gentoo.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- encodep.py~	2002-09-28 21:41:47.000000000 -0500
-+++ encodep.py	2003-09-25 10:03:44.797532368 -0500
-@@ -31,22 +31,22 @@
- 
- # new stuff (ymsg 9 packets)
- def verify_server():
--	return struct.pack("!4slhhll", "YMSG", 0x9000000, 0, 0x4c, 0, 0)
-+	return struct.pack("!4slhhll", "YMSG", 0x000b0000, 0, 0x4c, 0, 0)
- 
- def request_key(user):
- 	data = "1\xC0\x80%s\xC0\x80" % user
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0x57, 0, 0, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0x57, 0, 0, data)
- 
- def m9_login(user, key1, key2):
- 	data = "0\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80" % (user, '6', key1, '96', key2, '2', user, '1', user)
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0x54, 0x5a55aa55, 0, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0x54, 0x5a55aa55, 0, data)
- 
- def m9_ping(user, sessionID):
- 	data = "109\xC0\x80%s\xC0\x80" % user
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0xa1, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0xa1, 0, sessionID, data)
- 
- def m9_comment(user, room, text, sessionID):
- 	data = '1%s%s%s104%s%s%s117%s%s%s124%s%s%s' % (
-@@ -55,7 +55,7 @@
- 			'\xC0\x80', text, '\xC0\x80',
- 			'\xC0\x80', '1', '\xC0\x80')
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0xa8, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0xa8, 0, sessionID, data)
- 
- def m9_emote(user, room, text, sessionID):
- 	data = '1%s%s%s104%s%s%s117%s%s%s124%s%s%s' % (
-@@ -64,7 +64,7 @@
- 			'\xC0\x80', text, '\xC0\x80',
- 			'\xC0\x80', '2', '\xC0\x80')
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0xa8, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0xa8, 0, sessionID, data)
- 
- def m9_thought(user, room, text, sessionID):
- 	data = '1%s%s%s104%s%s%s117%s. o O ( %s )%s124%s%s%s' % (
-@@ -73,7 +73,7 @@
- 			'\xC0\x80', text, '\xC0\x80',
- 			'\xC0\x80', '3', '\xC0\x80')
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0xa8, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0xa8, 0, sessionID, data)
- 
- def m9_addbuddy(user, friend, sessionID):
- 	data = '1%s%s%s7%s%s%s65%s%s%s14%s%s%s' % (
-@@ -91,7 +91,7 @@
- 			'\xC0\x80', room, '\xC0\x80',
- 			'\xC0\x80', "0", '\xC0\x80')
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0x98, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0x98, 0, sessionID, data)
- 
- def m9_online(user,  sessionID):
- 	data = '109%s%s%s1%s%s%s6%s%s%s' % (
-@@ -99,7 +99,7 @@
- 			'\xC0\x80', user, '\xC0\x80',
- 			'\xC0\x80', "abcde", '\xC0\x80')
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0x96, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0x96, 0, sessionID, data)
- 
- def m9_goAway(text, sessionID):
- 	data = '%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s\xC0\x80%s' % ("10", "99", "19", text, "47", "0")
-@@ -119,7 +119,7 @@
- 		'%s%s%s%s' % ("63", DELIM, ";0", DELIM),
- 		'%s%s%s%s' % ("64", DELIM, "0", DELIM)])
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0x06, 0x5a55aa55, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0x06, 0x5a55aa55, sessionID, data)
- 
- def m9_goto(user, otheruser, sessionID):
- 	data = ''.join([
-@@ -127,12 +127,12 @@
- 		'%s%s%s%s' % ("1", DELIM, user, DELIM),
- 		'%s%s%s%s' % ("62", DELIM, "2", DELIM)])
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0x97, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0x97, 0, sessionID, data)
- 
- def m9_logout(user, sessionID):
- 	data = "%s%s%s%s" % ("1", DELIM, user, DELIM)
- 	fmt = "!4slhhll%ss" % len(data)
--	return struct.pack(fmt, "YMSG", 0x9000000, len(data), 0xa0, 0, sessionID, data)
-+	return struct.pack(fmt, "YMSG", 0x000b0000, len(data), 0xa0, 0, sessionID, data)
- 
- # end of new stuff (ymsg 9 packets)
- def do(d):
diff --git a/net-im/curphoo/metadata.xml b/net-im/curphoo/metadata.xml
new file mode 100644
index 000000000000..da3fcfab142f
--- /dev/null
+++ b/net-im/curphoo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>mkennedy@gentoo.org</email>
+</maintainer>
+</pkgmetadata>