From 263af2f2911d6f9640d252358e74b6defaa84aee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Thu, 26 Apr 2007 23:06:41 +0000 Subject: [PATCH] inherit java-ant-2 to make JAVA_PKG_STRICT happy and stylistic cleanup. Package-Manager: portage-2.1.2.4 --- dev-db/henplus/ChangeLog | 7 +++++-- dev-db/henplus/Manifest | 26 ++++++++++++++++++-------- dev-db/henplus/henplus-0.9.7.ebuild | 25 ++++++++++--------------- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog index c8a8baab4be8..2c40fdc1ac94 100644 --- a/dev-db/henplus/ChangeLog +++ b/dev-db/henplus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/henplus -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.14 2006/10/17 21:47:39 caster Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.15 2007/04/26 23:06:41 betelgeuse Exp $ + + 26 Apr 2007; Petteri Räty henplus-0.9.7.ebuild: + inherit java-ant-2 to make JAVA_PKG_STRICT happy and stylistic cleanup. *henplus-0.9.7 (17 Oct 2006) diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest index 7b903e87cc87..e3ab2c3a51ac 100644 --- a/dev-db/henplus/Manifest +++ b/dev-db/henplus/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX henplus-0.9.7-build.xml.patch 938 RMD160 168feee3e4fefecf2c26adf0dc292055ba75c8c9 SHA1 a2d799094dfbf289e5cb8720e0e16fd69e050b05 SHA256 88e2d5d25ed206245b6139ce70e5c5dba12f35680c273741563d067aed43809d MD5 7d40c5c66d3afcceaca1d94cac31eaf5 files/henplus-0.9.7-build.xml.patch 938 RMD160 168feee3e4fefecf2c26adf0dc292055ba75c8c9 files/henplus-0.9.7-build.xml.patch 938 @@ -16,14 +19,14 @@ EBUILD henplus-0.9.5-r2.ebuild 1144 RMD160 ef2b869bdd01ae16dfe8ee0c99595793384f9 MD5 47d8e2740a8a01b972f65adc64b50366 henplus-0.9.5-r2.ebuild 1144 RMD160 ef2b869bdd01ae16dfe8ee0c99595793384f912e henplus-0.9.5-r2.ebuild 1144 SHA256 3b951500342568f2ab2b6c7122171d6b0695d2bf4651106cf054f8816c27a792 henplus-0.9.5-r2.ebuild 1144 -EBUILD henplus-0.9.7.ebuild 1214 RMD160 ac8c86d3216ca61ca2cdf5fcc1cd549a0f7f0fe8 SHA1 f74e78814d2a3c46065f887188da2ec7bd39b008 SHA256 7160e0528dac69f184206c25d0fcfd1a5d8b338317a260d2e507a30a5d43b463 -MD5 382a1386ae985bdf6e1114b4df3e3249 henplus-0.9.7.ebuild 1214 -RMD160 ac8c86d3216ca61ca2cdf5fcc1cd549a0f7f0fe8 henplus-0.9.7.ebuild 1214 -SHA256 7160e0528dac69f184206c25d0fcfd1a5d8b338317a260d2e507a30a5d43b463 henplus-0.9.7.ebuild 1214 -MISC ChangeLog 1857 RMD160 43b6436c0b02c8b24d38725992171fba33ae9385 SHA1 512e98ba762a40f6e6a2dbdf760bb52240cc7035 SHA256 d7b4fc1bdf4fec94595cb4e42abf7ebd3319156fb1ea9f928547a12452c6993f -MD5 eb11ba32b7a7b60a4c01a6d61f9058f4 ChangeLog 1857 -RMD160 43b6436c0b02c8b24d38725992171fba33ae9385 ChangeLog 1857 -SHA256 d7b4fc1bdf4fec94595cb4e42abf7ebd3319156fb1ea9f928547a12452c6993f ChangeLog 1857 +EBUILD henplus-0.9.7.ebuild 1184 RMD160 a68bef1c11734b2e0f7f3ffed5937aeffa599b74 SHA1 c378b1fef86cea05db39d5da407bb20d1b97679b SHA256 7ea99982163ef18c214431bba3b1e8f54269760c74267017ddbd835de4bd0c3e +MD5 e564f5dd451b08d5cb8391ee621e2138 henplus-0.9.7.ebuild 1184 +RMD160 a68bef1c11734b2e0f7f3ffed5937aeffa599b74 henplus-0.9.7.ebuild 1184 +SHA256 7ea99982163ef18c214431bba3b1e8f54269760c74267017ddbd835de4bd0c3e henplus-0.9.7.ebuild 1184 +MISC ChangeLog 2011 RMD160 99b47389471c4cd8e0fb76761feb7541c3e1eb8b SHA1 8a79c7fe8bff483919f57b92836cc76c03228d16 SHA256 383005f43f45c8c414bd27f5ccd18fef09641a137a754e159502f1a604b09e72 +MD5 014ece49895dd3fef5339ad28491eab7 ChangeLog 2011 +RMD160 99b47389471c4cd8e0fb76761feb7541c3e1eb8b ChangeLog 2011 +SHA256 383005f43f45c8c414bd27f5ccd18fef09641a137a754e159502f1a604b09e72 ChangeLog 2011 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -34,3 +37,10 @@ SHA256 bf433248b81b58e5458fa50ff21b8b0852f4761172ee549b165cf8e7ae8176aa files/di MD5 3d11478170e77da3c179261d59c8c3be files/digest-henplus-0.9.7 241 RMD160 f2d06b046e1539ea6247ca74ff1b2c8d0b30fcc0 files/digest-henplus-0.9.7 241 SHA256 fc618389ebb9a0d99f8229231da97acae74632958926df2e6e6f5669b29d499c files/digest-henplus-0.9.7 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGMTCBcxLzpIGCsLQRAp36AJ4l+FtKUEhV7gmstl3asaAH868dwwCfWpP7 +utn251dK0ZS7QLoSuXrCBBs= +=tZvO +-----END PGP SIGNATURE----- diff --git a/dev-db/henplus/henplus-0.9.7.ebuild b/dev-db/henplus/henplus-0.9.7.ebuild index 9ba50bd71d57..2bd65b7d2a72 100644 --- a/dev-db/henplus/henplus-0.9.7.ebuild +++ b/dev-db/henplus/henplus-0.9.7.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.7.ebuild,v 1.1 2006/10/17 21:47:39 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.7.ebuild,v 1.2 2007/04/26 23:06:41 betelgeuse Exp $ -inherit java-pkg-2 eutils +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 eutils java-ant-2 DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support." -HOMEPAGE="http://${PN}.sf.net" +HOMEPAGE="http://henplus.sf.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc source" +IUSE="" COMMON_DEPEND="=dev-java/commons-cli-1* dev-java/libreadline-java" RDEPEND=">=virtual/jre-1.3 ${COMMON_DEPEND}" DEPEND=">=virtual/jdk-1.3 - dev-java/ant-core - source? ( app-arch/zip ) ${COMMON_DEPEND}" - src_unpack() { unpack ${A} cd "${S}" @@ -29,23 +28,19 @@ src_unpack() { epatch "${FILESDIR}/${P}-build.xml.patch" cd lib - rm -v *.jar build/*.jar + rm -v *.jar build/*.jar || die java-pkg_jar-from commons-cli-1 commons-cli.jar java-pkg_jar-from libreadline-java libreadline-java.jar } -src_compile() { - eant jar $(use_doc) -} - src_install () { java-pkg_dojar "build/${PN}.jar" java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \ --main henplus.HenPlus - dodoc README - dohtml doc/HenPlus.html + dodoc README || die + dohtml doc/HenPlus.html || die use doc && java-pkg_dojavadoc javadoc/api use source && java-pkg_dosrc "src/${PN}" -- 2.26.2