From 10c2a080bfd1aad86f8b955159f651a8a49dbb81 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 7 Feb 2016 11:00:50 +0000 Subject: dev-java/struts{,-plugins,-core,-xwork}: Removal. Fixes bug 540888. --- dev-java/struts-core/Manifest | 2 - .../struts-2.3.15.2-build.xml-classpath.patch | 20 - .../files/struts-2.3.15.2-build.xml-manifest.patch | 15 - dev-java/struts-core/metadata.xml | 8 - dev-java/struts-core/struts-core-2.3.15.2.ebuild | 67 ---- dev-java/struts-plugins/Manifest | 3 - .../files/struts-2.3.15.2-build.xml-manifest.patch | 406 --------------------- ...ruts-2.3.15.2-build.xml-remove-codebehind.patch | 50 --- .../struts-2.3.15.2-build.xml-remove-portlet.patch | 50 --- dev-java/struts-plugins/metadata.xml | 8 - .../struts-plugins/struts-plugins-2.3.15.2.ebuild | 106 ------ dev-java/struts-xwork/Manifest | 2 - dev-java/struts-xwork/metadata.xml | 8 - dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild | 64 ---- dev-java/struts/Manifest | 2 - .../struts-2.3.15.2-build.xml-apps-package.patch | 249 ------------- .../struts-2.3.15.2-build.xml-classpath.patch | 162 -------- .../files/struts-2.3.15.2-build.xml-manifest.patch | 30 -- ...ts-2.3.15.2-build.xml-remove-apps-portlet.patch | 50 --- ....3.15.2-build.xml-remove-core-and-plugins.patch | 56 --- dev-java/struts/metadata.xml | 14 - dev-java/struts/struts-2.3.15.2.ebuild | 105 ------ 22 files changed, 1477 deletions(-) delete mode 100644 dev-java/struts-core/Manifest delete mode 100644 dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch delete mode 100644 dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch delete mode 100644 dev-java/struts-core/metadata.xml delete mode 100644 dev-java/struts-core/struts-core-2.3.15.2.ebuild delete mode 100644 dev-java/struts-plugins/Manifest delete mode 100644 dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch delete mode 100644 dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch delete mode 100644 dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch delete mode 100644 dev-java/struts-plugins/metadata.xml delete mode 100644 dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild delete mode 100644 dev-java/struts-xwork/Manifest delete mode 100644 dev-java/struts-xwork/metadata.xml delete mode 100644 dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild delete mode 100644 dev-java/struts/Manifest delete mode 100644 dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch delete mode 100644 dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch delete mode 100644 dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch delete mode 100644 dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch delete mode 100644 dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch delete mode 100644 dev-java/struts/metadata.xml delete mode 100644 dev-java/struts/struts-2.3.15.2.ebuild (limited to 'dev-java') diff --git a/dev-java/struts-core/Manifest b/dev-java/struts-core/Manifest deleted file mode 100644 index c2974670e4ab..000000000000 --- a/dev-java/struts-core/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch deleted file mode 100644 index 1ce5974427b7..000000000000 --- a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/maven-build.xml -+++ b/maven-build.xml -@@ -125,7 +125,7 @@ - - - -- - -- -- -- -- - - - diff --git a/dev-java/struts-core/metadata.xml b/dev-java/struts-core/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/struts-core/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/struts-core/struts-core-2.3.15.2.ebuild b/dev-java/struts-core/struts-core-2.3.15.2.ebuild deleted file mode 100644 index 1d62ab6dc5a2..000000000000 --- a/dev-java/struts-core/struts-core-2.3.15.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="struts" -MY_P="${MY_PN}-${PV}-src" - -DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: Core" -SRC_URI="mirror://apache/struts/source/${MY_P}.zip - https://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz" -HOMEPAGE="http://struts.apache.org/index.html" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~amd64" - -COMMON_DEPS="dev-java/commons-fileupload:0 - dev-java/commons-lang:3.1 - dev-java/freemarker:2.3 - dev-java/ognl:3.0 - dev-java/struts-xwork:2 - dev-java/velocity:0 - java-virtuals/servlet-api:3.0" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPS}" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}/src/core" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="struts-xwork-2" - -src_unpack() { - unpack ${MY_P}.zip - cd "${WORKDIR}"/${MY_PN}-${PV}/src || die - unpack ${MY_PN}-build.xml-${PV}.tar.xz - - java-pkg_getjars commons-fileupload,commons-lang-3.1,freemarker-2.3,ognl-3.0,velocity,servlet-api-3.0 -} - -java_prepare() { - find . -name '*.jar' -print -delete || die - - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch -} - -src_test() { - EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${MY_PN}2-core-${PV}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/com -} diff --git a/dev-java/struts-plugins/Manifest b/dev-java/struts-plugins/Manifest deleted file mode 100644 index ff3e70f32de7..000000000000 --- a/dev-java/struts-plugins/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST struts-2.3.15.2-build.xml-classpath.patch 26778 SHA256 757fa1e729a3b196807e53350dbbd9d0a2fb2830095ac0227b4324f019cc27d1 SHA512 c84fd2226ccfaabb9405c27017b52d2a951a106ecc1f8fed1dd447b30e052572e6a81d66b1732ffe51dfd7078944938de417248a5a6816a32fbb1ffc610c3da6 WHIRLPOOL 7d7b7849f49cdc5502b2686555779a6bb231e18bc936f24ee0570319f1f84d57bf9239282e256968a07f067d8815f0a8f63de692221745a744bb91a32daa0859 -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch deleted file mode 100644 index 3944ff651b57..000000000000 --- a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch +++ /dev/null @@ -1,406 +0,0 @@ ---- a/convention/maven-build.xml -+++ b/convention/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/config-browser/maven-build.xml -+++ b/config-browser/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/javatemplates/maven-build.xml -+++ b/javatemplates/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/jasperreports/maven-build.xml -+++ b/jasperreports/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/jfreechart/maven-build.xml -+++ b/jfreechart/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/jsf/maven-build.xml -+++ b/jsf/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/pell-multipart/maven-build.xml -+++ b/pell-multipart/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/plexus/maven-build.xml -+++ b/plexus/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/sitegraph/maven-build.xml -+++ b/sitegraph/maven-build.xml -@@ -260,13 +260,8 @@ - -- -- -- - - - ---- a/sitemesh/maven-build.xml -+++ b/sitemesh/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/spring/maven-build.xml -+++ b/spring/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/struts1/maven-build.xml -+++ b/struts1/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/tiles/maven-build.xml -+++ b/tiles/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/dojo/maven-build.xml -+++ b/dojo/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/rest/maven-build.xml -+++ b/rest/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/portlet/maven-build.xml -+++ b/portlet/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/portlet-tiles/maven-build.xml -+++ b/portlet-tiles/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/junit/maven-build.xml -+++ b/junit/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/testng/maven-build.xml -+++ b/testng/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/dwr/maven-build.xml -+++ b/dwr/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/oval/maven-build.xml -+++ b/oval/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/osgi/maven-build.xml -+++ b/osgi/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/json/maven-build.xml -+++ b/json/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/embeddedjsp/maven-build.xml -+++ b/embeddedjsp/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/gxp/maven-build.xml -+++ b/gxp/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/cdi/maven-build.xml -+++ b/cdi/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - ---- a/tiles3/maven-build.xml -+++ b/tiles3/maven-build.xml -@@ -238,12 +238,8 @@ - -- -- -- - - - diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch deleted file mode 100644 index 14143bad26b0..000000000000 --- a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/plugins/maven-build.xml -+++ b/plugins/maven-build.xml -@@ -22,7 +22,6 @@ - - - -- - - - -@@ -57,7 +56,6 @@ - - - -- - - - -@@ -92,7 +90,6 @@ - - - -- - - - -@@ -127,7 +124,6 @@ - - - -- - - - -@@ -162,7 +158,6 @@ - - - -- - - - -@@ -197,7 +192,6 @@ - - - -- - - - diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch deleted file mode 100644 index 3c64fbc560e1..000000000000 --- a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/maven-build.xml -+++ b/maven-build.xml -@@ -38,7 +38,5 @@ - - - -- -- - - -@@ -73,7 +72,5 @@ - - - -- -- - - -@@ -108,7 +106,5 @@ - - - -- -- - - -@@ -143,7 +140,5 @@ - - - -- -- - - -@@ -178,7 +174,5 @@ - - - -- -- - - -@@ -213,7 +208,5 @@ - - - -- -- - - diff --git a/dev-java/struts-plugins/metadata.xml b/dev-java/struts-plugins/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/struts-plugins/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild b/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild deleted file mode 100644 index a6e85e7e2641..000000000000 --- a/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="struts" -MY_P="${MY_PN}-${PV}-src" - -DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: Plugins" -SRC_URI="mirror://apache/struts/source/${MY_P}.zip - https://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz - https://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-${PV}-build.xml-classpath.patch" -HOMEPAGE="http://struts.apache.org/index.html" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~amd64" - -COMMON_DEPS="dev-java/commons-beanutils:1.7 - dev-java/commons-lang:3.1 - dev-java/commons-io:1 - dev-java/freemarker:2.3 - dev-java/juel:0 - dev-java/ognl:3.0 - dev-java/osgi-core-api:0 - dev-java/struts-core:${SLOT} - dev-java/struts-xwork:${SLOT} - dev-java/velocity:0 - java-virtuals/servlet-api:3.0" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPS}" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}/src/plugins" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-xwork-${SLOT}" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}" -EANT_BUILD_TARGET="package" -EANT_TEST_TARGET="test" - -# javatemplates/maven-build.xml:149: -# Test org.apache.struts2.views.java.simple.AbstractCommonAttributesTest failed -# Cannot instantiate test case: testRenderTextFieldDynamicAttrs -RESTRICT="test" - -src_unpack() { - unpack ${MY_P}.zip - cd "${WORKDIR}"/${MY_PN}-${PV}/src || die - unpack ${MY_PN}-build.xml-${PV}.tar.xz -} - -java_prepare() { - find . -name '*.jar' -print -delete || die - - epatch "${DISTDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-codebehind.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-portlet.patch - - # Remove tests that don't build due to test files that aren't installed. - rm jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java - - java-pkg_getjars commons-beanutils-1.7,commons-io-1,commons-lang-3.1,freemarker-2.3,juel,ognl-3.0,osgi-core-api,servlet-api-3.0,velocity -} - -src_test() { - EANT_TEST_EXTRA_ARGS="-Dgentoo.test.classpath=$(java-pkg_getjars ${EANT_TEST_GENTOO_CLASSPATH})" - EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true" - - java-pkg-2_src_test -} - -src_install() { - for plugin in $(find . -mindepth 1 -maxdepth 1 -type d | sed 's:./::g' | tr '\n' ' ') ; do - [[ ! -d ${plugin}/target ]] && continue - - einfo "Installing plugin '${plugin}' ..." - java-pkg_newjar ${plugin}/target/${MY_PN}2-${plugin}-plugin-${PV}.jar ${plugin}.jar - - if use doc ; then - java-pkg_dojavadoc ${plugin}/target/site/apidocs - mkdir "${D}"/usr/share/doc/${P}/${plugin} || die - mv "${D}"/usr/share/doc/${P}/{html,${plugin}/html} || die - fi - - use source && java-pkg_dosrc ${plugin}/src/main/java/org - done - - if use doc ; then - rm "${D}"/usr/share/${PN}-${SLOT}/api || die - fi -} - -pkg_postinst() { - elog "The 'codebehind' and 'portlet' plugins are not in this release because they don't build yet." -} diff --git a/dev-java/struts-xwork/Manifest b/dev-java/struts-xwork/Manifest deleted file mode 100644 index c2974670e4ab..000000000000 --- a/dev-java/struts-xwork/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts-xwork/metadata.xml b/dev-java/struts-xwork/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/struts-xwork/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild b/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild deleted file mode 100644 index 6011b7fc629a..000000000000 --- a/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="struts" -MY_P="${MY_PN}-${PV}-src" - -DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: XWork Core" -SRC_URI="mirror://apache/struts/source/${MY_P}.zip - https://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz" -HOMEPAGE="http://struts.apache.org/index.html" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~amd64" - -COMMON_DEPS="dev-java/asm:3 - dev-java/commons-io:1 - dev-java/commons-lang:3.1 - dev-java/commons-logging:0 - dev-java/ognl:3.0 - dev-java/slf4j-api:0" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPS}" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}/src/xwork-core" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="asm-3,commons-io-1,commons-lang-3.1,commons-logging,ognl-3.0,slf4j-api" - -# Could not open files of the name xwork-jar.xml -RESTRICT="test" - -src_unpack() { - unpack ${MY_P}.zip - cd "${WORKDIR}"/${MY_PN}-${PV}/src || die - unpack ${MY_PN}-build.xml-${PV}.tar.xz -} - -java_prepare() { - find . -name '*.jar' -print -delete || die -} - -src_test() { - EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/xwork-core.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/com -} diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest deleted file mode 100644 index c2974670e4ab..000000000000 --- a/dev-java/struts/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch deleted file mode 100644 index d1e414414320..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch +++ /dev/null @@ -1,249 +0,0 @@ -diff -urN a/apps/blank/maven-build.xml b/apps/blank/maven-build.xml ---- a/apps/blank/maven-build.xml 2013-10-02 15:52:07.637985555 +0200 -+++ b/apps/blank/maven-build.xml 2013-10-02 15:52:29.756985531 +0200 -@@ -243,32 +243,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- - ---- a/apps/mailreader/maven-build.xml -+++ b/apps/mailreader/maven-build.xml -@@ -198,36 +198,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ---- a/apps/showcase/maven-build.xml -+++ b/apps/showcase/maven-build.xml -@@ -334,112 +334,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ---- a/apps/rest-showcase/maven-build.xml -+++ b/apps/rest-showcase/maven-build.xml -@@ -273,56 +273,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch deleted file mode 100644 index 25d694a198a3..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch +++ /dev/null @@ -1,162 +0,0 @@ ---- a/apps/blank/maven-build.xml -+++ b/apps/blank/maven-build.xml -@@ -125,7 +125,7 @@ - - - -- - -- - - -+ - - - ---- a/apps/mailreader/maven-build.xml -+++ b/apps/mailreader/maven-build.xml -@@ -125,7 +125,7 @@ - - - -- - -- - -- - - -+ - - - ---- a/apps/showcase/maven-build.xml -+++ b/apps/showcase/maven-build.xml -@@ -125,7 +125,7 @@ - - - -- - -- - - -+ - - - ---- a/apps/rest-showcase/maven-build.xml -+++ b/apps/rest-showcase/maven-build.xml -@@ -125,7 +125,7 @@ - - -