From 085d3adc1bdb421632587aef27d2fc6c7576902b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Tue, 20 Sep 2005 17:52:43 +0000 Subject: [PATCH] Struts is now slotted because the 1.1 and 1.2 releases are not binary compatible. Fixes bug #97366. Package-Manager: portage-2.0.52-r1 --- dev-java/quartz/Manifest | 12 +--------- dev-java/struts/ChangeLog | 11 +++++++++- dev-java/struts/Manifest | 22 +++++++++---------- ...est-struts-1.1-r3 => digest-struts-1.1-r4} | 0 ...struts-1.2.4-r1 => digest-struts-1.2.4-r2} | 0 dev-java/struts/metadata.xml | 6 +++++ ...uts-1.1-r3.ebuild => struts-1.1-r4.ebuild} | 6 ++--- dev-java/struts/struts-1.2.2-r2.ebuild | 6 ++--- ...1.2.4-r1.ebuild => struts-1.2.4-r2.ebuild} | 6 ++--- 9 files changed, 37 insertions(+), 32 deletions(-) rename dev-java/struts/files/{digest-struts-1.1-r3 => digest-struts-1.1-r4} (100%) rename dev-java/struts/files/{digest-struts-1.2.4-r1 => digest-struts-1.2.4-r2} (100%) rename dev-java/struts/{struts-1.1-r3.ebuild => struts-1.1-r4.ebuild} (93%) rename dev-java/struts/{struts-1.2.4-r1.ebuild => struts-1.2.4-r2.ebuild} (95%) diff --git a/dev-java/quartz/Manifest b/dev-java/quartz/Manifest index d4f41c1293b2..95cd15c43974 100644 --- a/dev-java/quartz/Manifest +++ b/dev-java/quartz/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b645cc4a4464bbe7a38eb5661982cd49 quartz-1.4.5.ebuild 2243 +MD5 f61b045d84235fc6a9cb6357d46bb8f7 quartz-1.4.5.ebuild 2253 MD5 096ab829921c11fac98c1d825b8cae4d ChangeLog 2181 MD5 70b5c4b2ad5de8b5ad59a27a446c29ff metadata.xml 221 MD5 fc455689610396655039a37e986770b5 files/digest-quartz-1.4.5 62 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC29+P/rLF9B432nYRAtZWAKCyBZfcRYqxcqo3kTAHyHK5hObITACggsvv -RXNOcBxorAMvADckosSq7pQ= -=FQK7 ------END PGP SIGNATURE----- diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog index d047944814e4..3361b9d97343 100644 --- a/dev-java/struts/ChangeLog +++ b/dev-java/struts/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-java/struts # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.20 2005/07/10 15:26:13 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.21 2005/09/20 17:52:43 betelgeuse Exp $ + +*struts-1.2.4-r2 (20 Sep 2005) +*struts-1.1-r4 (20 Sep 2005) + + 20 Sep 2005; Petteri Räty metadata.xml, + -struts-1.1-r3.ebuild, +struts-1.1-r4.ebuild, struts-1.2.2-r2.ebuild, + -struts-1.2.4-r1.ebuild, +struts-1.2.4-r2.ebuild: + Struts is now slotted because the 1.1 and 1.2 releases are not binary + compatible. Fixes bug #97366. 10 Jul 2005; Thomas Matthijs struts-1.1-r3.ebuild, struts-1.2.2-r2.ebuild, struts-1.2.4-r1.ebuild: diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest index 498a1ecb1d17..81f298e3bfc6 100644 --- a/dev-java/struts/Manifest +++ b/dev-java/struts/Manifest @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0371d6165cc1e48ec34bbabcd49b2697 struts-1.1-r3.ebuild 2346 -MD5 ce204d66d04fde017af40352159e5e93 struts-1.2.4-r1.ebuild 2469 -MD5 88388418a693f6e55d985bd1d50006a7 struts-1.2.2-r2.ebuild 2262 -MD5 d029f5270223ede85a79d848a9d9063a ChangeLog 3489 -MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 +MD5 5f02be458ec1dbe6266251fc083b2b43 struts-1.2.4-r2.ebuild 2485 +MD5 e18daf97c534f7f520d1b1769ddb01e3 struts-1.2.2-r2.ebuild 2278 +MD5 b5b442424c993cf043d373bdd35e54dc ChangeLog 3852 +MD5 d085ceb415a1ba672a10d45acaa8947e struts-1.1-r4.ebuild 2362 +MD5 e99e5c6201a09707b99fd10b6bb25c6e metadata.xml 449 MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r2 77 -MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4-r1 78 -MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r3 75 +MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4-r2 78 +MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r4 75 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFC0T4s/rLF9B432nYRAkEjAJ9+qEEjj4tkpwxBE+WfZfPOUMYgcACgvI66 -eeuADy95HxM8UFcOuIDfSQA= -=o15Z +iD8DBQFDMEyPQiJ/wx066S4RAgIXAJ9wwuJ74l2nwH7tPYDv4sr1t9yxigCfcF54 +2XcVrlhd2J/33wKgJNTpDGg= +=OjdL -----END PGP SIGNATURE----- diff --git a/dev-java/struts/files/digest-struts-1.1-r3 b/dev-java/struts/files/digest-struts-1.1-r4 similarity index 100% rename from dev-java/struts/files/digest-struts-1.1-r3 rename to dev-java/struts/files/digest-struts-1.1-r4 diff --git a/dev-java/struts/files/digest-struts-1.2.4-r1 b/dev-java/struts/files/digest-struts-1.2.4-r2 similarity index 100% rename from dev-java/struts/files/digest-struts-1.2.4-r1 rename to dev-java/struts/files/digest-struts-1.2.4-r2 diff --git a/dev-java/struts/metadata.xml b/dev-java/struts/metadata.xml index 838c00a4a448..4d4606073c0e 100644 --- a/dev-java/struts/metadata.xml +++ b/dev-java/struts/metadata.xml @@ -2,4 +2,10 @@ java + +The Struts framework provides the invisible underpinnings every professional +web application needs to survive. Struts helps you create an extensible +development environment for your application, based on published standards +and proven design patterns. + diff --git a/dev-java/struts/struts-1.1-r3.ebuild b/dev-java/struts/struts-1.1-r4.ebuild similarity index 93% rename from dev-java/struts/struts-1.1-r3.ebuild rename to dev-java/struts/struts-1.1-r4.ebuild index 44b17fe78698..333d9e0e3b98 100644 --- a/dev-java/struts/struts-1.1-r3.ebuild +++ b/dev-java/struts/struts-1.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r3.ebuild,v 1.4 2005/07/10 15:26:13 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r4.ebuild,v 1.1 2005/09/20 17:52:43 betelgeuse Exp $ inherit java-pkg @@ -8,7 +8,7 @@ DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets" SRC_URI="mirror://apache/jakarta/struts/source/jakarta-${P}-src.tar.gz" HOMEPAGE="http://jakarta.apache.org/struts/index.html" LICENSE="Apache-1.1" -SLOT="0" +SLOT="1.1" RDEPEND=">=virtual/jre-1.4 =dev-java/commons-beanutils-1.6* >=dev-java/commons-collections-2.1 @@ -53,7 +53,7 @@ src_install() { java-pkg_dojar target/library/struts.jar # install the tld files - insinto /usr/share/${PN}/lib + insinto /usr/share/${PN}-${SLOT}/lib doins target/library/*.tld dodoc README STATUS diff --git a/dev-java/struts/struts-1.2.2-r2.ebuild b/dev-java/struts/struts-1.2.2-r2.ebuild index 44fec6e80b2f..982c3ecfcd82 100644 --- a/dev-java/struts/struts-1.2.2-r2.ebuild +++ b/dev-java/struts/struts-1.2.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r2.ebuild,v 1.3 2005/07/10 15:26:13 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r2.ebuild,v 1.4 2005/09/20 17:52:43 betelgeuse Exp $ inherit java-pkg @@ -8,7 +8,7 @@ DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets" SRC_URI="mirror://apache/struts/source/jakarta-${P}-src.tar.gz" HOMEPAGE="http://jakarta.apache.org/struts/index.html" LICENSE="Apache-2.0" -SLOT="0" +SLOT="1.2" RDEPEND=">=virtual/jre-1.4 =dev-java/commons-beanutils-1.6* >=dev-java/commons-collections-2.1 @@ -53,7 +53,7 @@ src_install() { java-pkg_dojar target/library/struts.jar #install the tld files - insinto /usr/share/${PN}/lib + insinto /usr/share/${PN}-${SLOT}/lib doins target/library/*.tld dodoc README STATUS.txt diff --git a/dev-java/struts/struts-1.2.4-r1.ebuild b/dev-java/struts/struts-1.2.4-r2.ebuild similarity index 95% rename from dev-java/struts/struts-1.2.4-r1.ebuild rename to dev-java/struts/struts-1.2.4-r2.ebuild index 97776b182ab8..3b230f6fabdf 100644 --- a/dev-java/struts/struts-1.2.4-r1.ebuild +++ b/dev-java/struts/struts-1.2.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r1.ebuild,v 1.4 2005/07/10 15:26:13 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r2.ebuild,v 1.1 2005/09/20 17:52:43 betelgeuse Exp $ inherit java-pkg @@ -8,7 +8,7 @@ DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets" SRC_URI="mirror://apache/struts/source/jakarta-${P}-src.tar.gz" HOMEPAGE="http://jakarta.apache.org/struts/index.html" LICENSE="Apache-2.0" -SLOT="0" +SLOT="1.2" RDEPEND=">=virtual/jre-1.4 =dev-java/commons-beanutils-1.6* >=dev-java/commons-collections-2.1 @@ -53,7 +53,7 @@ src_install() { java-pkg_dojar target/library/struts.jar #install the tld files - insinto /usr/share/${PN}/lib + insinto /usr/share/${PN}-${SLOT}/lib doins target/library/*.tld dodoc README STATUS.txt -- 2.26.2