Migrated to EAPI-1 and restricted to dev-java/poi:0 because of slotting dev-java/poi-3.2

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 29 insertions, 24 deletions

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index 632dab6883b8..a7c1ab5aece9 100644
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2007/08/20 16:22:12 caster Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.32 2008/10/22 11:51:43 fordfrog Exp $
+
+  22 Oct 2008; Miroslav Šulc <fordfrog@gentoo.org> jxtray-0.5-r4.ebuild:
+  Migrated to EAPI-1 and restricted to dev-java/poi:0 because of slotting
+  dev-java/poi-3.2
 
   20 Aug 2007; Vlastimil Babka <caster@gentoo.org> jxtray-0.5-r4.ebuild:
   Remove bad -r from dojavadoc call, reported by opfer in bug #189277.
diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index 05441250990f..5f59643b497b 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -1,6 +1,6 @@
 AUX build.xml 1599 RMD160 b63f18fc103695edb7e97a6065121cfa106ea9e2 SHA1 91d54eda8eca0064bbf62da066a65c61449af087 SHA256 4a134433577e5bca6f66851878f2359b01e5d0692d34143b4834d9cec09730cc
 AUX default.properties 109 RMD160 3ab7abd2a5102ce2b8cb4fb93c63afeba91c046c SHA1 085bd37cacdb2f5548a281963e3d2d7ff9721bab SHA256 bd4f5887a65b1db47d2546b32ada76f9df2311bf5f9e383cacf576c57a88c4fd
 DIST jxtray-src-0.5.tgz 2476739 RMD160 f35e7def1558cfcee48bfb42e1706e3ba8866e45 SHA1 3c01c781a8c9670a6e12c1a03bfc809756e2577e SHA256 ddb5d2b2399d1440d84b144fce4ef4f7ff865081745057e101deff3a38f0a849
-EBUILD jxtray-0.5-r4.ebuild 1939 RMD160 6a41edf4f446343704f72eb5f9a956e0b86e8f9b SHA1 f669be30434d3c9f11898956a428e219a15db767 SHA256 fa4e10cc3ea66debf45d4b78aceb71f0752b098bf363d1af8367bd0bfead1778
-MISC ChangeLog 4510 RMD160 97e7f807cb8efbe56e8024eec0dd17849674fe7d SHA1 da4f76395d60397bdbb85ce86f70931ca75aa442 SHA256 01ae6a2f8c42585eccb017f850b0a8a1333191140d674352e01220a452d937ba
+EBUILD jxtray-0.5-r4.ebuild 1982 RMD160 bf2ce019dbc7a2c8113916f179b0f525a848176d SHA1 3d6acc9aaf81cb9ce2b4b36b1eb8e2a6e507abee SHA256 249a27b712cf28fd8cb7d057442aaeab9dfa3ce6f7e8d5edd13233298c300704
+MISC ChangeLog 4680 RMD160 5a762f8fa96bb014a8349f9c33ebdca4ff9e7435 SHA1 2a2902cb1676935f666f7945b20a2468f6d84f09 SHA256 316f5f1545c9aa7fec3aa3ae2cab32424da8e677dd01f25164027f35042e20e1
 MISC metadata.xml 586 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 SHA1 d4a26605f4ccfbdc0a582cccec0bf6c7dcc5829d SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf
diff --git a/dev-db/jxtray/jxtray-0.5-r4.ebuild b/dev-db/jxtray/jxtray-0.5-r4.ebuild
index d0533c2cdf40..f1944943dee6 100644
--- a/dev-db/jxtray/jxtray-0.5-r4.ebuild
+++ b/dev-db/jxtray/jxtray-0.5-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r4.ebuild,v 1.7 2007/08/20 16:22:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r4.ebuild,v 1.8 2008/10/22 11:51:43 fordfrog Exp $
 
+EAPI="1"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java based Database Explorer"
@@ -13,17 +14,17 @@ KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="doc firebird mssql mysql postgres"
 
 COMMON_DEP="
-	>=dev-java/jdom-1.0
-	>=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-1.2 )
-	mysql? ( dev-java/jdbc-mysql )
-	postgres? ( dev-java/jdbc-postgresql )
-	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
+	>=dev-java/jdom-1.0:1.0
+	>=dev-java/kunststoff-2.0.2:2.0
+	dev-java/poi:0
+	dev-java/sax:0
+	>=dev-java/xerces-2.7:2
+	dev-java/xml-commons:0
+	firebird? ( dev-java/jdbc-jaybird:0 )
+	mssql? ( >=dev-java/jtds-1.2:1.2 )
+	mysql? ( dev-java/jdbc-mysql:0 )
+	postgres? ( dev-java/jdbc-postgresql:0 )
+	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql:0 ) ) )"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
@@ -33,10 +34,10 @@ S="${WORKDIR}/${PN}-src-${PV}"
 
 src_unpack() {
 	unpack ${A}
-	cp ${FILESDIR}/build.xml ${FILESDIR}/default.properties ${S}
+	cp "${FILESDIR}"/build.xml "${FILESDIR}"/default.properties "${S}"
 	local cp=""
 
-	cd ${S}/lib
+	cd "${S}"/lib
 	rm *.jar
 	cp="${cp}:$(java-pkg_getjars jdom-1.0)"
 	cp="${cp}:$(java-pkg_getjars xerces-2)"
@@ -44,18 +45,18 @@ src_unpack() {
 	cp="${cp}:$(java-pkg_getjars sax)"
 	cp="${cp}:$(java-pkg_getjars poi)"
 
-	cd ${S}/lib/lookandfeel
+	cd "${S}"/lib/lookandfeel
 	rm *.jar
 	cp="${cp}:$(java-pkg_getjars kunststoff-2.0)"
 
-	cd ${S}/lib/drivers
+	cd "${S}"/lib/drivers
 	rm *.jar
 	use firebird && cp="${cp}:$(java-pkg_getjars jdbc-jaybird)"
 	use mssql && cp="${cp}:$(java-pkg_getjars jtds-1.2)"
 	use mysql && cp="${cp}:$(java-pkg_getjars jdbc-mysql)"
 	use postgres && cp="${cp}:$(java-pkg_getjars jdbc-postgresql)"
 
-	echo "classpath=${cp}" > ${S}/build.properties
+	echo "classpath=${cp}" > "${S}"/build.properties
 }
 
 src_compile() {
@@ -63,10 +64,10 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_newjar ${S}/dist/${P}.jar ${PN}.jar
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
 
 	java-pkg_dolauncher jxtray --main jxtray.Jxtray
 
 	dodoc CHANGELOG.txt README.txt
-	use doc && java-pkg_dojavadoc ${S}/javadoc
+	use doc && java-pkg_dojavadoc javadoc
 }