moving connectorj into jdbc-mysql as they are the same package

6 files changed, 2 insertions, 91 deletions

diff --git a/dev-java/connectorj/ChangeLog b/dev-java/connectorj/ChangeLog
deleted file mode 100644
index a627ca34d5be..000000000000
--- a/dev-java/connectorj/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-# ChangeLog for dev-java/connectorj
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/connectorj/ChangeLog,v 1.12 2005/04/22 08:23:31 blubb Exp $
-
-  22 Apr 2005; Simon Stelling <blubb@gentoo.org> connectorj-3.0.16.ebuild:
-  stable on amd64
-
-  06 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> connectorj-3.0.16.ebuild:
-  Stable for x86.
-  connectorj-3.0.15.ebuild:
-  Wipe out older version.
-
-*connectorj-3.0.16 (13 Dec 2004)
-
-  13 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> connectorj-3.0.16.ebuild:
-  Version bump. Use ${PV} in SRC_URI to avoid hard-wiring version info into
-  the ebuild.
-  connectorj-3.0.14.ebuild:
-  Removed older ebuild.
-
-  22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> connectorj-3.0.14.ebuild,
-  connectorj-3.0.15.ebuild:
-  Keywords ~amd64.
-
-  22 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> connectorj-3.0.15.ebuild:
-  Stable for x86.
-
-  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Gentoo Technologies, Inc. -> Gentoo Foundation
-
-*connectorj-3.0.15 (19 Sep 2004)
-
-  19 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> connectorj-3.0.15.ebuild:
-  Version bump. Production level package name was changed upstream to
-  "mysql-connector-java-${PV}-ga", updated ebuild to reflect this.
-
-  24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> connectorj-3.0.14.ebuild:
-  Marking x86
-
-  03 Aug 2004; David Holm <dholm@gentoo.org> connectorj-3.0.14.ebuild:
-  Added to ~ppc.
-
-*connectorj-3.0.14 (30 Jul 2004)
-
-  30 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> connectorj-3.0.14.ebuild:
-  Initial import. Ebuild submitted by myself.
diff --git a/dev-java/connectorj/Manifest b/dev-java/connectorj/Manifest
deleted file mode 100644
index c5392d9f87a7..000000000000
--- a/dev-java/connectorj/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d7e1ccf21226cf529238007285a89423 ChangeLog 1625
-MD5 1b6bdd5a250f5e56605ff2da6d5618d4 connectorj-3.0.16.ebuild 865
-MD5 ca65727ae27910b7c0adc7dc970c5ce7 metadata.xml 254
-MD5 702d2b80aba3c4eb8db59e08716c954a files/digest-connectorj-3.0.16 83
diff --git a/dev-java/connectorj/connectorj-3.0.16.ebuild b/dev-java/connectorj/connectorj-3.0.16.ebuild
deleted file mode 100644
index 4a5fc85367ed..000000000000
--- a/dev-java/connectorj/connectorj-3.0.16.ebuild
+++ /dev/null
@@ -1,30 +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/connectorj/connectorj-3.0.16.ebuild,v 1.4 2005/04/22 08:23:31 blubb Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Connector/J: A MySQL JDBC connector"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/j/3.0.html"
-SRC_URI="http://mysql.mirrors.key2network.com/Downloads/Connector-J/mysql-connector-java-${PV}-ga.tar.gz"
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="x86 ~ppc amd64"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.5"
-RDEPEND=">=virtual/jre-1.3"
-
-S=${WORKDIR}/mysql-connector-java-${PV}-ga
-
-src_compile() {
-	ant || die "Failed to compile"
-}
-
-src_install() {
-	java-pkg_dojar mysql-connector-java-${PV}-ga-bin.jar
-
-	dodoc COPYING CHANGES README
-	use doc && cp docs/connector-j-en.pdf ${D}/usr/share/doc/${PF}/
-}
diff --git a/dev-java/connectorj/files/digest-connectorj-3.0.16 b/dev-java/connectorj/files/digest-connectorj-3.0.16
deleted file mode 100644
index c4bfe4d6c0f4..000000000000
--- a/dev-java/connectorj/files/digest-connectorj-3.0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b76101f74f1812013a695d156c71333 mysql-connector-java-3.0.16-ga.tar.gz 1087566
diff --git a/dev-java/connectorj/metadata.xml b/dev-java/connectorj/metadata.xml
deleted file mode 100644
index eaa2dbb54c34..000000000000
--- a/dev-java/connectorj/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-MySQL Connector/J is the official JDBC driver for MySQL. 
-</longdescription>
-</pkgmetadata>
diff --git a/profiles/updates/3Q-2005 b/profiles/updates/3Q-2005
index 28625b231457..b1dcb6779f9f 100644
--- a/profiles/updates/3Q-2005
+++ b/profiles/updates/3Q-2005
@@ -32,3 +32,5 @@ move app-arch/kdar app-backup/kdar
 move x11-misc/yawmppp x11-plugins/yawmppp
 move net-irc/irssi-cvs net-irc/irssi-svn
 move x11-misc/msetimon sci-astronomy/msetimon
+move dev-java/connectorj dev-java/jdbc-mysql
+slotmove =dev-java/jdbc-mysql-3.0.16 3 0