Moved the very long description to metadata.xml and cleaned up the ebuild.

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/dev-java/tagsoup/ChangeLog b/dev-java/tagsoup/ChangeLog
index bf736f14fc6ae6ff74c9693d2f4e9af42efd8f7a..484b9529a28a2387fe0f523a9690baf85911125c 100644 (file)
--- a/dev-java/tagsoup/ChangeLog
+++ b/dev-java/tagsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tagsoup
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/ChangeLog,v 1.11 2006/12/09 09:25:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/ChangeLog,v 1.12 2006/12/20 21:11:53 betelgeuse Exp $
+
+  20 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
+  tagsoup-0.10.2-r1.ebuild:
+  Moved the very long description to metadata.xml and cleaned up the ebuild.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   tagsoup-0.10.2-r1.ebuild:

diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index 1879e1ad07427d141db1e2d3de27f71da81f5887..eb791c78fe1547e66fd360d5b2944886742a5531 100644 (file)
--- a/dev-java/tagsoup/Manifest
+++ b/dev-java/tagsoup/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA1
 
 DIST tagsoup-0.10.2-src.zip 63115 RMD160 4f1e6c5e56e50f742f460829952044b40c08bae8 SHA1 ec8e5ef85f1095ce630492e8e3332981b75ae210 SHA256 40648a99e910769cf029a3e526f564f254bd05add803871387e5d0b1fa2affc1
-EBUILD tagsoup-0.10.2-r1.ebuild 1103 RMD160 9df6137b95590920e167bdb41eaa2b949cc5c760 SHA1 831694349a1af3a22806a3cd966d3feffac5fb2f SHA256 289a9f248e1f141ba2926c286e54635ea4bd914fc0ec4898f54b2ee903fb1cfd
-MD5 222262286ca0c0e4576bc223268c4ea5 tagsoup-0.10.2-r1.ebuild 1103
-RMD160 9df6137b95590920e167bdb41eaa2b949cc5c760 tagsoup-0.10.2-r1.ebuild 1103
-SHA256 289a9f248e1f141ba2926c286e54635ea4bd914fc0ec4898f54b2ee903fb1cfd tagsoup-0.10.2-r1.ebuild 1103
+EBUILD tagsoup-0.10.2-r1.ebuild 902 RMD160 0e6786bbee8c9e70a6c52049dcbe5a3b2ad224e1 SHA1 bce482a72fe801865d5805798d67ce4438b22eee SHA256 285990fdedaf6050e92c99c54e63ed6b6c0a83bfc8c50a9dc9c7b9a8fb5ebb71
+MD5 04afb77784beb23eee5c5a2e6de445ec tagsoup-0.10.2-r1.ebuild 902
+RMD160 0e6786bbee8c9e70a6c52049dcbe5a3b2ad224e1 tagsoup-0.10.2-r1.ebuild 902
+SHA256 285990fdedaf6050e92c99c54e63ed6b6c0a83bfc8c50a9dc9c7b9a8fb5ebb71 tagsoup-0.10.2-r1.ebuild 902
 EBUILD tagsoup-0.10.2.ebuild 1165 RMD160 3df1f38c68cdaabdb066a7ed17f136f3595d7cc4 SHA1 bd5631e66c25d9de33f2eef846b63679d6e974af SHA256 a87776b4279b04e43cbd66beba5ac13a3e68abec48696b0184dd89ef5df29fc8
 MD5 a1d0fad121118497e2024676ec80c8f0 tagsoup-0.10.2.ebuild 1165
 RMD160 3df1f38c68cdaabdb066a7ed17f136f3595d7cc4 tagsoup-0.10.2.ebuild 1165
 SHA256 a87776b4279b04e43cbd66beba5ac13a3e68abec48696b0184dd89ef5df29fc8 tagsoup-0.10.2.ebuild 1165
-MISC ChangeLog 1605 RMD160 95572b38b81138f87d0b3b9303a17f031f678d2d SHA1 a8d1d15791ef86bf192ebea0649c5ecb6c19faf7 SHA256 1254ce30ad7db52ff1669a5fca1ce74fb408240bb8399f1cf7e5f82efe561392
-MD5 5e0a4a96b0f86d9ef84b3704c90df9b8 ChangeLog 1605
-RMD160 95572b38b81138f87d0b3b9303a17f031f678d2d ChangeLog 1605
-SHA256 1254ce30ad7db52ff1669a5fca1ce74fb408240bb8399f1cf7e5f82efe561392 ChangeLog 1605
-MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
-SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+MISC ChangeLog 1779 RMD160 d4278f73c764362626c53947fc1c4aab358ad681 SHA1 718bb96c7151f56474c632db10b9f0481f098701 SHA256 c28ac53781873d6ce3a33b736fc20d2ea7ea2e42c1c9290f07bc31636ee474db
+MD5 c166b6d272b2a3fc8499950be8c30e4b ChangeLog 1779
+RMD160 d4278f73c764362626c53947fc1c4aab358ad681 ChangeLog 1779
+SHA256 c28ac53781873d6ce3a33b736fc20d2ea7ea2e42c1c9290f07bc31636ee474db ChangeLog 1779
+MISC metadata.xml 423 RMD160 d59c03d53cbf6de7942604cbf69e24e16473fe7a SHA1 69edd979c37d4cf050f81b314a8d380097c4bc29 SHA256 c66aba8d54011bf2679dd23b327fcb991c0378061bbf0fc97b984301477a11ad
+MD5 c8c7cf9dcee8db7bcbe94b0fe702792b metadata.xml 423
+RMD160 d59c03d53cbf6de7942604cbf69e24e16473fe7a metadata.xml 423
+SHA256 c66aba8d54011bf2679dd23b327fcb991c0378061bbf0fc97b984301477a11ad metadata.xml 423
 MD5 0f1e79192e6367cc6fcda70d44ee522d files/digest-tagsoup-0.10.2 244
 RMD160 658b43f2b6e78255e77aa26402b60f8b3dd9064c files/digest-tagsoup-0.10.2 244
 SHA256 766e889557d0d9386cca9d90299bd0272f9c0abf4b5a69bc92fb3f897c7f39fe files/digest-tagsoup-0.10.2 244
@@ -27,7 +27,7 @@ SHA256 766e889557d0d9386cca9d90299bd0272f9c0abf4b5a69bc92fb3f897c7f39fe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFeoEjAiZjviIA2XgRAqrxAKC0rf5d5/WV5BY0H52Jhlvq1VhHfgCgm15j
-2HXTGOngDVM+u+FoS27t6c4=
-=9B5U
+iD8DBQFFiac7cxLzpIGCsLQRAjZ9AJ9MtZnen0b5D7RHxdAN5uqG+m16ZQCfYkon
+roXcHqQRNKfMemOpujKPaDg=
+=Iz4y
 -----END PGP SIGNATURE-----

diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
index 7303cef9696423b08062072773a9ea8ab5a6bd4f..4618b26cc2d834854c325f4bbac374c567c77a87 100644 (file)
--- a/dev-java/tagsoup/metadata.xml
+++ b/dev-java/tagsoup/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>java</herd>
+       <longdescription>
+               This is the home page of TagSoup, a SAX-compliant parser written
+               in Java that, instead of parsing well-formed or valid XML, parses
+               HTML as it is found in the wild: nasty and brutish, though quite
+               often far from short.
+       </longdescription>
 </pkgmetadata>

diff --git a/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild b/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild
index 78ed2a5fb4fffdbd66f483d70c03ccbe0ab4afb5..a5d7fd1f8501f000ce24d41c6c47c6a79439f7dc 100644 (file)
--- a/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild
+++ b/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild,v 1.3 2006/12/09 09:25:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild,v 1.4 2006/12/20 21:11:53 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="This is the home page of TagSoup, a SAX-compliant parser written in Java that, instead of parsing well-formed or valid XML, parses HTML as it is found in the wild: nasty and brutish, though quite often far from short."
+DESCRIPTION="A SAX-compliant parser written in Java."
 
 HOMEPAGE="http://mercury.ccil.org/~cowan/XML/tagsoup/"
 SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
@@ -12,6 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc source"
+
+# Needs the xslt task so full ant here
 DEPEND=">=virtual/jdk-1.4
        app-arch/unzip
        dev-java/ant
@@ -19,15 +21,13 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 
 src_compile() {
-       local antflags="dist"
-       use doc && antflags="${antflags} docs-api"
-       eant ${antflags} || die "compile failed"
+       eant $(use_doc docs-api) dist
 }
 
 src_install() {
        java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
 
        dodoc CHANGES README TODO
-       use doc && java-pkg_dohtml -r docs/*
-       use source && java-pkg_dosrc src/java/*
+       use doc && java-pkg_dojavadoc docs/api
+       use source && java-pkg_dosrc src/{java,templates}/*
 }