Merged from Prefix overlay

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

4 files changed, 16 insertions, 11 deletions

diff --git a/dev-java/xmlgraphics-commons/ChangeLog b/dev-java/xmlgraphics-commons/ChangeLog
index 11f9c0436ef0..6b979393fa14 100644
--- a/dev-java/xmlgraphics-commons/ChangeLog
+++ b/dev-java/xmlgraphics-commons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmlgraphics-commons
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.19 2009/05/22 22:34:09 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.20 2010/04/24 16:26:47 grobian Exp $
+
+  24 Apr 2010; Fabian Groffen <grobian@gentoo.org>
+  xmlgraphics-commons-1.2.ebuild, xmlgraphics-commons-1.3.1.ebuild:
+  Merged from Prefix overlay
 
   22 May 2009; Vlastimil Babka <caster@gentoo.org>
   xmlgraphics-commons-1.2.ebuild:
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 6c785012dd08..3002407f2aa1 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,6 +1,6 @@
 DIST xmlgraphics-commons-1.2-src.tar.gz 430083 RMD160 d04f39242d95f9fd3ef307d8c483bcec35bdc2dd SHA1 0c16d6bc28eee8419bd9cb1e4645f699bd10c9f3 SHA256 1588fe182e62d3f3cf7c2acb7d0989b7134b94c95580256e4fe1b9c5e3a38663
 DIST xmlgraphics-commons-1.3.1-src.tar.gz 751502 RMD160 1bd32470860a9fdcde2141a1238bd7694a614146 SHA1 6254909e109cdb4d005e958aa10adf17bcc4ecd1 SHA256 1dd2acfe892af34196d5365addd8e106dd355a2b4bead5f44feea4edcfc452b1
-EBUILD xmlgraphics-commons-1.2.ebuild 2219 RMD160 42a2820ed81f4a91236b93d0f3709d82852e028d SHA1 c6330ae7141c8223856fc925efb484fd1c8d1af2 SHA256 f27b1184ce8b41a02e5e5004e21ad26eebb207e99b88a8806d754384d4dd5133
-EBUILD xmlgraphics-commons-1.3.1.ebuild 2110 RMD160 4a318182579348befb910ee4250ae24d8d05ffdd SHA1 1f2b38d8b40a3d8bb8230d158209e553e8d55444 SHA256 eeefbb57030e5fe4618cc6419b8f2cf52d46aad65698d2a7db9e07c4d2eb8994
-MISC ChangeLog 2741 RMD160 01b1ef7d089525e83b521309e5b06254f1f6eff0 SHA1 e699f574dd1e36f766256ee5843930300451b217 SHA256 feb6b873d30466280e55ab876896a722cee5206986dda05bdd6d2d14f1b4b70d
+EBUILD xmlgraphics-commons-1.2.ebuild 2299 RMD160 3f5ba7fabdb71746dd2ce19ed99bee869a100054 SHA1 b76c4e2527bea5456d383fc7f483a4b14ff2d9ac SHA256 b5b1ae90182049ed94d73218bb9f1df2830d68922d12bce6e15710a3492b966b
+EBUILD xmlgraphics-commons-1.3.1.ebuild 2185 RMD160 6bf9203c225aae19e1c6bfd6a8578f482acb167e SHA1 e8ee4224df712e6fbf14179a59af65b4641eb10f SHA256 101400223ba8fcf9cb331766d80d49c157c1c7d4203ff329e9942dd7775f2c53
+MISC ChangeLog 2891 RMD160 3dd462abd6af2d80ee10c586b034d76db3cdd510 SHA1 b0af6c80693ceba68e5b86be16a80f56d848486c SHA256 9d33402a362d965a550f2d0b04c3d3c1b7437713cce9f6a3e7e343979af90639
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild
index ff34d711ce2c..0464b776844b 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild,v 1.6 2009/05/22 22:34:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild,v 1.7 2010/04/24 16:26:47 grobian Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="jpeg"
 
 # fails connect to X even tho it sets java.awt.headless
@@ -27,6 +27,7 @@ DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
 				>=dev-java/ibm-jdk-bin-1.4
 				>=dev-java/jrockit-jdk-bin-1.4
 				dev-java/icedtea6
+				>=dev-java/apple-jdk-bin-1.4
 			)
 		)
 		test? (
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
index 98044540d51f..13122f81156e 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild,v 1.5 2009/03/09 21:17:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild,v 1.6 2010/04/24 16:26:47 grobian Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source test"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="jpeg"
 
 # fails connect to X even tho it sets java.awt.headless