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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

3 files changed, 9 insertions, 74 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/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"