--- libreadline-java-0.8.0-r2.ebuild	2007-05-18 00:05:36.000000000 +0200
+++ libreadline-java-0.8.0-r2.ebuild	2008-01-31 00:00:00.000000000 +0100
@@ -12,10 +12,11 @@ 
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="editline getline readline elibc_FreeBSD"
 
-COMMON_DEP="sys-libs/ncurses"
+COMMON_DEP="sys-libs/ncurses
+	editline? ( >=dev-libs/libedit-20061103 )"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
@@ -26,6 +27,7 @@ 
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/termcap-to-ncurses.patch"
+	epatch "${FILESDIR}/editline-to-libedit.patch"
 	# bug #157387, reported upstream
 	epatch "${FILESDIR}/${P}-gmake.patch"
 
@@ -37,7 +39,17 @@ 
 }
 
 src_compile() {
-	emake -j1 || die "failed to compile"
+	local libs
+	use readline && libs="JavaReadline"
+	use getline && libs="${libs} JavaGetline"
+	use editline && libs="${libs} JavaEditline"
+
+	if [[ -z "${libs}" ]]; then
+		einfo "No relevant USE-flag set, building the default \"readline\""
+		libs="JavaReadline"
+	fi
+
+	emake -j1 T_LIBS="${libs}" || die "failed to compile"
 	if use doc; then
 		emake -j1 apidoc || die "failed to generate docs"
 	fi