From: Patrice Clement <monsieurp@gentoo.org>
Date: Sat, 4 Apr 2015 19:29:03 +0000 (+0000)
Subject: Version bump courtesy of William L. Thomson Jr. <wlt@obsidian-studios.com>. Fix bug... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce037a7558ab4f0bd5d3f864f6be190f9031f36c;p=gentoo.git

Version bump courtesy of William L. Thomson Jr. <wlt@obsidian-studios.com>. Fix bug 496986.

Signed-off-by: monsieurp@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8
---

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 65ff4d6f7943..21652f28f6ba 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdom
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.75 2015/04/04 18:32:29 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.76 2015/04/04 19:28:53 monsieurp Exp $
+
+*jdom-2.0.6 (04 Apr 2015)
+
+  04 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +jdom-2.0.6.ebuild:
+  Version bump courtesy of William L. Thomson Jr. <wlt@obsidian-studios.com>.
+  Fix bug 496986.
 
 *jdom-1.1.3 (04 Apr 2015)
 
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 47b154b0e0da..972971868d0d 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
 DIST jdom-1.1.3.tar.gz 4233403 SHA256 d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 WHIRLPOOL b9f610001e152c41fcd3a0328b4ff563b33220f2cde8571ba09dd9063bc63fe51af80229c2bfdd7aeff4a0b354cd04a8d11f9fccb42b8620b2225c6f9ecd38e0
+DIST jdom-2.0.6.zip 7464948 SHA256 86b8683187ca28a935991cbffe5d1a9cfe88e5141e14905694a95e832f775b12 SHA512 dc84ede1eb05f7178a7f5b55f4035655096becee483966d7e0934484522c5981a1fdca836ae9ea6f3d2538c50b7a3cb9029264cd6427f5308d3ac7666e160cff WHIRLPOOL d568a18d8fc369ec0cf2954b16d2360ac934726c93ea31a59d75bc1913a9b1fba5d7cd02f6822ab21000b8df51380f2087e8690a3b66352e8d1267809091b374
 DIST jdom-b10.tar.gz 3565663 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66 SHA512 afea09b55815d021691b682e0a2e006ebbee699e0fa879ffb17712896eea6453016ec49fd6eee8758565eae68f236d5dddcc7fc940dca76c0e580e69bb544f52 WHIRLPOOL 69e555bb7edbf6fd107f58e0f06954683e25f9be46bc9668cce2570ed1d20f285e09b19372288b8a7cd3c4de955f4d16ca54c9cb6c20c1f5966865f439f0b8d3
 DIST jdom-b9.tar.gz 3417274 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 SHA512 b210938c2ec539a59664586ef979d834817fba08c96d30fd9696a72ce3961693faa3ea3718687cd208cb35c4227c2e908b2ea9f981ba97b1991414f6347e0963 WHIRLPOOL f5059bb062986ace5ae4872afbf59333c8d9fbf676066135d5fe79806c28bea4c5e3ec8071e2c3fd546c6b4e4c4adafdbae187cc2c340cd78912f6b5d6a4b356
 EBUILD jdom-1.0-r2.ebuild 1747 SHA256 a56d6ce9dd36d9238e0f87c187293eba2d730eed2ce1cca6e799d9a437b58abb SHA512 00802a02c18b00a2a3252e39b599ae3cbfae2eac4eebafa696b51b0c5df28cdeadfa22ad44f265adfcf9d44022d95a4bedc0a0cb4f16a9bf49314bc95ed4e06d WHIRLPOOL c3021c2fff58ba5030284de42585d3d3ed431f3fb6e17b71ba64020b22f74d2269b04ec5ebf5e9a7882b3bed51beec06616ab1363af7e258fdb2ad7849bc86dc
@@ -12,16 +13,17 @@ EBUILD jdom-1.0_beta10-r6.ebuild 1783 SHA256 c109acaa7f2d38ce8759168d76fb11be649
 EBUILD jdom-1.0_beta9-r2.ebuild 1833 SHA256 4dfe5fae650af0c73267ed9349d27291fcb21d6d14c486e07c963dab09936e91 SHA512 1a5ff3176861fb3511e48433f9070c1b392bc6a02fbcdad3596044d72d3174245244feb2073c90455d0848086f1988ea1d48172e0ad132da05727c5d1562461f WHIRLPOOL 1d93e6196ae6ef6d9d862fde716169d3988aa32f84ab9d7b561cba9d3912d3e10eb4d93eed4dfa2495b8fac50fefcef1e735a1e00575e2832ec32f4dc30173f3
 EBUILD jdom-1.0_beta9-r4.ebuild 1455 SHA256 9905e6e2b00d7c8ebee7803556ccc1f0a5922f7b625e18b97627a2c73111cf52 SHA512 d66882ed4a96442d28598bdcf82d64826a3c3e6496431f93b8eadd8382c7729fbb0cdc4dc2547097b695ed6f1b38deb3977f1c73e997a6070d4eb413e6851d23 WHIRLPOOL 6885cefd97a7b92aa9f834ba4ca06597bb221d08a76550041c30190cf63fde60b23f9a22ecbbab481e547ab91f9d6c1eafb6ae66cae7c626d9427f292c552f1a
 EBUILD jdom-1.1.3.ebuild 1570 SHA256 b5dd7058bf07e945fbe5fa4f87e71cf769b471d77c3b878e1281e90c91abc5a7 SHA512 a06ce12a7931ffee709a7d78299c964a8ef6975ff9e9e27a6db9b4071f88b15d86c2788ed12b40acb55486d7a86e4258215a8f15070a549b005e0ea0bc4055d8 WHIRLPOOL 2b6c47353f1916ad24c57cd4189bd12909b87c0dae81200a5a2733d54259edaf9eef8eb0edf585bac5ec999c9168c69fa64821c2a1c8fa2cfd560f363f448636
-MISC ChangeLog 11583 SHA256 d2a8c9d441278621e7722fb74983e46256791b9afabd865d11dad28f2587dc33 SHA512 9eb71507b6646f115b9412693c011109263c3211c40909995cb485dceefcaa72e2351ce1444291ec1644abc99076f0965166b7b057f18da2aa72ecc04fdb2b42 WHIRLPOOL 5dba2c2c4a00cf2df6da99e5edd35a873d0e3bc22b0448ffd15e13fd1e301b241dbf9ab18c9822843ee2bd0e434aca6e36f576ec18248e158f84fde992453507
+EBUILD jdom-2.0.6.ebuild 1836 SHA256 32fe4843f233796f68e8cbae5acf352edddb35ba22460b5b3db99bd571d72910 SHA512 6dd63b03bbe68b466da5aac34f79826e4ac0b0736e5ffe5502b2babb9fab15bfef11ac3dd6579704150afd40c1711963d0ffc08e9d89d94404dc358ccbb61468 WHIRLPOOL 006a2bb032eb7765c84b56614e42a0c30a9633204c7d306cab78f687b121e6668ea1b74d4413fb1264f1fb9185c1b90b657da4e7622d01d01227c800fd849b7a
+MISC ChangeLog 11781 SHA256 ad7c2ea62bc5eb3b308c7c85087f6edc5ee5ff16da38304a118682c1733c53c9 SHA512 4c93f8207c882684173a256a2af77f60613d781f3413ce547dc96f03b7af4c848962361634feda108b2a87209be4161d23c0d27baf248697c3c3876fc7dd4597 WHIRLPOOL 5d9760d2410b7a99a289c2fa0bbd39bb41662a1f206e00f3622d145e4e91250a26ca616a79252d3909eca74178b62ebb1ce0cdc6c627fdc1846ffae27731a3bc
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVIC5AAAoJEJGRpfGTSRu4rE8IAJae2MotzycDYF6DMZu+yPmI
-Wdy2UInhH2SkbFY7cToktje5Ln6PTALPomwmOwkqJe22g6uoktVCF5WjP8jg/8Zr
-RrgV8PYb9KxQvzkMNVMDpVZyDVKkmx0g8chII350nuNlknbRNowYCyvhRs9jVrgM
-l1wV4rf2rBtjvxQ/yTLA7vNybfbCuV1lRRWqkDI67GAzqFc+Ffo0qr3pmw75wjVD
-RKP3Ks519lABq4yP756xUZwspNcwxMZ09CMlwg1eDjg/WDgzpaQiDDCutzm2zud2
-/twQ+O1VyzKOsYAMrWpnXFS0d/3aMuXyBYYk4AzEIF5yG2g8/ciBc5/Aa5CZAoc=
-=tF6P
+iQEcBAEBCAAGBQJVIDt6AAoJEJGRpfGTSRu4ZHUIAKYsPzVl/x0Gi700v5ecoGe3
+1NatzYIGP0cKTgbQ821eYOwPlNhQDY1xW7a96YJSoOjhPG4VUCykLP47XkDgAUMv
+n7EX1lDqmX1IE74/Lm2IUxLv1ZEIFTwe/6GZIKfb4UIiYp56yjr/daxrRrQfn1bC
+D7x1lnagEfEHtTgnmN31+YOK0+626qFZb++ssULvaPQ4DtsTTAfOqUuWPJyg9VK0
+z0MemvI6JizfCgEN/3I4b0tQaTfJKJlbHRQ3mNRKlvAq4PX6Ux1tHHZnAbP/hnrT
+M9HhyjO49fw8tXMXfgORD4sOMfu20ez/d8Kh/ufOfBGjovi3/DH3RLw7QkN1iRQ=
+=vpEG
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jdom/jdom-2.0.6.ebuild b/dev-java/jdom/jdom-2.0.6.ebuild
new file mode 100644
index 000000000000..f4437e4612ec
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-2.0.6.ebuild,v 1.1 2015/04/04 19:28:53 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="source test"
+
+#JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+COMMON_DEP="dev-java/iso-relax
+		dev-java/jaxen:1.1
+		dev-java/xalan
+		dev-java/xml-commons-external:1.4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	>=virtual/jdk-1.6"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./${P}-sources.jar
+}
+
+java_prepare() {
+	find "${S}" -name '*.jar' -delete || die
+	mkdir "${S}"/classes "${S}"/docs
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="$(java-pkg_getjars iso-relax,jaxen-1.1,xalan,xml-commons-external-1.4)"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i 's/PerfTest/PerfTemp/' "${T}"/src.list || die "Failed to rename PerfTest"
+		sed -i '/test/Id' "${T}"/src.list || die "Failed to remove test classes"
+		sed -i 's/PerfTemp/PerfTest/' "${T}"/src.list || die "Failed to rename PerfTest"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	# Disabled for the time being.
+	# if use doc; then
+	# 	ejavadoc -d "${S}"/docs -classpath ${cp} "@${T}"/src.list -quiet || die "javadoc failed"
+	# fi
+
+	cd "${S}"/classes
+	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	# Disabled for the time being.
+	# if use doc; then
+	# 	java-pkg_dojavadoc docs
+	# fi
+
+	dodoc README.txt LICENSE.txt || die
+	use source && java-pkg_dosrc org
+}