cleaner

Package-Manager: portage-2.0.51.22-r1

4 files changed, 7 insertions, 104 deletions

diff --git a/dev-java/jmf-bin/Manifest b/dev-java/jmf-bin/Manifest
index 66da4c801a5f..63f31512499c 100644
--- a/dev-java/jmf-bin/Manifest
+++ b/dev-java/jmf-bin/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 20b560eac327c4e7113ea9b17d041aab jmf-bin-2.1.1e-r1.ebuild 1293
 MD5 e53a759e9f86f713ff7bb8c3b321fdee ChangeLog 1410
-MD5 ac10f570840222bc9e1815908fe02b4a files/digest-jmf-bin-2.1.1e 68
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 ac93b98c6a37bc7d9cf98e4ba8c154d1 files/jmfinit 801
 MD5 ac10f570840222bc9e1815908fe02b4a files/digest-jmf-bin-2.1.1e-r1 68
 MD5 323c4e791ffe63129f18b06f6f14876b files/jmfcustomizer 819
-MD5 ac93b98c6a37bc7d9cf98e4ba8c154d1 files/jmfinit 801
-MD5 dd61ae1de6ff6e0c1aae7d75ef4ecc67 files/jmfregistry 813
 MD5 2592b60b76309bed70aeed7df1214107 files/jmstudio 804
-MD5 01b0b951999bca31d37e3aec1c873226 jmf-bin-2.1.1e-r1.ebuild 1816
-MD5 8ca771cf4de715e0e5be33231b5bad5f jmf-bin-2.1.1e.ebuild 1813
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0AL4I1lqEGTUzyQRAnPdAKCVMCiKu8NxEAe/ddIhS1h/o4FB4gCfd8U8
-E8ExfqAkRBe6inl5BKbLdkY=
-=+/+q
------END PGP SIGNATURE-----
+MD5 dd61ae1de6ff6e0c1aae7d75ef4ecc67 files/jmfregistry 813
diff --git a/dev-java/jmf-bin/files/digest-jmf-bin-2.1.1e b/dev-java/jmf-bin/files/digest-jmf-bin-2.1.1e
deleted file mode 100644
index 2a230e8d3ed8..000000000000
--- a/dev-java/jmf-bin/files/digest-jmf-bin-2.1.1e
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dafc2469b22d18420ada45972a88ec0 jmf-2_1_1e-alljava.zip 1959196
diff --git a/dev-java/jmf-bin/jmf-bin-2.1.1e-r1.ebuild b/dev-java/jmf-bin/jmf-bin-2.1.1e-r1.ebuild
index a4f95da83417..0f6032aabdec 100644
--- a/dev-java/jmf-bin/jmf-bin-2.1.1e-r1.ebuild
+++ b/dev-java/jmf-bin/jmf-bin-2.1.1e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmf-bin/jmf-bin-2.1.1e-r1.ebuild,v 1.2 2005/07/09 17:01:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmf-bin/jmf-bin-2.1.1e-r1.ebuild,v 1.3 2005/07/16 09:00:46 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ IUSE=""
 LICENSE="sun-bcla-jmf"
 SLOT="0"
 DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
 RESTRICT="fetch"
 
 pkg_nofetch() {
@@ -30,26 +30,7 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	if [ ! -f "${DISTDIR}/${At}" ] ; then
-		echo  " "
-		echo  "!!! Missing ${DISTDIR}/${At}"
-		echo  " "
-		einfo
-		einfo " Due to license restrictions, we cannot fetch the"
-		einfo " distributables automagically."
-		einfo
-		einfo " 1. Visit ${HOMEPAGE} and select 'Cross Platform Java'"
-		einfo " 2. Download ${At}"
-		einfo " 3. Move file to ${DISTDIR}"
-		einfo " 4. Run emerge on this package again to complete"
-		einfo
-		die "User must manually download distfile"
-	fi
-	unzip -qq ${DISTDIR}/${At}
-}
-
-src_compile() {
-	einfo " This is a binary-only ebuild."
+	unzip -qq ${DISTDIR}/${At} || die
 }
 
 src_install() {
diff --git a/dev-java/jmf-bin/jmf-bin-2.1.1e.ebuild b/dev-java/jmf-bin/jmf-bin-2.1.1e.ebuild
deleted file mode 100644
index 2a6e150189b8..000000000000
--- a/dev-java/jmf-bin/jmf-bin-2.1.1e.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmf-bin/jmf-bin-2.1.1e.ebuild,v 1.2 2005/07/09 17:01:19 swegener Exp $
-
-inherit java-pkg
-
-At="${PN/-bin}-2_1_1e-alljava.zip"
-S=${WORKDIR}/JMF-2.1.1e
-DESCRIPTION="The Java Media Framework API (JMF) enables audio, video and other time-based media to be added to Java applications and applets."
-SRC_URI="${At}"
-HOMEPAGE="http://java.sun.com/products/java-media/jmf/"
-KEYWORDS="x86 sparc amd64 ~ppc"
-IUSE=""
-LICENSE="sun-bcla-jmf"
-SLOT="0"
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.4"
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo
-	einfo " Due to license restrictions, we cannot fetch the"
-	einfo " distributables automagically."
-	einfo
-	einfo " 1. Visit ${HOMEPAGE} and select 'Cross Platform Java'"
-	einfo " 2. Download ${At}"
-	einfo " 3. Move file to ${DISTDIR}"
-	einfo " 4. Run emerge on this package again to complete"
-	einfo
-}
-
-src_unpack() {
-	if [ ! -f "${DISTDIR}/${At}" ] ; then
-		echo  " "
-		echo  "!!! Missing ${DISTDIR}/${At}"
-		echo  " "
-		einfo
-		einfo " Due to license restrictions, we cannot fetch the"
-		einfo " distributables automagically."
-		einfo
-		einfo " 1. Visit ${HOMEPAGE} and select 'Cross Platform Java'"
-		einfo " 2. Download ${At}"
-		einfo " 3. Move file to ${DISTDIR}"
-		einfo " 4. Run emerge on this package again to complete"
-		einfo
-		die "User must manually download distfile"
-	fi
-	unzip -qq ${DISTDIR}/${At}
-}
-
-src_compile() {
-	einfo " This is a binary-only ebuild."
-}
-
-src_install() {
-	dobin \
-		${FILESDIR}/jmfcustomizer \
-		${FILESDIR}/jmfinit \
-		${FILESDIR}/jmfregistry \
-		${FILESDIR}/jmstudio
-	dohtml ${S}/doc/*.html
-	java-pkg_dojar ${S}/lib/*.jar
-	insinto /usr/share/${PN/-bin}/lib
-	doins lib/jmf.properties
-}