dev-java/jgrapht: version bump

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

4 files changed, 96 insertions, 2 deletions

diff --git a/dev-java/jgrapht/ChangeLog b/dev-java/jgrapht/ChangeLog
index ce4ab9c46a3b..44f8f48b66bc 100644
--- a/dev-java/jgrapht/ChangeLog
+++ b/dev-java/jgrapht/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jgrapht
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.6 2011/01/23 17:03:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.7 2011/12/25 21:15:11 fordfrog Exp $
+
+*jgrapht-0.8.2 (25 Dec 2011)
+
+  25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> +jgrapht-0.8.2.ebuild,
+  +files/DOTExporter-nullpointer.patch:
+  Version bump (thanks to Elliott Rezny <erezny@gmail.com> for the ebuild)
 
   23 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> jgrapht-0.7.3.ebuild:
   Mark ~ppc wrt #301239
diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
index fb3c3bbb15fd..9c0544151323 100644
--- a/dev-java/jgrapht/Manifest
+++ b/dev-java/jgrapht/Manifest
@@ -1,4 +1,7 @@
+AUX DOTExporter-nullpointer.patch 1351 RMD160 08c394ebae912cd5443ee6d44f0739d6db676090 SHA1 17e09c519ec2eb67ddd6cae69d24314c47f67398 SHA256 5658ff63c2a16079054d4a6615cbf4e396bc89fb29e62b6c0abeb8de3a56a43a
 DIST jgrapht-0.7.3.tar.gz 1139550 RMD160 2f5c1078fd0d56b7797309684feb3cdea846a960 SHA1 d4d9b3995bce37616077130d1262c1c6c0be8e0e SHA256 9b7911e69ba4c28417aa160baa9556259dd8849aa756787c229cb44d58878af3
+DIST jgrapht-0.8.2.tar.gz 1255878 RMD160 01e533f1c20ace3d24398c87d8b0bf05ef36a10a SHA1 ca91e0b212f9c97ae6861168a3cc19bc0c7da7d7 SHA256 49a681e5e57940a0f5bb9fa48f38f7cc27d0c75bb181794f1971e900270513ae
 EBUILD jgrapht-0.7.3.ebuild 1179 RMD160 942b85c44f59fe5cb88c2bcc0f8184a6e3c30a8f SHA1 2f00542ebab11b1db03a0f601408be2c8a791083 SHA256 5561d906c18835e5b731646fd876e70c109f28e49314f2cfc9f6e24b39e2c395
-MISC ChangeLog 1083 RMD160 e15b2c59b65df84874e1f85fdf7a0f84d9ecca9b SHA1 a99fe0f55f0b359dba7e48d8da1e6e72755b7a38 SHA256 ccd658f111958b0b7ea3b91ac062c9179ff4e2e1686950d8592d95382bbce3b5
+EBUILD jgrapht-0.8.2.ebuild 1238 RMD160 42fffd736427c7e652bf5cfb204ccc8610ef3f8a SHA1 268774def17bc535926aa30ec0781e38d0d8f833 SHA256 6fe92d0d0baa2648597b1e56e8d1378dfa648574c9676203369297e4c48fc21e
+MISC ChangeLog 1302 RMD160 5d67cf0a4c6304b89b152647d0444a722a4e9eec SHA1 1028995c0bcc06fe7040a8c03757d94c54fc975d SHA256 c44d8c9362d9414225b2b80b078f071710cbdd31df2fe919b0176110ed3cd74f
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
diff --git a/dev-java/jgrapht/files/DOTExporter-nullpointer.patch b/dev-java/jgrapht/files/DOTExporter-nullpointer.patch
new file mode 100644
index 000000000000..5c7b0ee2250a
--- /dev/null
+++ b/dev-java/jgrapht/files/DOTExporter-nullpointer.patch
@@ -0,0 +1,36 @@
+--- src/org/jgrapht/ext/DOTExporter.java	2010-11-27 23:36:27.000000000 -0600
++++ DOTExporter.java	2011-12-07 21:06:03.041369519 -0600
+@@ -152,7 +152,7 @@
+             if (vertexLabelProvider != null) {
+                 labelName = vertexLabelProvider.getVertexName(v);
+             }
+-            Map<String, String> attributes = null;
++            Map<String, String> attributes = new HashMap<String, String>();;
+             if (vertexAttributeProvider != null) {
+                 attributes = vertexAttributeProvider.getComponentAttributes(v);
+             }
+@@ -200,14 +200,16 @@
+         if (labelName != null) {
+             out.print("label=\"" + labelName + "\" ");
+         }
+-        for (Map.Entry<String, String> entry : attributes.entrySet()) {
+-            String name = entry.getKey();
+-            if (name.equals("label")) {
+-                // already handled by special case above
+-                continue;
+-            }
+-            out.print(name + "=\"" + entry.getValue() + "\" ");
+-        }
++	if (attributes != null) {
++	    for (Map.Entry<String, String> entry : attributes.entrySet()) {
++		String name = entry.getKey();
++		if (name.equals("label")) {
++		    // already handled by special case above
++		    continue;
++		}
++		out.print(name + "=\"" + entry.getValue() + "\" ");
++	    }
++	}
+         out.print("]");
+     }
+ 
diff --git a/dev-java/jgrapht/jgrapht-0.8.2.ebuild b/dev-java/jgrapht/jgrapht-0.8.2.ebuild
new file mode 100644
index 000000000000..fabac9640cbf
--- /dev/null
+++ b/dev-java/jgrapht/jgrapht-0.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/jgrapht-0.8.2.ebuild,v 1.1 2011/12/25 21:15:11 fordfrog Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Graph library that is a simpler and faster alternative to JGraph"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://jgrapht.sourceforge.net"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="test"
+
+CDEPEND="dev-java/touchgraph-graphlayout:0
+	dev-java/jgraph:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit
+		dev-java/xmlunit:1 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="touchgraph-graphlayout jgraph"
+EANT_DOC_TARGET="javadoc"
+
+java_prepare() {
+	rm -rf "${S}/lib" || die
+	rm -v "${S}"/*.jar || die
+	epatch "${FILESDIR}"/DOTExporter-nullpointer.patch
+}
+
+src_install() {
+	java-pkg_newjar ${PN}*.jar || die
+
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/org
+}
+
+src_test() {
+	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} xmlunit:1" ANT_TASKS="ant-junit" eant test
+}