amd64/x86 stable wrt bug #525010; Drop old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 16 insertions, 80 deletions

diff --git a/dev-java/appframework/ChangeLog b/dev-java/appframework/ChangeLog
index a576f8740e8c..9fbfd81f1714 100644
--- a/dev-java/appframework/ChangeLog
+++ b/dev-java/appframework/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/appframework
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/appframework/ChangeLog,v 1.9 2014/08/10 20:07:55 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/appframework/ChangeLog,v 1.10 2015/01/06 20:27:03 zlogene Exp $
+
+  06 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> -appframework-1.03-r2.ebuild,
+  appframework-1.03-r3.ebuild:
+  amd64/x86 stable wrt bug #525010; Drop old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   appframework-1.03-r2.ebuild, appframework-1.03-r3.ebuild:
diff --git a/dev-java/appframework/Manifest b/dev-java/appframework/Manifest
index e589b4b0f1de..01e249bd6e33 100644
--- a/dev-java/appframework/Manifest
+++ b/dev-java/appframework/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 DIST AppFramework-1.03-src.zip 413438 SHA256 9fad98a0b70e6c67cc38dfe9d01b00fe7b7fedf51fa50ac68e7a86d7d1c38fcd SHA512 7d24329361f0d5f2225a7248ba30b1f0db364efd93e0581e1f10d0f8e2b6354f9d578d585ff1a08b27846dfae0b805b0f609711234be616b3f0a065dc1801309 WHIRLPOOL ef3e4ea022bc3f902334255e26703bc12910f939aa87c12dd6191326c33b2ea9da3abfbf5f29d6d5fa8ad6e65af329520c7cc7c90e36407a1b7b6f384f13c8ea
-EBUILD appframework-1.03-r2.ebuild 1702 SHA256 1676c5e5b39ff8d079eb162abc6d5fa3d4a87e8bf31a914257f335a8503ffbf3 SHA512 96db2eb65975d2005626599ee3c539854da7e26cfc59eb123700870ab7e732e9f2820598f7d0555a97f39d029085f2f3414ea6dc55f5a1cf6edc7d24f180cb96 WHIRLPOOL 870818e574645c156c6b1413d3264b1a32389ce4c5173bec364b0bb0d2dd5d28f81e0fa3273c6f61c7c3dbb438e3ebbbade0cd5fd8ee732150a0490282064b92
-EBUILD appframework-1.03-r3.ebuild 1681 SHA256 330d6da2e8f851ff380f4553b120f826462911651b2426874e8da89b6c60b51b SHA512 bc8986e99f17b3388289e1f1939388c35445e8b6c1fe3ef2b6e62c3a483e7ec761ab0f2c7c891a54dce31ad7613526dec7548ef8c1f7622d58de294a2a38a390 WHIRLPOOL a1e8b0311387a688245107965cf2c49dd4ad00e61419e7f74d008eb06213be8cfd5e393294abd2e204da67538ed5f60cf2763ca107e826db96a09f70cfc3f54b
-MISC ChangeLog 2046 SHA256 73ae550623f9bd8964498b67b24e4be525c186e8f5a316e61031485b70e7c3c8 SHA512 167824115c9e1220a393b26cb4a92448726a840e8b940d0c89be3d5f98284635c6da8beeef2e3190902594cb941e9ef93a1350c5d80afaf0ef87a59d3efc711e WHIRLPOOL 2b8306b8bfb06524348c2ef26ebb7b25f3351ced1edf11b0a8c7d611fb1cfffd8d57434c8a5ddaf9a9f72631062c88fac512dd34dd70c5de4a3d1f43d90a3dd9
+EBUILD appframework-1.03-r3.ebuild 1680 SHA256 2ec15cb867a84aaeb5989513660ee0d4d68cb33afa8b9b0d80ec8bacd5a0f982 SHA512 52805da4df607bf588d8833570a8fad3dd3707249a8f88653f6750f837adfef192601a86db277fb2f65459c3eca2199d4075e99c3eaf28e9ec816d14fbadd729 WHIRLPOOL 8ff8ae94c30e538d98ba69031e3d22d9a900a56881a13c76ff834cebce95d39e33aff398cda06ec1ef19d7a5df303d3d4cef3db38d7206fec150e3ca863a9c02
+MISC ChangeLog 2206 SHA256 3ddeec6d3a5a45b9b6e80ca41db769e0cc36972ca04c9017d57d4a20a81e81f5 SHA512 43c492bbc4ebbd0e8b057ebbca2565d8a52a8bc89ac0e2eeee52340a917ccc2354a6d6332b6f1dd3314c487bc738ee27032505de065cd0b987e4d8c7845f2a51 WHIRLPOOL 1ab5f8f1cdc9c7065affe4e11d963f5112d5c7c6f3ed8ec3693b184ebabcc4ffc58f3e6c20f02fff5de169fe2eb823f83af73888216fd4658750ceb50319a9a1
 MISC metadata.xml 912 SHA256 eb3a923ee0473f7dd1cc727aa7c44d1a49755de1a10a4c93e22b22c49ee4db57 SHA512 61f71158eb12e433ec23955a2853cac6778531c1be97468f96a3041887c8ce804bae5acf68a5844535b7f0c5397e72ded07e5ce39e35ce2f5afa95ff2d2059b8 WHIRLPOOL 587bfb345184bdbea93a9c3b28b9926b2f80fc1a6ecab04f40beb4ea1fe819a53a060e2357d14618eab10d56c4b0200a73b6890fed0efbc782015a6b633a0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0RsACgkQcaHudmEf86r48QCfSZXO3SzRtROXiUuAi5egaAcv
-0TUAn2qol86sjaIAiMqKRAZKYl4QUqCJ
-=larI
+iJwEAQEIAAYFAlSsRLoACgkQG9wOWsQutdahVQQAh+v0LnXDtih1v/l2u2ScZCHt
+BoALePxN4yoHF+uSCjPvf4t65dQ/bhSOaNYW4qxXHdr/vzMr07Rv5P45EkszMiAX
+NiOsHGrzQIml4a42vlII63W9ARYlRS0XKiXUmwlphXyI4k4rKYyyRlmPPWbFqwk/
+oxzuMMYjm+FOXyys2NA=
+=nJI7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/appframework/appframework-1.03-r2.ebuild b/dev-java/appframework/appframework-1.03-r2.ebuild
deleted file mode 100644
index 64bb37b3936a..000000000000
--- a/dev-java/appframework/appframework-1.03-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/appframework/appframework-1.03-r2.ebuild,v 1.4 2014/08/10 20:07:54 slyfox Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="AppFramework"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A small set of Java classes that simplify building desktop applications"
-HOMEPAGE="https://appframework.dev.java.net/"
-SRC_URI="https://appframework.dev.java.net/downloads/${MY_P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/swing-worker"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/jnlp-api
-	app-arch/unzip
-	${COMMON_DEP}
-	test?
-	(
-		dev-java/junit:0
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/${MY_P}"
-RESTRICT="test"
-
-EANT_GENTOO_CLASSPATH="swing-worker"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	rm -v lib/*.jar || die
-	java-ant_rewrite-classpath
-	java-ant_rewrite-classpath nbproject/build-impl.xml
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only jnlp-api)"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar "${S}/dist/AppFramework.jar" "${PN}.jar"
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples src/examples/*
-}
-
-src_test() {
-	local cp=$(java-pkg_getjars --build-only junit):$(java-pkg_getjars swing-worker)
-	ANT_TASKS="ant-junit" eant \
-		-Duser.home="${T}" \
-		-Drun.test.classpath="${cp}:dist/${MY_PN}.jar:build/test/classes" \
-		-Dgentoo.classpath="${cp}" test
-}
diff --git a/dev-java/appframework/appframework-1.03-r3.ebuild b/dev-java/appframework/appframework-1.03-r3.ebuild
index 845844e8f4e4..9603b51a3d8e 100644
--- a/dev-java/appframework/appframework-1.03-r3.ebuild
+++ b/dev-java/appframework/appframework-1.03-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/appframework/appframework-1.03-r3.ebuild,v 1.2 2014/08/10 20:07:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/appframework/appframework-1.03-r3.ebuild,v 1.3 2015/01/06 20:27:03 zlogene Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="https://appframework.dev.java.net/downloads/${MY_P}-src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="dev-java/swing-worker:0"