Some cleanups.

Package-Manager: portage-2.1.2_pre1

3 files changed, 16 insertions, 31 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index 85a6c230ff40..85532eff340e 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.5 2006/09/10 15:20:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.6 2006/09/24 01:57:11 nichoj Exp $
+
+  24 Sep 2006; Joshua Nichols <nichoj@gentoo.org> freemarker-2.3.8.ebuild:
+  Some cleanups.
 
   10 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   freemarker-2.3.8.ebuild:
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index d2f6767d3f85..48f26b1569fa 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freemarker-2.3.8-gentoo.patch 789 RMD160 d19c3be69848b6b2e4f12d89862d03441a776ccf SHA1 a84b0a09f24f7563f9769518b62e285bf65a34ff SHA256 ca7d30c3c09ed163472e5e4af7a5d0498a0871e3982d22f69f21776425381961
 MD5 dbeddba11d9598366718929d24c16384 files/freemarker-2.3.8-gentoo.patch 789
 RMD160 d19c3be69848b6b2e4f12d89862d03441a776ccf files/freemarker-2.3.8-gentoo.patch 789
 SHA256 ca7d30c3c09ed163472e5e4af7a5d0498a0871e3982d22f69f21776425381961 files/freemarker-2.3.8-gentoo.patch 789
 DIST freemarker-2.3.8.tar.gz 2012911 RMD160 9638b9296fd1369d3c20dab6b4445c901a4c26a9 SHA1 59a40b3da9d38d64774a95708e7a980808ded0f6 SHA256 cf0507fbe4901946e1842c1b63ac95e4b8ed59c0ea27b4398e207428f07633bf
-EBUILD freemarker-2.3.8.ebuild 1222 RMD160 f61d1cdc0f1a80f5ce6ecfd7296b6571f36c00cf SHA1 6a67ba7d8886e40c8882ea16686f5ca73551b606 SHA256 53a2d3970c2d746e7166534bf2383573feb2df895e36eb769e9db4bd2f6eee4b
-MD5 4e7ab1a105f8028ebd26722a56879172 freemarker-2.3.8.ebuild 1222
-RMD160 f61d1cdc0f1a80f5ce6ecfd7296b6571f36c00cf freemarker-2.3.8.ebuild 1222
-SHA256 53a2d3970c2d746e7166534bf2383573feb2df895e36eb769e9db4bd2f6eee4b freemarker-2.3.8.ebuild 1222
-MISC ChangeLog 953 RMD160 02d6f523f286527faee7374f9e5228d45fc7ae12 SHA1 9389464e02d859e795f099bbffb89ee5d4dc46d8 SHA256 318264d3b33acfd422c872ba6872c00296c1f3dd3222f7701af654c074127802
-MD5 c78879f1a57dfa4b96185cd01b2d8127 ChangeLog 953
-RMD160 02d6f523f286527faee7374f9e5228d45fc7ae12 ChangeLog 953
-SHA256 318264d3b33acfd422c872ba6872c00296c1f3dd3222f7701af654c074127802 ChangeLog 953
+EBUILD freemarker-2.3.8.ebuild 1155 RMD160 345bb995b4775ce4e6b82b3cce3405ccc317b3da SHA1 b6b6a5486d40fb09c6709823e9e5fe4eb340c526 SHA256 e2ea02e1556336d0492a161a2229def18f6019b6005e6a2c56c2593ef878ba61
+MD5 f15ca33af7a6f4954fa15e3cd3244ec3 freemarker-2.3.8.ebuild 1155
+RMD160 345bb995b4775ce4e6b82b3cce3405ccc317b3da freemarker-2.3.8.ebuild 1155
+SHA256 e2ea02e1556336d0492a161a2229def18f6019b6005e6a2c56c2593ef878ba61 freemarker-2.3.8.ebuild 1155
+MISC ChangeLog 1044 RMD160 079bea10d63483217e3c36ac489b9032ebf7d2f3 SHA1 a3970299b4dcb6caead8cd4b77b5aa4ef6e748e1 SHA256 8255822953cfa67979a3c7bb32c947fe20a0f7b1191dbba3673cfec18958a066
+MD5 72c4920752f3282a8ba53fd06a93e0da ChangeLog 1044
+RMD160 079bea10d63483217e3c36ac489b9032ebf7d2f3 ChangeLog 1044
+SHA256 8255822953cfa67979a3c7bb32c947fe20a0f7b1191dbba3673cfec18958a066 ChangeLog 1044
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -21,10 +18,3 @@ SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata
 MD5 77299b15ef833c9e165b092ba4deddf3 files/digest-freemarker-2.3.8 253
 RMD160 463b4563edf3c38ebfcdf66cab52db346d68c0b6 files/digest-freemarker-2.3.8 253
 SHA256 71b172470989ef1a126d008c229fce0eace3477c8c0b67a91d2b427db6e4d993 files/digest-freemarker-2.3.8 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFBC1bgo/w9rxVVVERAryHAKCScrgCLlCfhTfv+fBSNAg5lG56vQCfZJ0W
-WYEWB7TAEIlPy3mxNekPhp8=
-=Qjib
------END PGP SIGNATURE-----
diff --git a/dev-java/freemarker/freemarker-2.3.8.ebuild b/dev-java/freemarker/freemarker-2.3.8.ebuild
index 423791dab0f2..50cd12f27952 100644
--- a/dev-java/freemarker/freemarker-2.3.8.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.8.ebuild,v 1.2 2006/09/10 15:20:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.8.ebuild,v 1.3 2006/09/24 01:57:11 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -23,28 +23,20 @@ RDEPEND=">=virtual/jre-1.4
 GETJARS_ARG="servletapi-2.3,jaxen-1.1"
 
 src_unpack() {
-
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-
 }
 
 src_compile() {
-
-	local antflags="jar -Djavacc.home=/usr/share/javacc/lib -lib $(java-pkg_getjars ${GETJARS_ARG})"
-	use doc && antflags="${antflags} javadoc"
-
-	eant clean ${antflags} || die "Compilation failed"
-
+	local antflags="-Djavacc.home=/usr/share/javacc/lib -lib $(java-pkg_getjars ${GETJARS_ARG})"
+	eant clean jar $(use_doc) ${antflags}
 }
 
 src_install() {
-
 	java-pkg_dojar lib/${PN}.jar
 	dodoc README.txt
 
 	use doc && java-pkg_dohtml -r build/api
-	use source && java-pkg_dosrc src
-
+	use source && java-pkg_dosrc src/*
 }