summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-01-25 04:14:00 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-01-25 04:14:00 +0000
commit3c69c170d682a68bdd6ffc070cd25e9b5f731d52 (patch)
treebbbd7710aca42014ccc829280ffebe76b0602fb5 /dev-java
parent(#118583) Add modular X deps. (diff)
downloadgentoo-2-3c69c170d682a68bdd6ffc070cd25e9b5f731d52.tar.gz
gentoo-2-3c69c170d682a68bdd6ffc070cd25e9b5f731d52.tar.bz2
gentoo-2-3c69c170d682a68bdd6ffc070cd25e9b5f731d52.zip
Added patch to fix bug #99642. Contributed by Gergan Penkov <gpp666_999@yahoo.de>
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/xdoclet/ChangeLog9
-rw-r--r--dev-java/xdoclet/Manifest13
-rw-r--r--dev-java/xdoclet/files/xdoclet-modules_common_ent.patch9
-rw-r--r--dev-java/xdoclet/xdoclet-1.2.2.ebuild7
4 files changed, 23 insertions, 15 deletions
diff --git a/dev-java/xdoclet/ChangeLog b/dev-java/xdoclet/ChangeLog
index 89a7c59e55a1..d6bbab111652 100644
--- a/dev-java/xdoclet/ChangeLog
+++ b/dev-java/xdoclet/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/xdoclet
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.14 2005/12/16 01:47:58 nichoj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.15 2006/01/25 04:14:00 nichoj Exp $
+
+ 25 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+ +files/xdoclet-modules_common_ent.patch, xdoclet-1.2.2.ebuild:
+ Added patch to fix bug #99642. Contributed by Gergan Penkov
+ <gpp666_999@yahoo.de>
16 Dec 2005; Joshua Nichols <nichoj@gentoo.org> xdoclet-1.2.2.ebuild:
Added missing dependency on dev-java/ant-tasks. Added ~amd64 keyword.
diff --git a/dev-java/xdoclet/Manifest b/dev-java/xdoclet/Manifest
index 74d120dce837..ee4e76acab93 100644
--- a/dev-java/xdoclet/Manifest
+++ b/dev-java/xdoclet/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 50caca02c1a5f533f96bbb5a9472caf0 ChangeLog 2020
MD5 6d6f9189f4ecffc98c1b539a0b647cc3 files/digest-xdoclet-1.2.1 139
MD5 5a7e75c3d62a58edfa3c2416acfbb69a files/digest-xdoclet-1.2.2 67
MD5 36b04e593588b126ef0e905e4ead4fcf files/xdoclet-1.2.2-buildfile.patch 2518
MD5 0c3cfa2caf87830c10fb14bc83840c98 files/xdoclet-1.2.2-interface.patch 10893
+MD5 d75eedba572b2088b2ac96c09ee5661b files/xdoclet-modules_common_ent.patch 369
MD5 2f0b8cbc0e0adf36b678725712a3e3b7 metadata.xml 511
MD5 23eedf023b42c74cebfac4887dbc1231 xdoclet-1.2.1.ebuild 1476
-MD5 e25a78c51378484801913287a2a308ad xdoclet-1.2.2.ebuild 1539
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDohzvndWRXhKOboURAgqNAKDx0HkEUK8ixSf12fsjxBhg8moRBgCguVcm
-rl39O78nkN7iEXlYyjWWK3c=
-=Z+gM
------END PGP SIGNATURE-----
+MD5 cb5deb0a7c842ce80da0b5a60f4d9528 xdoclet-1.2.2.ebuild 1590
diff --git a/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch b/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch
new file mode 100644
index 000000000000..8db9e5f84ec3
--- /dev/null
+++ b/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch
@@ -0,0 +1,9 @@
+--- modules/modules-common.ent.orig 2005-02-23 15:47:39.000000000 -0500
++++ modules/modules-common.ent 2005-02-23 17:25:17.000000000 -0500
+@@ -294,5 +294,6 @@
+ out="${module.tag.doclipse.file}"
+ extension=".xml"
+ style="${docs.stylesheets.dir}/doclipse.xslt">
++ <xmlcatalog refid="xtags"/>
+ </xslt>
+ </target>
diff --git a/dev-java/xdoclet/xdoclet-1.2.2.ebuild b/dev-java/xdoclet/xdoclet-1.2.2.ebuild
index b99e492211e1..3ef9bf5124f5 100644
--- a/dev-java/xdoclet/xdoclet-1.2.2.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.2.ebuild,v 1.5 2005/12/16 01:47:58 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.2.ebuild,v 1.6 2006/01/25 04:14:00 nichoj Exp $
inherit java-pkg eutils
@@ -33,6 +33,9 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-interface.patch
epatch ${FILESDIR}/${P}-buildfile.patch
+ # Fixes problems experienced when behind a proxy.
+ # Contributed by Gergan Penkov <gpp666_999@yahoo.de> bug #99642
+ epatch ${FILESDIR}/${PN}-modules_common_ent.patch
cd ${S}/lib && rm -f *.jar
java-pkg_jar-from xjavadoc