From b047b61b668ee367d35a08e1e2445da7f48c6cab Mon Sep 17 00:00:00 2001 From: Ivan Baidakou Date: Tue, 22 Jan 2013 22:52:33 +0200 Subject: include resources into jar file Package-Manager: portage-2.1.11.31 Manifest-Sign-Key: 9BF3548C --- dev-java/jgoodies-looks/ChangeLog | 6 +++ dev-java/jgoodies-looks/Manifest | 18 +++---- .../jgoodies-looks/jgoodies-looks-2.5.2-r2.ebuild | 58 ++++++++++++++++++++++ .../jgoodies-looks/jgoodies-looks-2.5.2.ebuild | 54 -------------------- 4 files changed, 73 insertions(+), 63 deletions(-) create mode 100644 dev-java/jgoodies-looks/jgoodies-looks-2.5.2-r2.ebuild delete mode 100644 dev-java/jgoodies-looks/jgoodies-looks-2.5.2.ebuild diff --git a/dev-java/jgoodies-looks/ChangeLog b/dev-java/jgoodies-looks/ChangeLog index dc676d1..bc59c73 100644 --- a/dev-java/jgoodies-looks/ChangeLog +++ b/dev-java/jgoodies-looks/ChangeLog @@ -1,3 +1,9 @@ +*jgoodies-looks-2.5.2-r2 (22 Jan 2013) + + 22 Jan 2013; +jgoodies-looks-2.5.2-r2.ebuild, + -jgoodies-looks-2.5.2.ebuild: + include resources into jar file + 21 Jan 2013; jgoodies-looks-2.5.2.ebuild: update jgoodies-common dependency diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest index 1d7b03e..afbbfb9 100644 --- a/dev-java/jgoodies-looks/Manifest +++ b/dev-java/jgoodies-looks/Manifest @@ -2,17 +2,17 @@ Hash: SHA256 DIST jgoodies-looks-2_5_2.zip 2466231 SHA256 edd0670c972715c0951094bdeac88047c8836097aea1e78c720d2fe78e8dbbbd SHA512 3a8b4be0bce18d0ab17da988f49a69812cba4f0a689f9db86c4ed3b0b713a89f835263f991db2e8840988354f5c62f0acbde5cab7bb58f813ae4cb1f0ea02644 WHIRLPOOL af56868332bf57fedeb45f80af6b67e1c83a03cfbe513e9f84827cf967f07755de1e6032e9b996b8e2c39bfe56458f66c7226af64e600600b9ab0ac9788e0485 -EBUILD jgoodies-looks-2.5.2.ebuild 1197 SHA256 b439ec07aaa39ffb488bbe3bfaba1946776ff0c0fa2a78938190e20768885cf9 SHA512 7095810783ad38de6c7a8a18a528debbac8b0de123696b6d18cd51617c0752690b3f3c89d7123ddec0801d0300348a80cc2507c106792ad46f4c80fe9d9ac644 WHIRLPOOL 452823a50042e22c99a0ab5319c3f221e0beda98b4881de1526e597ad4dee021fcdfea5b045b0a2c707fffb91094a6e5d50fbba43a67a1742709b4f5232b7a6a -MISC ChangeLog 99 SHA256 f162496ef54c53cb2ff95873b31ae9f45efe9197773c9925c1746bd19896b45a SHA512 7a10adafdb7e6402d0c10f12d8b011a0af377ea0f3a0020a0424066865835fa597b00859f35f77fc06dee3d946714c5d9f0f215c03d1c5fed659157264a29e04 WHIRLPOOL 12d7c0df96fcbf82f77f99d40fa4bedffbc5ba31cb2908114a1a747adda34dab4919ca0cd52bf3ba52f5749ec891b573e4d35a24fd59cbbe6f60e9e70fcfe84f +EBUILD jgoodies-looks-2.5.2-r2.ebuild 1332 SHA256 92967f93f8a36165e595b5f197a31e024f784319733725d59c15c2fec12b875c SHA512 0cf757a60244570fa463d54b65080c9891ee91b0f5f90050413b66e691cd25c1c7311bf45f2c32dd4976afed4235efd12a1f1cbd28e3228af767f6cbb38b8e9f WHIRLPOOL de1a2507d963bc994afe3b51e4881c1a154f5115799140a15ff1cec459438e29989881514f5e000ff61e67a9141df959518df3b6b65c6118440f68e3e6bd24b6 +MISC ChangeLog 199 SHA256 ddb35d08886eb5c6c71f361841027c0be3c1c11296cb75f5454cac2e08e60b64 SHA512 2d7146ced1304d94708c939d6226d5e7db9c99a1cc15f57d11928b24e30a606b6ae2a1aee8a8d19a50f562354f4faee2a62d7d104be827a069a41aaa3c2ddb55 WHIRLPOOL d413dc89829318aaba403abb38febce975b0d025c6ef210f292892621a4582d1127218d21b82e2033f4fcf8cdecafa80ed23df80b05994783cef150ae616f1a3 MISC metadata.xml 205 SHA256 2ff0740a5424b0e10c7888541a248d1bd363a60911b0921b4cfe5c36590498ce SHA512 e7c77c724739d0af43cc338ded09dcbeee2a710eb0e49f1e656dc4c891bee85bfd6935bf70a191a1c5823f473643e676d64970416e5f1820ea466681016757c5 WHIRLPOOL 5b7f0c2a5243244fa06b072c8f0d9f53e7b6f45c7e1b74a0d945bdcc28b7137fddfd58e85b0d3e721e80963916ceae0d4cca59f48114ba26c47b24a91d6abb27 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQ/bf1AAoJEMw3yeub81SM08QIALN1A15Um0lFDraR2g3lLchD -rEJQI/4x72yPa6tROMF3tBx7hro3430moLYoZCkYV+4GPX4PapeaOjlaTfuPVCUN -hBWKRECWAUUyODpbT0ksCraQzKWESKvjqzEvYT4Oigbc2P10haAYToKmODyo4TBH -wqx7qOvcEZrA0SBw7PIKWBg9GEiAcGyCC9rm9QEKvXmSfUmIdQWiKupqOX2pMyL/ -+kIyrM1Ym+CdzQK5HbBl24IU2XlzK/lWAXld7TGvy8+Jk47vXB+KBoEnT8iPb9R0 -Os1tG6V+q1sJNBUVhsfpM3hgoM4WX2B3wNuBQv1/cerXf5++3sOtsVKD45fgQgM= -=ggeo +iQEcBAEBCAAGBQJQ/vwRAAoJEMw3yeub81SM9h0H+wVVeK8RDCWyFSgjn94kI/qE +F7Hfs2PXZ9hPZG7FQvg8t7BgAfb/+/2Z5OAR+K9cqSg7l1qXF5WZrPZYOe73qxfZ ++vrXbiNlbBHoxtNcJbo5WoYb+xvlrfRNKJD++7YXkVILNmkaAid6YhAdwcAi6EbO +ptGMAv5dJV6ZloaFlUEYEfkyzpp9y67C13jwPD37vhAzVyewzo7uaVQhMevKoxmc +taqPtOgT939fYdWzB1MMt4+I4YP4Xavhbt1zYXFW8NQMYPxnPjWKK+au/W/O3Wbv +3X+OzecaPQ1GqYWvLmz12/U3T4GQwwTE5GGGYOEgsX9AmpHf3caWRbp5kumfrzA= +=+1rC -----END PGP SIGNATURE----- diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.5.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.5.2-r2.ebuild new file mode 100644 index 0000000..216a782 --- /dev/null +++ b/dev-java/jgoodies-looks/jgoodies-looks-2.5.2-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 eutils + +MY_PN="looks" +MY_PV=${PV//./_} +MY_P="${PN}-${MY_PV}" +DESCRIPTION="JGoodies Looks Library" +HOMEPAGE="http://www.jgoodies.com/" +SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip" + +LICENSE="BSD" +SLOT="2.5" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND=">=dev-java/jgoodies-common-1.4.0:0" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + app-arch/zip + ${COMMON_DEPEND}" +RDEPEND=">=virtual/jre-1.6 + ${COMMON_DEPEND}" + +src_unpack() { + default + cd "${S}" + mkdir src && cd src && unzip -qq ../${P}-sources.jar || die + find "${S}" -name '*.jar' -exec rm -v {} + +} + +src_compile() { + mkdir "${S}/classes" + + find src -name "*.java" > "${T}/src.list" + ejavac -encoding ISO-8859-1 -classpath "$(java-pkg_getjars jgoodies-common)" \ + -d "${S}/classes" "@${T}/src.list" + + cd "${S}/classes" + jar -cf "${S}/${PN}.jar" * || die "failed to create jar" + find "{S}/src" -name "*.java" -delete + cd "${S}/src" + zip -r "${S}/${PN}.jar" .|| die "can't update jar with resources" +} + +src_install() { + java-pkg_dojar ${PN}.jar + + dodoc RELEASE-NOTES.txt README.html || die + + use doc && java-pkg_dohtml -r docs/* + use source && java-pkg_dosrc src/com +} diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.5.2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.5.2.ebuild deleted file mode 100644 index 8154f4b..0000000 --- a/dev-java/jgoodies-looks/jgoodies-looks-2.5.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 eutils - -MY_PN="looks" -MY_PV=${PV//./_} -MY_P="${PN}-${MY_PV}" -DESCRIPTION="JGoodies Looks Library" -HOMEPAGE="http://www.jgoodies.com/" -SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip" - -LICENSE="BSD" -SLOT="2.5" -KEYWORDS="~amd64" -IUSE="" - -COMMON_DEPEND=">=dev-java/jgoodies-common-1.4.0:0" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${COMMON_DEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${COMMON_DEPEND}" - -src_unpack() { - default - cd "${S}" - mkdir src && cd src && unzip -qq ../${P}-sources.jar || die - find "${S}" -name '*.jar' -exec rm -v {} + -} - -src_compile() { - mkdir "${S}/classes" - - find src -name "*.java" > "${T}/src.list" - ejavac -encoding ISO-8859-1 -classpath "$(java-pkg_getjars jgoodies-common)" \ - -d "${S}/classes" "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar ${PN}.jar - - dodoc RELEASE-NOTES.txt README.html || die - - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc src/com -} -- cgit v1.2.3-65-gdbad