kde and gnome menus

5 files changed, 75 insertions, 106 deletions

diff --git a/net-im/ymessenger/ChangeLog b/net-im/ymessenger/ChangeLog
index 08e524ab4e5e..e003f847d697 100644
--- a/net-im/ymessenger/ChangeLog
+++ b/net-im/ymessenger/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2003/02/14 15:48:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ChangeLog,v 1.12 2003/03/03 12:39:25 seemant Exp $
+
+*ymessenger-0.99.19.1-r1 (03 Mar 2003)
+
+  03 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  ymessenger-0.99.19.1-r1.ebuild:
+  proper kde and gnome menu entries thanks to: Matthew Humphrey
+  <matth@pobox.com> in bug #16526
 
 *ymessenger-0.99.19.1 (14 Feb 2003)
 
diff --git a/net-im/ymessenger/files/digest-ymessenger-0.99.19 b/net-im/ymessenger/files/digest-ymessenger-0.99.19
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-im/ymessenger/files/digest-ymessenger-0.99.19
+++ /dev/null
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
new file mode 100644
index 000000000000..bed20f687176
--- /dev/null
+++ b/net-im/ymessenger/files/digest-ymessenger-0.99.19.1-r1
@@ -0,0 +1 @@
+MD5 d8263b8c5479527cc46b1de99cf4b064 ymessenger_0.99.19-1.tar.gz 592575
diff --git a/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild b/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
new file mode 100644
index 000000000000..91756f370aaf
--- /dev/null
+++ b/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
@@ -0,0 +1,66 @@
+# 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.1 2003/03/03 12:39:25 seemant 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
+
+	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-0.99.19.ebuild b/net-im/ymessenger/ymessenger-0.99.19.ebuild
deleted file mode 100644
index ca742d86d8ee..000000000000
--- a/net-im/ymessenger/ymessenger-0.99.19.ebuild
+++ /dev/null
@@ -1,105 +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.ebuild,v 1.13 2003/02/13 14:13:29 vapier Exp $
-
-IUSE=""
-
-# If you are looking in here, it is because emerge has instructed you to do
-# so.  Please go to http://messenger.yahoo.com/download/unix.html and scroll
-# all the way to the bottom.  There, please click on the tar.gz file for
-# Debian Sid, and download that file to /usr/portage/distfiles.
-
-MY_P=${PN}_${PV}-1
-S=${WORKDIR}/opt/${PN}
-DESCRIPTION="Yahoo's instant messenger client"
-SRC_URI=""
-HOMEPAGE="http://messenger.yahoo.com/messenger/download/unix.html"
-
-DEPEND="media-libs/gdk-pixbuf
-	gnome-extra/gtkhtml"
-RDEPEND="virtual/x11"
-
-RESTRICT="fetch"
-
-SLOT="0"
-LICENSE="yahoo"
-KEYWORDS="x86 -ppc -sparc "
-
-pkg_setup() {
-	if [ ${ARCH} != "x86" ] ; then
-		einfo "This is an x86 only package, sorry"
-		die "Not supported on your ARCH"
-	fi
-}
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${MY_P}.tar.gz ]
-	then
-		die "Please download ${MY_P} from ${HOMEPAGE}.  Scroll to the bottom to find the tarballs for Non-Root Installs.-- Note that you need the one for Debian Sid -- and place into ${DISTDIR}"
-	fi
-	unpack ${MY_P}.tar.gz || die
-}
-
-src_compile() {
-	cd bin
-	cp yahoo_gnome.png yahoo.png
-	cp yahoo_kde.xpm yahoo.xpm
-
-	#use kde && ( \
-	#	mv ymessenger.kdelnk ymessenger.kdelnk.old
-	#	sed "s:^Ic.*:Icon=${KDEDIR}/share/icons/hicolor/48x48/apps/yahoo.png:" \
-	#		ymessenger.kdelnk.old > ymessenger.kdelnk
-	#)
-	
-	#use gnome && ( \
-	#	mv ymessenger.desktop ymessenger.desktop.old
-	#	sed "s:Icon.*:Icon=/usr/share/pixmaps/yahoo.xpm:" \
-	#		ymessenger.desktop.old > ymessenger.desktop
-	#)
-}
-
-src_install () {
-
-	insinto /opt/ymessenger/bin
-	doins bin/*
-
-	exeinto /opt/ymessenger/bin
-	#doexe bin/ymessenger
-	doexe bin/ymessenger.bin
-	rm ${D}/opt/ymessenger/bin/ymessenger
-	dosym /opt/ymessenger/bin/ymessenger.bin /opt/ymessenger/bin/ymessenger
-
-	#cp -a lib ${D}/opt/${PN}
-	
-	#use gnome && ( \
-	#	insinto /usr/share/gnome/apps/Internet
-	#	doins ymessenger.desktop
-	#
-	#	insinto /usr/share/pixmaps
-	#	doins yahoo.xpm
-	#) || (
-	#	dohtml yahoo.xpm
-	#)
-	
-	#use kde && ( \
-	#	insinto ${KDEDIR}/share/applnk/Applications
-	#	doins ymessenger.kdelnk
-	#
-	#	insinto ${KDEDIR}/share/icons/hicolor/48x48/apps
-	#	doins yahoo.png
-	#) || (
-	#	dohtml yahoo.png
-	#)
-
-	dodir /etc/env.d
-	echo "PATH=/opt/ymessenger/bin" > ${D}/etc/env.d/97ymessenger
-}
-
-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 ""
-}