commit: b00a9dd1ab773a84974003000cf6e81eab82e014 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Mar 14 18:25:22 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Mar 15 12:46:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00a9dd1
dev-java/asm: EAPI 7 (Slots 3+4) Bug: https://bugs.gentoo.org/776253 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/19932/commits/870c5ba597760a5013e46367baf9914afc982f49 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/asm/Manifest | 3 ++ dev-java/asm/asm-3.3.1-r2.ebuild | 39 ++++++++++++++++++++++ dev-java/asm/{asm-5.1.ebuild => asm-5.1-r1.ebuild} | 26 +++++++++------ dev-java/asm/asm-5.1.ebuild | 2 +- dev-java/asm/metadata.xml | 4 +++ 5 files changed, 62 insertions(+), 12 deletions(-) diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index a2bc854c576..e790c9cfdd9 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -2,6 +2,9 @@ DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9 DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e +DIST asm-ASM_3_3_1.tar.gz 14406355 BLAKE2B 4f2634f1cefa3d7342682eba41ac035b0c2ad60457cd976ad194d9a3b728f0ea904ae4f35620116fa81e0095c40d7a30bd95f4f317a118b79fe2a80e1708f16a SHA512 24a48b5a84baeae64dbc587ca4acc2c9a37993a17e0651cdd4881e73567be79b87b50057fa4d0eb2ad5dcdd975566fddf426749ca560ce0453c444aacff3592e +DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e +DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518 DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932 diff --git a/dev-java/asm/asm-3.3.1-r2.ebuild b/dev-java/asm/asm-3.3.1-r2.ebuild new file mode 100644 index 00000000000..b6755748423 --- /dev/null +++ b/dev-java/asm/asm-3.3.1-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WANT_ANT_TASKS="ant-owanttask" +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Bytecode manipulation framework for Java" +HOMEPAGE="https://asm.ow2.io"; +MY_P="ASM_${PV//./_}" +SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"; + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~amd64 ~ppc64 ~x86 ~sparc-solaris ~x86-solaris" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/asm-${MY_P}" + +# Needs deps we don't have yet +RESTRICT="test" + +EANT_DOC_TARGET="jdoc" + +# Fails if this property is not set +EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar" + +src_install() { + for x in output/dist/lib/*.jar ; do + java-pkg_newjar ${x} $(basename ${x/-${PV}}) + done + use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/ + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild similarity index 67% copy from dev-java/asm/asm-5.1.ebuild copy to dev-java/asm/asm-5.1-r1.ebuild index e210b62e486..b53de05f70d 100644 --- a/dev-java/asm/asm-5.1.ebuild +++ b/dev-java/asm/asm-5.1-r1.ebuild @@ -1,23 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -OLD_P="${PN}-4.0" +EAPI=7 + JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org"; -SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz - http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"; +HOMEPAGE="https://asm.ow2.io"; +MY_P="ASM_${PV//./_}" +SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz"; + LICENSE="BSD" SLOT="4" -IUSE="" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" +CDEPEND="" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/asm-${MY_P}" # Needs dependencies we don't have yet. RESTRICT="test" @@ -28,10 +31,11 @@ EANT_DOC_TARGET="jdoc" # Java generics seem to break unless product.noshrink is set. EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true" -java_prepare() { +src_prepare() { + default # Borrow some ant scripts from an old version to avoid requiring # bndlib and friends. This may not work forever! - cp -vf "../${OLD_P}/archive"/*.xml archive/ || die + cp -vf "../asm-ASM_4_0/archive"/*.xml archive/ || die } src_install() { diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild index e210b62e486..0b38eae3372 100644 --- a/dev-java/asm/asm-5.1.ebuild +++ b/dev-java/asm/asm-5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml index f653390931e..54460b88162 100644 --- a/dev-java/asm/metadata.xml +++ b/dev-java/asm/metadata.xml @@ -23,4 +23,8 @@ therefore designed and implemented to be as small and as fast as possible. </longdescription> + <upstream> + <doc>https://asm.ow2.io/documentation.html</doc> + <bugs-to>https://gitlab.ow2.org/asm/asm/issues</bugs-to> + </upstream> </pkgmetadata>
