From: Vlastimil Babka Date: Fri, 5 Jan 2007 23:17:02 +0000 (+0000) Subject: Gen-1 punt in 1.1 slot. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b83eb3378f37fa4d32ed2e3de656ba5d3e288c1d;p=gentoo.git Gen-1 punt in 1.1 slot. Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest index 78ff829e74a2..78bc8d50582a 100644 --- a/dev-java/jaxen/Manifest +++ b/dev-java/jaxen/Manifest @@ -10,13 +10,8 @@ AUX jaxen-1.1_beta11-fix-jdk14-tests.patch 1040 RMD160 d79d68267f42127c8320b7696 MD5 5b9c9e4df033849832a6ae52b49e0e42 files/jaxen-1.1_beta11-fix-jdk14-tests.patch 1040 RMD160 d79d68267f42127c8320b769662d331d200183f7 files/jaxen-1.1_beta11-fix-jdk14-tests.patch 1040 SHA256 38d7220231487189f0caefe55fba3c9c9f8f0d52f78dec3c252647690ea42c5b files/jaxen-1.1_beta11-fix-jdk14-tests.patch 1040 -AUX jaxen-1.1_beta2-gentoo.diff 1254 RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 SHA1 c9a69a11b49b6800710073fcbe41035f447609b2 SHA256 0c97dd1c0a1605479882f5327f165aa5f939e32fe313d1b6691527b2f1683a25 -MD5 917b383454a8f38fb290d4a69ddb47ca files/jaxen-1.1_beta2-gentoo.diff 1254 -RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 files/jaxen-1.1_beta2-gentoo.diff 1254 -SHA256 0c97dd1c0a1605479882f5327f165aa5f939e32fe313d1b6691527b2f1683a25 files/jaxen-1.1_beta2-gentoo.diff 1254 DIST jaxen-1.0-FCS.tar.gz 3195819 RMD160 896f838c383b6a5d60c4c2fa1271a735992aaa4e SHA1 be658764988717d79b70ccafdd7955ccfba8a25f SHA256 ceb6997465e9de4efe6b4e8f0c421c12bd115b764f9633b9c8b80b95e3b76377 DIST jaxen-1.1-beta-11-src.tar.gz 278622 RMD160 3affa87f175733722ab0bacbae9eb94ca0963daf SHA1 982ff22992da95a19f9a40defea1feb63ee897cb SHA256 4bb00f3317cdc20779d9c08618ca82eb8eb44c7be7fb3811dc6d7f300e52bf67 -DIST jaxen-1.1-beta-2-src.tar.gz 697184 RMD160 23594b3ec65a306826fe8b38bd16ee62c298764b SHA1 6af72689a97a2e0108633767cfee4cbd9a9b4e3d SHA256 47d299f88cc7df0aedfd678f524de9c1028d727dc1aea1d663bce0ca38c76805 EBUILD jaxen-1.0-r1.ebuild 1452 RMD160 3b8bb72397c622cd59a1a8ac35fb1921b04928ef SHA1 4a6e2a65a26b2c686cf0bc5933ba45349b1ab557 SHA256 dba3cacf4aec354c9ae3772bffa1e076a55a2df6af39b43c8192de9e54635def MD5 be8e679bbc29adaea89123695f5459e9 jaxen-1.0-r1.ebuild 1452 RMD160 3b8bb72397c622cd59a1a8ac35fb1921b04928ef jaxen-1.0-r1.ebuild 1452 @@ -29,14 +24,10 @@ EBUILD jaxen-1.1_beta11.ebuild 1533 RMD160 658378188b61059ad38e1825c65a65c984115 MD5 7c968915eddd09e1ad024ff20e692ba3 jaxen-1.1_beta11.ebuild 1533 RMD160 658378188b61059ad38e1825c65a65c9841154c4 jaxen-1.1_beta11.ebuild 1533 SHA256 ae5427ab2026c71496fae45c2fa69df9c9260a87711e7db0186c6581a1f7da03 jaxen-1.1_beta11.ebuild 1533 -EBUILD jaxen-1.1_beta2-r1.ebuild 1363 RMD160 c6c8cdb101314e55efe622abb9dc12268f9a6982 SHA1 ea95d08319a928938b885346f88f6b6b0fe6a742 SHA256 4825dfa4c77c61e6b9673a2b36e837d1b5276ccf94b587a59248b42feef60e2c -MD5 1ccc55bcd164ce25f674d33327bd26bc jaxen-1.1_beta2-r1.ebuild 1363 -RMD160 c6c8cdb101314e55efe622abb9dc12268f9a6982 jaxen-1.1_beta2-r1.ebuild 1363 -SHA256 4825dfa4c77c61e6b9673a2b36e837d1b5276ccf94b587a59248b42feef60e2c jaxen-1.1_beta2-r1.ebuild 1363 -MISC ChangeLog 5534 RMD160 0e92d152f1bd7d12d61ace89c2249df1805c962d SHA1 0dbf599d7e7c2af295c8e72849018bab51142554 SHA256 c368a7f7de4512a4ac4ca066fd2dd99b3958c6a1755cc051e4b0ed09d5ad1e91 -MD5 365653582410cfe419bb876e9b346d7e ChangeLog 5534 -RMD160 0e92d152f1bd7d12d61ace89c2249df1805c962d ChangeLog 5534 -SHA256 c368a7f7de4512a4ac4ca066fd2dd99b3958c6a1755cc051e4b0ed09d5ad1e91 ChangeLog 5534 +MISC ChangeLog 5677 RMD160 9dd3202b57511414d252eebc0b8169ae43a22d9d SHA1 f94e554471ef7d2f3d8ca30c2d4e181f383b8f63 SHA256 6cc3cbf1637f10392f7cd24b6d25e7147aafa73cc94508d6b32fe0ae4e8c3514 +MD5 1be13e6438fe3e4e890d304cec4a2eca ChangeLog 5677 +RMD160 9dd3202b57511414d252eebc0b8169ae43a22d9d ChangeLog 5677 +SHA256 6cc3cbf1637f10392f7cd24b6d25e7147aafa73cc94508d6b32fe0ae4e8c3514 ChangeLog 5677 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -50,6 +41,3 @@ SHA256 795494b6d600e313c902d66354a0c912edf141aad66bc1ea1cd1b79226d8dc2c files/di MD5 7adbf7607e0cfcb289c1bbb8bebd209c files/digest-jaxen-1.1_beta11 265 RMD160 09ab1ae7755f945d46716b8ecf32f72990bad37e files/digest-jaxen-1.1_beta11 265 SHA256 f6008e1c28fe45f964cbad161762be82e4e19dd7f7cf4395e9fb2e87044a90eb files/digest-jaxen-1.1_beta11 265 -MD5 4e65d8e93483879da1007077ec7acac1 files/digest-jaxen-1.1_beta2-r1 262 -RMD160 aa35942e46fe4342f0530586a3faf5d7614196d7 files/digest-jaxen-1.1_beta2-r1 262 -SHA256 4b616dbf43a845e16be018a27094e1924e80c447de218f0f90a23e52e918dc77 files/digest-jaxen-1.1_beta2-r1 262 diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta2-r1 b/dev-java/jaxen/files/digest-jaxen-1.1_beta2-r1 deleted file mode 100644 index 2eba2190c85c..000000000000 --- a/dev-java/jaxen/files/digest-jaxen-1.1_beta2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4895bd92b7ca56f9dfe0ed8e0bea9869 jaxen-1.1-beta-2-src.tar.gz 697184 -RMD160 23594b3ec65a306826fe8b38bd16ee62c298764b jaxen-1.1-beta-2-src.tar.gz 697184 -SHA256 47d299f88cc7df0aedfd678f524de9c1028d727dc1aea1d663bce0ca38c76805 jaxen-1.1-beta-2-src.tar.gz 697184 diff --git a/dev-java/jaxen/files/jaxen-1.1_beta2-gentoo.diff b/dev-java/jaxen/files/jaxen-1.1_beta2-gentoo.diff deleted file mode 100644 index a3705474fe6e..000000000000 --- a/dev-java/jaxen/files/jaxen-1.1_beta2-gentoo.diff +++ /dev/null @@ -1,38 +0,0 @@ -*** build.xml.orig Wed Nov 10 14:45:16 2004 ---- build.xml Wed Nov 10 15:14:19 2004 -*************** -*** 25,34 **** - - - -! - - -! - - - ---- 25,35 ---- - - - -! -! - - - -*************** -*** 172,175 **** - - - -! -\ No newline at end of file ---- 173,176 ---- - - - -! diff --git a/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild b/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild deleted file mode 100644 index 14ccf11e9598..000000000000 --- a/dev-java/jaxen/jaxen-1.1_beta2-r1.ebuild +++ /dev/null @@ -1,57 +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/jaxen/jaxen-1.1_beta2-r1.ebuild,v 1.7 2006/11/30 15:47:36 caster Exp $ - -inherit java-pkg eutils - -DESCRIPTION="A Java XPath Engine" -HOMEPAGE="http://jaxen.org/" -SRC_URI="http://www.ibiblio.org/maven/jaxen/distributions/${PN}-1.1-beta-2-src.tar.gz" -LICENSE="jaxen" -SLOT="1.1" -KEYWORDS="amd64 ppc x86" -IUSE="doc jikes source" - -RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* ) - >=dev-java/xerces-2.7 - =dev-java/dom4j-1* - ~dev-java/jdom-1.0_beta9" - -DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* ) - jikes? ( dev-java/jikes ) - dev-java/ant-core - >=sys-apps/sed-4 - ${RDEPEND}" - -S=${WORKDIR}/${PN}-1.1-beta-2 - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.diff - - mkdir -p target/lib - cd target/lib - java-pkg_jar-from xerces-2 - java-pkg_jar-from dom4j-1 - java-pkg_jar-from jdom-1.0_beta9 - - cd ${S} - sed -i 's/depends="compile,test"/depends="compile"/' build.xml -} - -src_compile() { - local antops="jar" - use jikes && antops="${antops} -Dbuild.compiler=jikes" - use doc && antops="${antops} javadoc" - ant ${antops} || die "compile failed" -} - -src_install() { - java-pkg_newjar target/jaxen*.jar ${PN}.jar - - use doc && java-pkg_dohtml -r dist/docs/* - use source && java-pkg_dosrc src/java/main/* -} -