stable on amd64, ppc and x86

Package-Manager: portage-2.0.51.22-r1

5 files changed, 9 insertions, 48 deletions

diff --git a/dev-java/jdbc2-stdext/ChangeLog b/dev-java/jdbc2-stdext/ChangeLog
index 36f43b21f8eb..6df9c34fefd6 100644
--- a/dev-java/jdbc2-stdext/ChangeLog
+++ b/dev-java/jdbc2-stdext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdbc2-stdext
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/ChangeLog,v 1.7 2005/01/08 17:48:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/ChangeLog,v 1.8 2005/05/18 19:51:41 luckyduck Exp $
+
+  18 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -jdbc2-stdext-2.0.ebuild, jdbc2-stdext-2.0-r1.ebuild:
+  stable on amd64, ppc and x86
 
   08 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
   jdbc2-stdext-2.0-r1.ebuild:
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
index fe44074e4ed7..f8da67b2fbd6 100644
--- a/dev-java/jdbc2-stdext/Manifest
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -1,6 +1,4 @@
-MD5 46ad82551406a7665f02960b94508274 jdbc2-stdext-2.0-r1.ebuild 1426
-MD5 6fb20d39aa81c3b7a962766036459175 jdbc2-stdext-2.0.ebuild 1010
-MD5 47420c94b57aa41efa41a2f05b743fca ChangeLog 1049
+MD5 f974ebd98aa5ec39e7712f054c15a464 jdbc2-stdext-2.0-r1.ebuild 1423
+MD5 72683359693ae584962ac27db70fe224 ChangeLog 1189
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 1cf846798557bc9abba0fbab0786354d files/digest-jdbc2-stdext-2.0 61
 MD5 73087680fc277d629f6a9acdcf03eda6 files/digest-jdbc2-stdext-2.0-r1 133
diff --git a/dev-java/jdbc2-stdext/files/digest-jdbc2-stdext-2.0 b/dev-java/jdbc2-stdext/files/digest-jdbc2-stdext-2.0
deleted file mode 100644
index a699232ac190..000000000000
--- a/dev-java/jdbc2-stdext/files/digest-jdbc2-stdext-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5b32e6765aa4eaa33a849414820d17f jdbc2_0-stdext.jar 6727
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild
index 1b84dddee68f..bebe5169f2bb 100644
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-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/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild,v 1.3 2005/01/08 17:48:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r1.ebuild,v 1.4 2005/05/18 19:51:41 luckyduck Exp $
 
 inherit java-pkg
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://java.sun.com/products/jdbc"
 SRC_URI="${stdext_bin} doc? ( ${stdext_doc} )"
 LICENSE="sun-csl"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 IUSE="doc"
 RESTRICT="fetch"
 DEPEND="app-arch/unzip"
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild
deleted file mode 100644
index 0c1abd8b5337..000000000000
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-stdext/jdbc2-stdext-2.0.ebuild,v 1.8 2005/01/08 17:48:43 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A standard set of libs for Server-Side JDBC support"
-HOMEPAGE="http://java.sun.com/products/jdbc"
-SRC_URI="jdbc2_0-stdext.jar"
-LICENSE="sun-csl"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND=">=virtual/jdk-1.4"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo
-	einfo " Due to license restrictions, we cannot fetch the"
-	einfo " distributables automagically."
-	einfo " "
-	einfo " 1. Visit http://java.sun.com/products/jdbc/download.html#spec'"
-	einfo " 2. Select 'JDBC(TM) 2.0 Optional Package Binary'"
-	einfo " 3. Download ${SRC_URI}"
-	einfo " 4. Move file to ${DISTDIR}"
-	einfo " 5. Run emerge on this package again to complete"
-	einfo
-}
-
-src_unpack() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar ${DISTDIR}/${A}
-}
-