Remove old version so that we can package.mask dev-java/jdbc3-postgresql.

Package-Manager: portage-2.1.2.3

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index fb62900d35ecf01594288daae7e2e30bffb54eda..d9a6f49bf5fdf399d4aee96a290b453679e52d05 100644 (file)
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/jxtray
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.22 2007/04/12 22:19:51 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.23 2007/04/12 22:32:24 betelgeuse Exp $
+
+  12 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -jxtray-0.5-r1.ebuild:
+  Remove old version so that we can package.mask dev-java/jdbc3-postgresql.
 
   12 Apr 2007; Christian Faulhammer <opfer@gentoo.org> jxtray-0.5-r2.ebuild:
   stable amd64, bug 160569

diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index c01f9cb5a8c590d23a09e7f8fdf5f1441bce1774..b31b4d3b54bf149b241e143f0174402cbe06c148 100644 (file)
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -10,10 +10,6 @@ MD5 63dce73e99d8ec22a695238f0928b003 files/default.properties 109
 RMD160 3ab7abd2a5102ce2b8cb4fb93c63afeba91c046c files/default.properties 109
 SHA256 bd4f5887a65b1db47d2546b32ada76f9df2311bf5f9e383cacf576c57a88c4fd files/default.properties 109
 DIST jxtray-src-0.5.tgz 2476739 RMD160 f35e7def1558cfcee48bfb42e1706e3ba8866e45 SHA1 3c01c781a8c9670a6e12c1a03bfc809756e2577e SHA256 ddb5d2b2399d1440d84b144fce4ef4f7ff865081745057e101deff3a38f0a849
-EBUILD jxtray-0.5-r1.ebuild 2261 RMD160 6193f630ffd2c9b6e7acb95e3516fb9412f69d56 SHA1 2455662e8bd49810583913207960e89488b04ba7 SHA256 1d91a8bdeb8e20289790b2d4da8efa75b662b64acd5be5ed403673df22a007ec
-MD5 fd4d3d935460362ad77e37304fd7caa3 jxtray-0.5-r1.ebuild 2261
-RMD160 6193f630ffd2c9b6e7acb95e3516fb9412f69d56 jxtray-0.5-r1.ebuild 2261
-SHA256 1d91a8bdeb8e20289790b2d4da8efa75b662b64acd5be5ed403673df22a007ec jxtray-0.5-r1.ebuild 2261
 EBUILD jxtray-0.5-r2.ebuild 1965 RMD160 6ca9bfa59d72cdaa7fd4d778bc157e57c08aeeb3 SHA1 076d95a053c7066e6a87da229ebe6727df6f7233 SHA256 5ff2df9cfaa4c0f4125965da9c2c2494d54ea2b02b73271b611658f9eb1eb097
 MD5 c5982ffd2441f97696f90f25060f889d jxtray-0.5-r2.ebuild 1965
 RMD160 6ca9bfa59d72cdaa7fd4d778bc157e57c08aeeb3 jxtray-0.5-r2.ebuild 1965
@@ -22,17 +18,14 @@ EBUILD jxtray-0.5-r3.ebuild 1949 RMD160 5fe5c9c729603ea71bf66b4daca8bfa1a0decc2e
 MD5 94b6f282f7bc5c56a12e2b828859cc5f jxtray-0.5-r3.ebuild 1949
 RMD160 5fe5c9c729603ea71bf66b4daca8bfa1a0decc2e jxtray-0.5-r3.ebuild 1949
 SHA256 b1b1dc78df448e0f3a4bca97a0b146b1c0884bd6005e3c85a9c7eb8f92a5a1e4 jxtray-0.5-r3.ebuild 1949
-MISC ChangeLog 3371 RMD160 fbc86ce7a3760af32a5e0ed687caa100646c51af SHA1 47f0edbf9da40e3c2814bb11286a1ee7bdb70ab1 SHA256 07d7067b29094824c6117e4866b796caf612bd493f048db810b681be95d96171
-MD5 5d173f09f06afcf780095f7ee4851124 ChangeLog 3371
-RMD160 fbc86ce7a3760af32a5e0ed687caa100646c51af ChangeLog 3371
-SHA256 07d7067b29094824c6117e4866b796caf612bd493f048db810b681be95d96171 ChangeLog 3371
+MISC ChangeLog 3529 RMD160 b87ccd03abe91f9555a3f0d90b4edabcf6cde5b4 SHA1 ef590f671df414a85cae51a156b1733f4ef1b911 SHA256 88939815e15d144f53c5b7bc754257e136fc27e29412a8500ae588ca479c9770
+MD5 c298ed734afd120955b7dd305a069e29 ChangeLog 3529
+RMD160 b87ccd03abe91f9555a3f0d90b4edabcf6cde5b4 ChangeLog 3529
+SHA256 88939815e15d144f53c5b7bc754257e136fc27e29412a8500ae588ca479c9770 ChangeLog 3529
 MISC metadata.xml 586 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 SHA1 d4a26605f4ccfbdc0a582cccec0bf6c7dcc5829d SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf
 MD5 594c956745248197dd33c47c01686464 metadata.xml 586
 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 metadata.xml 586
 SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf metadata.xml 586
-MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r1 238
-RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r1 238
-SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r1 238
 MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r2 238
 RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r2 238
 SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r2 238
@@ -40,9 +33,9 @@ MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r3 238
 RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r3 238
 SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r3 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGHrCONQqtfCuFneMRAkWoAKCP+CbRDdNnIM70C+IBrXewuD3VTQCdET0M
-1z6Pr2+xhL4TgJGqqnOfU3k=
-=75pQ
+iD8DBQFGHrN6cxLzpIGCsLQRAqRsAJ4pgkM5kRNY3sGC92a/t1Ypt9B6lwCdFce/
+Ljjgvn5gn1gLYsiWavumisw=
+=sLUU
 -----END PGP SIGNATURE-----

diff --git a/dev-db/jxtray/files/digest-jxtray-0.5-r1 b/dev-db/jxtray/files/digest-jxtray-0.5-r1
deleted file mode 100644 (file)
index 928e2b1..0000000
--- a/dev-db/jxtray/files/digest-jxtray-0.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d8f90c6c597e2a50b2217c4ec4abb03 jxtray-src-0.5.tgz 2476739
-RMD160 f35e7def1558cfcee48bfb42e1706e3ba8866e45 jxtray-src-0.5.tgz 2476739
-SHA256 ddb5d2b2399d1440d84b144fce4ef4f7ff865081745057e101deff3a38f0a849 jxtray-src-0.5.tgz 2476739

diff --git a/dev-db/jxtray/jxtray-0.5-r1.ebuild b/dev-db/jxtray/jxtray-0.5-r1.ebuild
deleted file mode 100644 (file)
index 6c9be93..0000000
--- a/dev-db/jxtray/jxtray-0.5-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r1.ebuild,v 1.7 2007/02/03 22:30:07 beandog Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java based Database Explorer"
-HOMEPAGE="http://jxtray.sourceforge.net"
-SRC_URI="mirror://sourceforge/jxtray/${PN}-src-${PV}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc firebird mssql mysql postgres"
-
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
-       =dev-java/jdom-1.0_beta9*
-       >=dev-java/kunststoff-2.0.2
-       dev-java/poi
-       dev-java/sax
-       >=dev-java/xerces-2.7
-       dev-java/xml-commons
-       firebird? ( dev-java/jdbc-jaybird )
-       mssql? ( =dev-java/jtds-0.9* )
-       mysql? ( dev-java/jdbc-mysql )
-       postgres? ( dev-java/jdbc3-postgresql )
-       !firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
-       ${RDEPEND}
-       dev-java/ant-core"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-src_unpack() {
-       unpack ${A}
-       cp ${FILESDIR}/build.xml ${FILESDIR}/default.properties ${S}
-       local cp=""
-
-       cd ${S}/lib
-       rm *.jar
-       cp="${cp}:$(java-pkg_getjars jdom-1.0_beta9)"
-       cp="${cp}:$(java-pkg_getjars xerces-2)"
-       cp="${cp}:$(java-pkg_getjars xml-commons)"
-       cp="${cp}:$(java-pkg_getjars sax)"
-       cp="${cp}:$(java-pkg_getjars poi)"
-
-       cd ${S}/lib/lookandfeel
-       rm *.jar
-       cp="${cp}:$(java-pkg_getjars kunststoff-2.0)"
-
-       cd ${S}/lib/drivers
-       rm *.jar
-       use firebird && cp="${cp}:$(java-pkg_getjars jdbc-jaybird)"
-       use mssql && cp="${cp}:$(java-pkg_getjars jtds-0.9)"
-       use mysql && cp="${cp}:$(java-pkg_getjars jdbc-mysql)"
-       use postgres && cp="${cp}:$(java-pkg_getjars jdbc3-postgresql)"
-
-       echo "classpath=${cp}" > ${S}/build.properties
-}
-
-src_compile() {
-       eant jar $(use_doc javadoc)
-}
-
-src_install() {
-       local cp="java-config -p jxtray,jdom-1.0_beta9,xerces-2,xml-commons,sax,poi,kunststoff-2.0"
-
-       use firebird && cp="${cp},jdbc-jaybird"
-       use mssql && cp="${cp},jtds-0.9"
-       use mysql && cp="${cp},jdbc-mysql"
-       use postgres && cp="${cp},jdbc3-postgresql"
-
-       java-pkg_newjar ${S}/dist/${P}.jar ${PN}.jar
-
-       echo "#!/bin/sh" > ${PN}
-       echo "java -cp \$(${cp}) jxtray.Jxtray" >> ${PN}
-       dobin ${PN}
-
-       dodoc CHANGELOG.txt README.txt
-       use doc && java-pkg_dohtml -r ${S}/javadoc/*
-}