deleting older versions and adding -r1 that has better deps

(Portage version: 2.0.51.19)

6 files changed, 24 insertions, 85 deletions

diff --git a/net-im/mercury-bin/ChangeLog b/net-im/mercury-bin/ChangeLog
index 3c521ad56492..dc04f0212f62 100644
--- a/net-im/mercury-bin/ChangeLog
+++ b/net-im/mercury-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/mercury-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/ChangeLog,v 1.2 2005/03/01 01:16:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/ChangeLog,v 1.3 2005/03/08 22:23:36 humpback Exp $
+
+  08 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/mercury.sh:
+  Axxo made a very nice job at traking down the deps. This is "almost" ready for
+  unmasking.
 
 *mercury-bin-1709_beta7 (01 Mar 2005)
 
diff --git a/net-im/mercury-bin/files/digest-mercury-bin-1708 b/net-im/mercury-bin/files/digest-mercury-bin-1708
deleted file mode 100644
index 059489d6af0f..000000000000
--- a/net-im/mercury-bin/files/digest-mercury-bin-1708
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bb37858bfccba3cfdfbf9d772a6cb6f 1708_ManualUpdate.zip 4484490
diff --git a/net-im/mercury-bin/files/digest-mercury-bin-1709_beta7 b/net-im/mercury-bin/files/digest-mercury-bin-1709_beta7-r1
index a80ce3d89f83..a80ce3d89f83 100644
--- a/net-im/mercury-bin/files/digest-mercury-bin-1709_beta7
+++ b/net-im/mercury-bin/files/digest-mercury-bin-1709_beta7-r1
diff --git a/net-im/mercury-bin/files/mercury.sh b/net-im/mercury-bin/files/mercury.sh
index 5c9961787a00..645b2ced5d73 100644
--- a/net-im/mercury-bin/files/mercury.sh
+++ b/net-im/mercury-bin/files/mercury.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 MERCURY_INSTALL_PATH="/opt/mercury-bin"
-JDICTRAY_INSTALL_PATH="/opt/jdictrayapi/lib/"
 cd ${MERCURY_INSTALL_PATH}
-java -Djava.library.path=${JDICTRAY_INSTALL_PATH} -classpath $(java-config -p jdom-1.0_beta6,jdictrayapi,jmf-bin,mercury-bin) com.dMSN.Main
+java -Djava.library.path=$(java-config -i jdictrayapi) -classpath $(java-config -p jdom-1.0_beta6,jdictrayapi,jmf-bin,mercury-bin,xpp3,jgoodies-looks-1.3) com.dMSN.Main
diff --git a/net-im/mercury-bin/mercury-bin-1708.ebuild b/net-im/mercury-bin/mercury-bin-1708.ebuild
deleted file mode 100644
index 35b63cb61758..000000000000
--- a/net-im/mercury-bin/mercury-bin-1708.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/mercury-bin-1708.ebuild,v 1.1 2005/02/04 18:27:21 humpback Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="MSN and Jabber client in Java"
-
-HOMEPAGE="http://www.mercury.to/"
-
-SRC_URI="http://www.mercury.to/releases/${PV}_ManualUpdate.zip"
-
-LICENSE="mercury"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-DEPEND="app-arch/unzip
-		>=virtual/jdk-1.4"
-
-RDEPEND=">=virtual/jre-1.4
-		dev-java/jmf-bin
-		dev-java/jdictrayapi
-		=dev-java/jdom-1.0_beta6"
-
-IUSE=""
-
-src_unpack() {
-	mkdir ${P}
-	cd ${S}
-	unpack ${A}
-	#Clean the dllStuff.jar from things we dont need
-	cd lib
-	mkdir dllStuff
-	cd dllStuff
-	unzip ../dllStuff.jar
-	rm -rf ../dllStuff.jar org/jdesktop x10gimli/platform
-	cd ${S}
-	rm lib/XML.jar
-}
-
-src_install() {
-
-	#rebuild the dllStuff.jar
-	cd ${S}/lib/dllStuff
-	jar cvf ../dllStuff.jar *
-	cd ${S}
-	rm -rf lib/dllStuff
-
-	#Start installing stuff
-	insinto /opt/${PN}/resources
-	doins -r resources/*
-	java-pkg_dojar lib/*
-
-	insinto /opt/${PN}/
-	exeinto /opt/${PN}/
-	doins  ${FILESDIR}/icon32.gif
-	newexe ${FILESDIR}/mercury.sh mercury
-
-	make_desktop_entry mercury "Mercury MSN client" /opt/${PN}/icon32.gif
-	dodir /opt/bin
-	dosym /opt/${PN}/mercury /opt/bin/mercury
-}
diff --git a/net-im/mercury-bin/mercury-bin-1709_beta7.ebuild b/net-im/mercury-bin/mercury-bin-1709_beta7-r1.ebuild
index 52dfe95bc06a..cb2baddafa06 100644
--- a/net-im/mercury-bin/mercury-bin-1709_beta7.ebuild
+++ b/net-im/mercury-bin/mercury-bin-1709_beta7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/mercury-bin-1709_beta7.ebuild,v 1.1 2005/03/01 01:16:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/mercury-bin-1709_beta7-r1.ebuild,v 1.1 2005/03/08 22:23:36 humpback Exp $
 
 inherit eutils java-pkg
 
@@ -10,39 +10,41 @@ DESCRIPTION="MSN and Jabber client in Java"
 HOMEPAGE="http://www.mercury.to/"
 ##Mercury.to dos not provided http or ftp links so i did a mirror
 SRC_URI="http://www.gentoo-pt.org/~humpback/${MY_PV}.zip"
-
 LICENSE="mercury"
-
 SLOT="0"
-
 KEYWORDS="~x86"
-
 DEPEND="app-arch/unzip
 		>=virtual/jdk-1.4"
 
 RDEPEND=">=virtual/jre-1.4
+		=dev-java/jgoodies-looks-1.3*
 		dev-java/jmf-bin
 		dev-java/jdictrayapi
-		=dev-java/jdom-1.0_beta6"
-
+		dev-java/xpp3
+		=dev-java/jdom-1.0_beta6*"
 IUSE=""
 
+S=${WORKDIR}
 src_unpack() {
-	mkdir ${P}
-	cd ${S}
 	unpack ${A}
+	cd ${S}
+	rm -f *.dll *.so
+
 	#Clean the dllStuff.jar from things we dont need
 	cd lib
 	mkdir dllStuff
 	cd dllStuff
 	unzip ../dllStuff.jar
 	rm -rf ../dllStuff.jar org/jdesktop x10gimli/platform
+
 	cd ${S}
-	rm lib/XML.jar
+	rm lib/XML.jar # jdom
+	rm lib/looks-*.jar #jgoodies-looks
+	rm lib/JFlash.jar # seems to be trial from http://www.javaapis.com/jflashplayer/ which says its windows only
+	rm lib/xmlpull.jar # xpp3
 }
 
 src_install() {
-
 	#rebuild the dllStuff.jar
 	cd ${S}/lib/dllStuff
 	jar cvf ../dllStuff.jar *
@@ -54,12 +56,11 @@ src_install() {
 	doins -r resources/*
 	java-pkg_dojar lib/*
 
-	insinto /opt/${PN}/
-	exeinto /opt/${PN}/
-	doins  ${FILESDIR}/icon32.gif
+	insinto /usr/share/pixmaps
+	newins  ${FILESDIR}/icon32.gif mercury.gif
+
+	exeinto /opt/bin
 	newexe ${FILESDIR}/mercury.sh mercury
 
-	make_desktop_entry mercury "Mercury MSN client" /opt/${PN}/icon32.gif
-	dodir /opt/bin
-	dosym /opt/${PN}/mercury /opt/bin/mercury
+	make_desktop_entry mercury "Mercury MSN client" /usr/share/pixmaps/mercury.gif
 }