Marked stable on bug #171179.

Package-Manager: portage-2.1.2.3

4 files changed, 7 insertions, 47 deletions

diff --git a/dev-java/javassist/ChangeLog b/dev-java/javassist/ChangeLog
index bcaa6e26f52d..94ccf5ee49c7 100644
--- a/dev-java/javassist/ChangeLog
+++ b/dev-java/javassist/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/javassist
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/ChangeLog,v 1.12 2007/03/19 02:36:42 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/ChangeLog,v 1.13 2007/04/02 16:27:57 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -javassist-2.6.ebuild,
+  javassist-2.6-r1.ebuild:
+  Marked stable on bug #171179.
 
   19 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -javassist-3.1_rc2-r1.ebuild:
diff --git a/dev-java/javassist/files/digest-javassist-2.6 b/dev-java/javassist/files/digest-javassist-2.6
deleted file mode 100644
index d81a26879645..000000000000
--- a/dev-java/javassist/files/digest-javassist-2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2eb827840fb4d2fc0381bb34e6d1b8d2 javassist-2.6.zip 1143271
-RMD160 3a347906edd778f9aec39a82021a0d6bb9c168fd javassist-2.6.zip 1143271
-SHA256 c77a56714df64996c704c76718d07ea97f582c6eba20711bfd9ecbd468bd02e8 javassist-2.6.zip 1143271
diff --git a/dev-java/javassist/javassist-2.6-r1.ebuild b/dev-java/javassist/javassist-2.6-r1.ebuild
index 459d0e1f0bcf..26b26936fef4 100644
--- a/dev-java/javassist/javassist-2.6-r1.ebuild
+++ b/dev-java/javassist/javassist-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/javassist-2.6-r1.ebuild,v 1.4 2007/03/18 13:09:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/javassist-2.6-r1.ebuild,v 1.5 2007/04/02 16:27:57 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
 
 LICENSE="MPL-1.1"
 SLOT="2"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/javassist/javassist-2.6.ebuild b/dev-java/javassist/javassist-2.6.ebuild
deleted file mode 100644
index 12b5b74d0a35..000000000000
--- a/dev-java/javassist/javassist-2.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/javassist-2.6.ebuild,v 1.4 2007/01/31 12:44:04 drizzt Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Javassist makes Java bytecode manipulation simple."
-SRC_URI="mirror://sourceforge/jboss/${P}.zip"
-HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
-
-LICENSE="MPL-1.1"
-SLOT="2"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc jikes source"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		>=dev-java/ant-core-1.5
-		jikes? ( dev-java/jikes )
-		source? ( app-arch/zip )"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	rm -rf work
-}
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadocs"
-	ant ${antflags} || die "failed to build"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dohtml *.html
-	use doc && java-pkg_dohtml -r html/*
-	use source && java-pkg_dosrc src/main/javassist
-}