From: Miroslav Šulc Date: Fri, 9 Feb 2007 20:00:34 +0000 (+0000) Subject: Removed migrated xpp3-1.1.3.4m-r1 ebuild as it didn't work with JAVA_PKG_STRICT=true... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60017d1af2729d1a1c62f79f58bc85da5f1462e5;p=gentoo.git Removed migrated xpp3-1.1.3.4m-r1 ebuild as it didn't work with JAVA_PKG_STRICT=true, and added new version bump. Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-java/xpp3/ChangeLog b/dev-java/xpp3/ChangeLog index 97d230809a32..9a0d6e4d6caf 100644 --- a/dev-java/xpp3/ChangeLog +++ b/dev-java/xpp3/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/xpp3 -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.7 2007/01/04 05:56:17 tgall Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.8 2007/02/09 20:00:34 fordfrog Exp $ + +*xpp3-1.1.4c (09 Feb 2007) + + 09 Feb 2007; Miroslav Å ulc + +files/xpp3-1.1.4c-build.xml.patch, -xpp3-1.1.3.4m-r1.ebuild, + +xpp3-1.1.4c.ebuild: + Removed migrated xpp3-1.1.3.4m-r1 ebuild as it didn't work with + JAVA_PKG_STRICT=true, and added new version bump. 03 Jan 2007; Tom Gall xpp3-1.1.3.4m.ebuild: stable on ppc64 diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest index 2d21cc16787f..e3db3613a1d2 100644 --- a/dev-java/xpp3/Manifest +++ b/dev-java/xpp3/Manifest @@ -1,16 +1,21 @@ +AUX xpp3-1.1.4c-build.xml.patch 950 RMD160 db82a90defcc48b3f8c9a9186c4f3432d00bc181 SHA1 fd4fbac182c256423dd1162daf72bb50318c6c8e SHA256 dd850813b2eaca04669ea7967fd95ec110f71e677bbedfd2ef01176af344a6c5 +MD5 6aa4cb626a0e6af36894aa39d225be0d files/xpp3-1.1.4c-build.xml.patch 950 +RMD160 db82a90defcc48b3f8c9a9186c4f3432d00bc181 files/xpp3-1.1.4c-build.xml.patch 950 +SHA256 dd850813b2eaca04669ea7967fd95ec110f71e677bbedfd2ef01176af344a6c5 files/xpp3-1.1.4c-build.xml.patch 950 DIST xpp3-1.1.3.4.M_src.zip 958654 RMD160 84fe778506e0793beb8daed1f743427421e99297 SHA1 18e5963c1bf97204605cc6f26cb5a63152329cac SHA256 24533918ddd2be14465c1feaa7ef8dac133c119d6b4a702cbda5babd06fbc7f3 -EBUILD xpp3-1.1.3.4m-r1.ebuild 969 RMD160 35464f251407bff3f1aebf1f55104a20be62cbcb SHA1 31195151009ca74515da755d8e6ffe35c705eaae SHA256 eff761d1dbdad69ef975ebeb2efac83a8353b64723e844611a6aeb4202d69542 -MD5 54bef30fe8103ad7f7673e2d98c13b4a xpp3-1.1.3.4m-r1.ebuild 969 -RMD160 35464f251407bff3f1aebf1f55104a20be62cbcb xpp3-1.1.3.4m-r1.ebuild 969 -SHA256 eff761d1dbdad69ef975ebeb2efac83a8353b64723e844611a6aeb4202d69542 xpp3-1.1.3.4m-r1.ebuild 969 +DIST xpp3-1.1.4c_src.zip 959795 RMD160 0a30590fb6db5f5f110ce994501afa7670ad9e47 SHA1 49af39341a96f1f4bf9ef9dc5947d00d1d0ea366 SHA256 c12c8c1bab5ce2c1d28a4075319d78c51d986581284b920faa5ed85df60437f4 EBUILD xpp3-1.1.3.4m.ebuild 1134 RMD160 f14b82db4138cc5538d2164f5d0fd357c233f35b SHA1 134c51947ab2672d4ed6c79f01e80e5461d4dfc7 SHA256 14d6c5d9ba1cd8d5ea2477fce8829a6cf944aa9e63a2ec93d626a3db72b34b88 MD5 a7ff61dbedecacba4673b71092226b2e xpp3-1.1.3.4m.ebuild 1134 RMD160 f14b82db4138cc5538d2164f5d0fd357c233f35b xpp3-1.1.3.4m.ebuild 1134 SHA256 14d6c5d9ba1cd8d5ea2477fce8829a6cf944aa9e63a2ec93d626a3db72b34b88 xpp3-1.1.3.4m.ebuild 1134 -MISC ChangeLog 1044 RMD160 762e2a71359d09ffb74b515cdb27ce6d4b9ed219 SHA1 0523619e920c834d4277d2d7a5582861dc1cdf35 SHA256 369c4920724510ed5e724cf8526097add7b9fffb4ca1855ea85235c4ef0c3587 -MD5 ce774f35f15b3f4cfa4656cc46831ee6 ChangeLog 1044 -RMD160 762e2a71359d09ffb74b515cdb27ce6d4b9ed219 ChangeLog 1044 -SHA256 369c4920724510ed5e724cf8526097add7b9fffb4ca1855ea85235c4ef0c3587 ChangeLog 1044 +EBUILD xpp3-1.1.4c.ebuild 1163 RMD160 2607118d7810ac06eac456005ef2ff8629a53220 SHA1 96fb2ae79c10a76c641bad1746d516be900d804e SHA256 68da88926b3d1593b3dc04a0a08c65f4a99cb70853a5cd8601cd9800b2fff5cc +MD5 a20acf87e81e267aa454dcdd20a324c8 xpp3-1.1.4c.ebuild 1163 +RMD160 2607118d7810ac06eac456005ef2ff8629a53220 xpp3-1.1.4c.ebuild 1163 +SHA256 68da88926b3d1593b3dc04a0a08c65f4a99cb70853a5cd8601cd9800b2fff5cc xpp3-1.1.4c.ebuild 1163 +MISC ChangeLog 1333 RMD160 0920a199f7c51374d4ed9562a1b65d1e270e58e7 SHA1 48235963e5de929e9a7d4308a89b7a12768f992a SHA256 5c511154df67e4723a46e69c2b679cf39058ba540f83d098730accd25f500ac7 +MD5 dfb3d4855bfd5f9044a7f9b0afc97292 ChangeLog 1333 +RMD160 0920a199f7c51374d4ed9562a1b65d1e270e58e7 ChangeLog 1333 +SHA256 5c511154df67e4723a46e69c2b679cf39058ba540f83d098730accd25f500ac7 ChangeLog 1333 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -18,6 +23,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 160c2984a70cc08215bceef671c71985 files/digest-xpp3-1.1.3.4m 247 RMD160 765f9555407fe14a894a4c9b7497d4a300ff77f5 files/digest-xpp3-1.1.3.4m 247 SHA256 9952b638371f093220c2bef5051a7f8ad99a65377d5e2b8270d6a199c6c48540 files/digest-xpp3-1.1.3.4m 247 -MD5 160c2984a70cc08215bceef671c71985 files/digest-xpp3-1.1.3.4m-r1 247 -RMD160 765f9555407fe14a894a4c9b7497d4a300ff77f5 files/digest-xpp3-1.1.3.4m-r1 247 -SHA256 9952b638371f093220c2bef5051a7f8ad99a65377d5e2b8270d6a199c6c48540 files/digest-xpp3-1.1.3.4m-r1 247 +MD5 60c5ab2f8931963d72abc2e96b2f6ddc files/digest-xpp3-1.1.4c 238 +RMD160 24ab7e6aeeeab6108b4ffc9cdc6cf9950fc33579 files/digest-xpp3-1.1.4c 238 +SHA256 f9dba3b4d1803164dbedb25885af9aae08d51a11382a386b9ffc5d322a5fd690 files/digest-xpp3-1.1.4c 238 diff --git a/dev-java/xpp3/files/digest-xpp3-1.1.3.4m-r1 b/dev-java/xpp3/files/digest-xpp3-1.1.3.4m-r1 deleted file mode 100644 index 8529fff134cb..000000000000 --- a/dev-java/xpp3/files/digest-xpp3-1.1.3.4m-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9a80140359b7c946b223655837a22cf7 xpp3-1.1.3.4.M_src.zip 958654 -RMD160 84fe778506e0793beb8daed1f743427421e99297 xpp3-1.1.3.4.M_src.zip 958654 -SHA256 24533918ddd2be14465c1feaa7ef8dac133c119d6b4a702cbda5babd06fbc7f3 xpp3-1.1.3.4.M_src.zip 958654 diff --git a/dev-java/xpp3/files/digest-xpp3-1.1.4c b/dev-java/xpp3/files/digest-xpp3-1.1.4c new file mode 100644 index 000000000000..098dd11fd102 --- /dev/null +++ b/dev-java/xpp3/files/digest-xpp3-1.1.4c @@ -0,0 +1,3 @@ +MD5 d2d30fac7473744cde963cfb0b4eb06c xpp3-1.1.4c_src.zip 959795 +RMD160 0a30590fb6db5f5f110ce994501afa7670ad9e47 xpp3-1.1.4c_src.zip 959795 +SHA256 c12c8c1bab5ce2c1d28a4075319d78c51d986581284b920faa5ed85df60437f4 xpp3-1.1.4c_src.zip 959795 diff --git a/dev-java/xpp3/files/xpp3-1.1.4c-build.xml.patch b/dev-java/xpp3/files/xpp3-1.1.4c-build.xml.patch new file mode 100644 index 000000000000..33790c150393 --- /dev/null +++ b/dev-java/xpp3/files/xpp3-1.1.4c-build.xml.patch @@ -0,0 +1,20 @@ +--- build.xml.original 2007-02-09 20:06:21.000000000 +0100 ++++ build.xml 2007-02-09 20:07:18.000000000 +0100 +@@ -426,7 +426,7 @@ + depends="check_junit,impl,update_tests,wrapper,dom2_builder"> + + + +@@ -434,7 +434,7 @@ + depends="check_junit,impl,update_tests"> + + + + diff --git a/dev-java/xpp3/xpp3-1.1.3.4m-r1.ebuild b/dev-java/xpp3/xpp3-1.1.3.4m-r1.ebuild deleted file mode 100644 index b778020d3ffa..000000000000 --- a/dev-java/xpp3/xpp3-1.1.3.4m-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.3.4m-r1.ebuild,v 1.3 2006/12/09 09:27:21 flameeyes Exp $ - -inherit java-pkg-2 java-ant-2 - -MY_PV=${PV/m/.M} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="An implementation of XMLPULL V1 API." -HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html" -SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/${MY_P}_src.zip" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc test source" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - test? ( dev-java/junit ) - dev-java/ant-core" -RDEPEND=">=virtual/jre-1.4" - -S=${WORKDIR}/${MY_P} - -src_compile() { - eant jar $(use_doc) -} - -src_test() { - eant junit -} - -src_install() { - cp build/${MY_P}.jar ${PN}.jar - java-pkg_dojar ${PN}.jar - - use doc && java-pkg_dohtml -r doc/ - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/xpp3/xpp3-1.1.4c.ebuild b/dev-java/xpp3/xpp3-1.1.4c.ebuild new file mode 100644 index 000000000000..cc8228184560 --- /dev/null +++ b/dev-java/xpp3/xpp3-1.1.4c.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.1 2007/02/09 20:00:34 fordfrog Exp $ + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PV=${PV/m/.M} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="An implementation of XMLPULL V1 API." +HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html" +SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions/${MY_P}_src.zip" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="test" + +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + test? ( + dev-java/ant + =dev-java/junit-3.8* + ) + !test? ( dev-java/ant-core )" +RDEPEND=">=virtual/jre-1.4" + +S=${WORKDIR}/${MY_P} + +EANT_BUILD_TARGET="jar" +EANT_DOC_TARGET="javadoc" + +src_unpack() { + unpack "${A}" + cd "${S}" + rm -f *.jar + epatch "${FILESDIR}/${P}-build.xml.patch" +} + +src_test() { + eant -Dgentoo.classpath=$(java-pkg_getjars junit) tests_main +} + +src_install() { + java-pkg_newjar build/${MY_P}.jar ${PN}.jar + + use doc && java-pkg_dojavadoc doc + use source && java-pkg_dosrc src/java/* +}