Small fixes, removed old version.

Package-Manager: portage-2.1.2.5

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index bcac5495342a21205b05985db01cd847654ddbab..d6024e24cf13497f1780fb29a1913822e62175c4 100644 (file)
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.10 2007/03/17 16:18:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.11 2007/04/28 15:01:29 nelchael Exp $
+
+  28 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/freemarker-2.3.8-gentoo.patch, -freemarker-2.3.8.ebuild,
+  freemarker-2.3.9.ebuild:
+  Small fixes, removed old version.
 
   17 Mar 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   freemarker-2.3.8.ebuild, freemarker-2.3.9.ebuild:

diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index 6358978806fe4740a4e2ba44f9e78f33e3db4de8..3a67eae58499d66dbcec425067e14973173a3871 100644 (file)
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,42 +1,30 @@
 -----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
 AUX freemarker-2.3.9-gentoo.patch 2477 RMD160 67e7cf681ee8ee999e0b2a5625f682d185839722 SHA1 c7a411218394a07a9d3f1bac7f7b133cfbc005fa SHA256 b567c5d975a820af31b8b5cc13e17529fee05cd8178fd38125de681ac9a42744
 MD5 03ec18b10011301b5dc0c52a6b420de0 files/freemarker-2.3.9-gentoo.patch 2477
 RMD160 67e7cf681ee8ee999e0b2a5625f682d185839722 files/freemarker-2.3.9-gentoo.patch 2477
 SHA256 b567c5d975a820af31b8b5cc13e17529fee05cd8178fd38125de681ac9a42744 files/freemarker-2.3.9-gentoo.patch 2477
-DIST freemarker-2.3.8.tar.gz 2012911 RMD160 9638b9296fd1369d3c20dab6b4445c901a4c26a9 SHA1 59a40b3da9d38d64774a95708e7a980808ded0f6 SHA256 cf0507fbe4901946e1842c1b63ac95e4b8ed59c0ea27b4398e207428f07633bf
 DIST freemarker-2.3.9.tar.gz 2016244 RMD160 b12965adcf7d33e887b7a0367caa94a01a2c5bb7 SHA1 38c8c1db197ea0db3da61a3df80cb96c76b3d138 SHA256 f9b462312bfbf22058e5d43683754a0a87294e5dff9bc1696b6ee48b0dafeefa
-EBUILD freemarker-2.3.8.ebuild 1126 RMD160 50f069161f5249bc724961034a18a25083c1190e SHA1 97d68c6bce5a486c414b15cc4c99fb1668fe3b93 SHA256 ebc3266452e4f22314e208816fc2bf3c47c6bd35482ff360f44cd3e53fad2155
-MD5 2b012d9b16aab7881123bf7e3765e7da freemarker-2.3.8.ebuild 1126
-RMD160 50f069161f5249bc724961034a18a25083c1190e freemarker-2.3.8.ebuild 1126
-SHA256 ebc3266452e4f22314e208816fc2bf3c47c6bd35482ff360f44cd3e53fad2155 freemarker-2.3.8.ebuild 1126
-EBUILD freemarker-2.3.9.ebuild 1426 RMD160 db8006ff21eb9c322090b9065e0e5ae14e38bc68 SHA1 6f4e62618babf791d971257b1b81d448cf0172da SHA256 4d2221bc66b59725da8c97ed87641f9f493123de075c1af65d01374ba4cd86a1
-MD5 af4ab82103518c19a739e230e31dea83 freemarker-2.3.9.ebuild 1426
-RMD160 db8006ff21eb9c322090b9065e0e5ae14e38bc68 freemarker-2.3.9.ebuild 1426
-SHA256 4d2221bc66b59725da8c97ed87641f9f493123de075c1af65d01374ba4cd86a1 freemarker-2.3.9.ebuild 1426
-MISC ChangeLog 1549 RMD160 c2d9489bb042b792a5783a7d8fb0c6d81c71ad6f SHA1 230343f01e83c84d9b47e808787636e58910f940 SHA256 d416a4cefd91603d6a59f11603ffbda2adddeb9591e3c501346d7798d7aa2c81
-MD5 4b2ac90ffbcfc0b66362fbeaca4e4a32 ChangeLog 1549
-RMD160 c2d9489bb042b792a5783a7d8fb0c6d81c71ad6f ChangeLog 1549
-SHA256 d416a4cefd91603d6a59f11603ffbda2adddeb9591e3c501346d7798d7aa2c81 ChangeLog 1549
+EBUILD freemarker-2.3.9.ebuild 1460 RMD160 defabd40f6c8dd8d24a0679c2fe34cebd6cb4786 SHA1 d9d09508875776af83c3bf3bb0357c5651aae77b SHA256 ce0833ab55e19c7fd5851a3486b30e8b3e28d3bb4691ff1a10865aaf6ebda392
+MD5 6564987cea38c18d7eb13b55d0539136 freemarker-2.3.9.ebuild 1460
+RMD160 defabd40f6c8dd8d24a0679c2fe34cebd6cb4786 freemarker-2.3.9.ebuild 1460
+SHA256 ce0833ab55e19c7fd5851a3486b30e8b3e28d3bb4691ff1a10865aaf6ebda392 freemarker-2.3.9.ebuild 1460
+MISC ChangeLog 1732 RMD160 a41371f453575fc92f4c7f176b4bdf1b55709313 SHA1 596d27d1197be1cff00dff3b3116f581b3c6d22f SHA256 a87ecd50b259b1f1d15f3331373eb740f3095b36959115348f17a378fffa16e5
+MD5 826eea02f37d247e099f612dedf7c2d1 ChangeLog 1732
+RMD160 a41371f453575fc92f4c7f176b4bdf1b55709313 ChangeLog 1732
+SHA256 a87ecd50b259b1f1d15f3331373eb740f3095b36959115348f17a378fffa16e5 ChangeLog 1732
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata.xml 229
-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
 MD5 44334ec3c158e1618813fb32f501080e files/digest-freemarker-2.3.9 253
 RMD160 e8d086f81140a9e26606fda2f4acd03bf31e8dab files/digest-freemarker-2.3.9 253
 SHA256 f419df8f4a06374d4a560a2f967e48d2a81b5ec10dc60666731067406e96c950 files/digest-freemarker-2.3.9 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/BV3go/w9rxVVVERAokZAJ4rltNCxbTvHE9E40kqo+uPyVwMmwCfXXA7
-XhxOb46CtcS+kB1KySpYZhE=
-=ir+n
+iD8DBQFGM2H+go/w9rxVVVERAgllAJ4titzVzRtyXIEulBd0Wjd6xxzhzACguTeo
+ui4cAyGcDtdufQ0jJq32r4Y=
+=XK6w
 -----END PGP SIGNATURE-----

diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.8 b/dev-java/freemarker/files/digest-freemarker-2.3.8
deleted file mode 100644 (file)
index 6701936..0000000
--- a/dev-java/freemarker/files/digest-freemarker-2.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1acd8d406245a5345960025f7ce9b109 freemarker-2.3.8.tar.gz 2012911
-RMD160 9638b9296fd1369d3c20dab6b4445c901a4c26a9 freemarker-2.3.8.tar.gz 2012911
-SHA256 cf0507fbe4901946e1842c1b63ac95e4b8ed59c0ea27b4398e207428f07633bf freemarker-2.3.8.tar.gz 2012911

diff --git a/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch
deleted file mode 100644 (file)
index 21a6345..0000000
--- a/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru freemarker-2.3.8.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java freemarker-2.3.8/src/freemarker/ext/rhino/RhinoFunctionModel.java
---- freemarker-2.3.8.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java  2006-07-25 14:38:15.000000000 +0200
-+++ freemarker-2.3.8/src/freemarker/ext/rhino/RhinoFunctionModel.java  2006-07-25 14:39:20.000000000 +0200
-@@ -37,7 +37,11 @@
-         for (int i = 0; i < args.length; i++) {\r
-             args[i] = wrapper.unwrap((TemplateModel)args[i], Scriptable.class);\r
-         }\r
-+              try {\r
-         return wrapper.wrap(((Function)getScriptable()).call(cx, \r
-                 ScriptableObject.getTopLevelScope(fnThis), fnThis, args));\r
-+              } catch (Exception e) {\r
-+                      throw new TemplateModelException(e.getMessage());\r
-+              }\r
-     }\r
- }\r

diff --git a/dev-java/freemarker/freemarker-2.3.8.ebuild b/dev-java/freemarker/freemarker-2.3.8.ebuild
deleted file mode 100644 (file)
index 1238673..0000000
--- a/dev-java/freemarker/freemarker-2.3.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.5 2007/03/17 16:18:09 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output based on templates."
-HOMEPAGE="http://freemarker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="freemarker"
-SLOT="2.3"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source doc"
-
-DEPEND=">=virtual/jdk-1.4
-       dev-java/jython
-       dev-java/ant"
-RDEPEND=">=virtual/jre-1.4
-       =dev-java/servletapi-2.3*
-       =dev-java/jaxen-1.1*
-       dev-java/javacc"
-
-GETJARS_ARG="servletapi-2.3,jaxen-1.1,jython"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-       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/*
-}

diff --git a/dev-java/freemarker/freemarker-2.3.9.ebuild b/dev-java/freemarker/freemarker-2.3.9.ebuild
index a79a5b2e472d8df8cc10aa7efe1b5c5755347d6a..4d0e820a9bb96e7e1df7d66cfdcddd86c3d89c91 100644 (file)
--- a/dev-java/freemarker/freemarker-2.3.9.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.9.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.9.ebuild,v 1.3 2007/03/17 16:18:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.9.ebuild,v 1.4 2007/04/28 15:01:29 nelchael Exp $
 
+JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-nodeps"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -13,16 +14,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="freemarker"
 SLOT="2.3"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source doc"
+IUSE=""
 
-DEPEND=">=virtual/jdk-1.4
-       dev-java/javacc
-       source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4
+COMMON_DEP="dev-java/javacc
        dev-java/jython
        =dev-java/servletapi-2.3*
        =dev-java/jaxen-1.1*"
 
+DEPEND=">=virtual/jdk-1.4
+       ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+       ${COMMON_DEP}"
+
 src_unpack() {
 
        unpack ${A}