Update pkg_postinst messages.

(Portage version: 2.1.2.7)

4 files changed, 12 insertions, 26 deletions

diff --git a/dev-java/ant-apache-bsf/ChangeLog b/dev-java/ant-apache-bsf/ChangeLog
index 5e9792669459..cdbc14fa34d3 100644
--- a/dev-java/ant-apache-bsf/ChangeLog
+++ b/dev-java/ant-apache-bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-apache-bsf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.11 2007/05/24 20:01:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ChangeLog,v 1.12 2007/05/28 23:37:24 caster Exp $
+
+  28 May 2007; Vlastimil Babka <caster@gentoo.org>
+  ant-apache-bsf-1.7.0-r1.ebuild:
+  Update pkg_postinst messages.
 
 *ant-apache-bsf-1.7.0-r1 (24 May 2007)
 
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild
index ca7739fd30c1..8e02f8c32c53 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-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/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild,v 1.1 2007/05/24 20:01:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0-r1.ebuild,v 1.2 2007/05/28 23:37:24 caster Exp $
 
 ANT_TASK_DEPNAME="bsf-2.3"
 
@@ -22,14 +22,16 @@ src_install() {
 }
 
 built_with_use_warn() {
-	if ! built_with_use --missing false dev-java/bsf ${1}; then
-		elog "dev-java/bsf is not installed with \"${1}\" useflag"
-		elog "You won't be able to use ${2} with <script> task in build.xml files."
+	if ! built_with_use --missing false -o dev-java/bsf ${1}; then
+		elog "If you want to use ${2} in <script> tasks in build.xml files,"
+		elog "dev-java/bsf must be installed with \"${3-${1}}\" USE flag"
 	fi
 }
 
 pkg_postinst() {
 	built_with_use_warn python Python
-	built_with_use_warn rhino JavaScript
+	built_with_use_warn "rhino javascript" JavaScript "rhino or javascript"
 	built_with_use_warn tcl TCL
+	elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
+	elog "ruby and beanshell. See its postinst elog messages for instructions."
 }
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0.ebuild
deleted file mode 100644
index 0851a6447e41..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.7.0.ebuild
+++ /dev/null
@@ -1,14 +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/ant-apache-bsf/ant-apache-bsf-1.7.0.ebuild,v 1.11 2007/05/12 17:52:22 wltjr Exp $
-
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=dev-java/bsf-2.3.0-r3"
-RDEPEND="${DEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
diff --git a/dev-java/ant-apache-bsf/files/digest-ant-apache-bsf-1.7.0 b/dev-java/ant-apache-bsf/files/digest-ant-apache-bsf-1.7.0
deleted file mode 100644
index 035927394fcb..000000000000
--- a/dev-java/ant-apache-bsf/files/digest-ant-apache-bsf-1.7.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9e834373c21fe197ac66f4da51dd47a5 ant-1.7.0-gentoo.tar.bz2 11720
-RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea ant-1.7.0-gentoo.tar.bz2 11720
-SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c ant-1.7.0-gentoo.tar.bz2 11720
-MD5 22b378e27ab300e4d73bf09d91c7e2a6 apache-ant-1.7.0-src.tar.bz2 6831017
-RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab apache-ant-1.7.0-src.tar.bz2 6831017
-SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 apache-ant-1.7.0-src.tar.bz2 6831017