new protocol

6 files changed, 25 insertions, 77 deletions

diff --git a/net-im/ymessenger/ChangeLog b/net-im/ymessenger/ChangeLog
index 3f4ac5172638..f39ed10f3612 100644
--- a/net-im/ymessenger/ChangeLog
+++ b/net-im/ymessenger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/ymessenger
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ChangeLog,v 1.14 2003/09/20 02:28:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ChangeLog,v 1.15 2003/10/02 00:51:17 seemant Exp $
+
+  01 Oct 2003; Seemant Kulleen <seemant@gentoo.org> metadata.xml,
+  ymessenger-0.99.19.1-r1.ebuild, ymessenger-1.0.4.1.ebuild:
+  bump 1.0.4.1 to stable, since the protocol change causes previous versions to
+  not work. Also, install the gnome and kde shortcuts within the /opt/ymessenger
+  tree. This fixes bug #29722 by Ralph De Witt <ralphdewitt@charter.net> for the
+  latter issue, and bug #29946 by Carl Johnson <carl_ivar@yahoo.com> for the
+  former issue
 
 *ymessenger-1.0.4.1 (19 Sep 2003)
 
diff --git a/net-im/ymessenger/Manifest b/net-im/ymessenger/Manifest
index 254b6ea92e97..1edeae59c5d3 100644
--- a/net-im/ymessenger/Manifest
+++ b/net-im/ymessenger/Manifest
@@ -1,6 +1,5 @@
-MD5 5a2564447714efd64ba4deb0fa35e9fa ymessenger-1.0.4.1.ebuild 1878
-MD5 46149f36d719877135e8815157ad9b7f ymessenger-0.99.19.1-r1.ebuild 1464
-MD5 ac49c494e5068a17adb4775fc95eecdc ChangeLog 2745
+MD5 fd55e3ca785d3162a018442af862be16 ymessenger-1.0.4.1.ebuild 1991
+MD5 59aa791a5684186e73c813744b01661c ChangeLog 3207
+MD5 d3f0295491a6d97cf627c1c3d00bcf95 metadata.xml 242
 MD5 a6d415cd82c43b68426c7f60213e7a24 files/digest-ymessenger-1.0.4.1 140
 MD5 d416ac8894dad827f0118284570e6c8a files/97ymessenger 16
-MD5 327cea07fd850a0ca8b1e310f82108c2 files/digest-ymessenger-0.99.19.1-r1 206
diff --git a/net-im/ymessenger/files/digest-ymessenger-0.99.19.1-r1 b/net-im/ymessenger/files/digest-ymessenger-0.99.19.1-r1
deleted file mode 100644
index e1a3452da133..000000000000
--- a/net-im/ymessenger/files/digest-ymessenger-0.99.19.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d416ac8894dad827f0118284570e6c8a /files/97ymessenger 16
-MD5 50bd4ba99858a25afbb617405a0bf6f1 /ymessenger-0.99.19.1-r1.ebuild 1474
-MD5 d8263b8c5479527cc46b1de99cf4b064 ymessenger_0.99.19-1.tar.gz 592575
diff --git a/net-im/ymessenger/metadata.xml b/net-im/ymessenger/metadata.xml
new file mode 100644
index 000000000000..0143940fe738
--- /dev/null
+++ b/net-im/ymessenger/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>seemant</maintainer>
+<longdescription>Xfree86: famous and free X server.</longdescription>
+</pkgmetadata>
diff --git a/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild b/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
deleted file mode 100644
index f1c7937b9beb..000000000000
--- a/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
-
-inherit kde
-
-IUSE="kde gnome"
-
-MY_P=${PN}_${PV%.*}-${PV#*.*.*.*}
-S=${WORKDIR}/opt/${PN}/bin
-DESCRIPTION="Yahoo's instant messenger client"
-HOMEPAGE="http://messenger.yahoo.com/messenger/download/unix.html"
-SRC_URI="http://download.yahoo.com/dl/unix/linux/debian_sid/${MY_P}.tar.gz"
-
-DEPEND="media-libs/gdk-pixbuf
-	gnome-extra/gtkhtml"
-
-RDEPEND="virtual/x11"
-
-SLOT="0"
-LICENSE="yahoo"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
-
-pkg_setup() {
-	if [ ${ARCH} != "x86" ] ; then
-		einfo "This is an x86 only package, sorry"
-		die "Not supported on your ARCH"
-	fi
-}
-
-src_compile() {
-	cd ${S}
-}
-
-src_install () {
-	cd ${S}
-
-	into /opt/ymessenger
-	newbin ymessenger.bin ymessenger
-
-	insinto /opt/ymessenger/bin
-	doins yahoo_kde.xpm yahoo_gnome.png
-
-	insinto /opt/ymessenger/bin
-	doins ymessenger.desktop
-
-	if use gnome
-	then
-		insinto /usr/share/gnome/apps/Internet
-		doins ymessenger.desktop
-	fi
-
-	if use kde
-	then
-		insinto ${KDEDIR}/share/applnk/Internet
-		doins ymessenger.kdelnk
-	fi
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "If you are upgrading from an older version of ymessenger,"
-	einfo "please unmerge the previous version."
-	einfo "-=AND=-"
-	einfo "mv ~/.ymessenger/preferences ~/.ymessenger/preferences.old"
-	einfo ""
-}
diff --git a/net-im/ymessenger/ymessenger-1.0.4.1.ebuild b/net-im/ymessenger/ymessenger-1.0.4.1.ebuild
index 83b8e7a55bfa..83a21ec308e5 100644
--- a/net-im/ymessenger/ymessenger-1.0.4.1.ebuild
+++ b/net-im/ymessenger/ymessenger-1.0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ymessenger-1.0.4.1.ebuild,v 1.1 2003/09/20 02:28:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ymessenger-1.0.4.1.ebuild,v 1.2 2003/10/02 00:51:17 seemant Exp $
 
 inherit kde rpm
 
@@ -19,7 +19,7 @@ RDEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="yahoo"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
 
 pkg_setup() {
 	if [ ${ARCH} != "x86" ] ; then
@@ -48,12 +48,17 @@ src_install () {
 	then
 		insinto /usr/share/gnome/apps/Internet
 		doins ymessenger.desktop
+		insinto /opt/ymessenger/bin
+		doins ymessenger.desktop
 	fi
 
 	if use kde
 	then
 		insinto ${KDEDIR}/share/applnk/Internet
 		doins ymessenger.kdelnk
+
+		insinto /opt/ymessenger/bin
+		doins ymessenger.kdelnk
 	fi
 
 	into /opt/ymessenger