Fix quoting and nocxx use under the examples use flag. Fixes bug #212703. Thanks to maekke for the patch.

(Portage version: 2.1.4.4)

2 files changed, 22 insertions, 18 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 9f345f2c9995..b607612418ac 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antlr
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.60 2007/06/23 16:50:14 betelgeuse Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.61 2008/03/08 13:26:44 betelgeuse Exp $
+
+  08 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> antlr-2.7.7.ebuild:
+  Fix quoting and nocxx use under the examples use flag. Fixes bug #212703.
+  Thanks to maekke for the patch.
 
   23 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> antlr-2.7.7.ebuild:
   Fix bug #172104 so that antlr builds when pnet is installed.
diff --git a/dev-java/antlr/antlr-2.7.7.ebuild b/dev-java/antlr/antlr-2.7.7.ebuild
index 5ed6389a1c81..a44de49b43ec 100644
--- a/dev-java/antlr/antlr-2.7.7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.8 2007/06/23 16:50:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.9 2008/03/08 13:26:44 betelgeuse Exp $
 
 inherit java-pkg-2 mono distutils multilib
 
@@ -42,29 +42,29 @@ src_compile() {
 		-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
 		-e 's|@libs@|-r:\$\{libdir\}/antlr.astframe.dll -r:\$\{libdir\}/antlr.runtime.dll|' \
 		-e "s|@VERSION@|${PV}|" \
-		${FILESDIR}/antlr.pc.in > ${S}/antlr.pc
+		"${FILESDIR}"/antlr.pc.in > "${S}"/antlr.pc
 }
 
 src_install() {
 	exeinto /usr/bin
-	doexe ${S}/scripts/antlr-config
+	doexe "${S}"/scripts/antlr-config
 
 	if ! use nocxx ; then
-		cd ${S}/lib/cpp
+		cd "${S}"/lib/cpp
 		einstall || die "failed to install C++ files"
 	fi
 
 	if ! use nojava ; then
-		java-pkg_dojar ${S}/antlr/antlr.jar
+		java-pkg_dojar "${S}"/antlr/antlr.jar
 
 		use script && java-pkg_dolauncher antlr --main antlr.Tool
 
-		use source && java-pkg_dosrc ${S}/antlr
+		use source && java-pkg_dosrc "${S}"/antlr
 		use doc && java-pkg_dohtml -r doc/*
 	fi
 
 	if use mono ; then
-		cd ${S}/lib
+		cd "${S}"/lib
 
 		dodir /usr/$(get_libdir)/antlr/
 		insinto /usr/$(get_libdir)/antlr/
@@ -73,25 +73,25 @@ src_install() {
 		doins antlr.runtime.dll
 
 		insinto /usr/$(get_libdir)/pkgconfig
-		doins ${S}/antlr.pc
+		doins "${S}"/antlr.pc
 	fi
 
 	if use python ; then
-		cd ${S}/lib/python
+		cd "${S}"/lib/python
 		distutils_src_install
 	fi
 
 	if use examples ; then
-		find ${S}/examples -iname Makefile\* -exec rm \{\} \;
+		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
 
 		dodir /usr/share/doc/${PF}/examples
 		insinto /usr/share/doc/${PF}/examples
 
-		! use cxx && doins -r ${S}/examples/cpp
-		use java && doins -r ${S}/examples/java
-		use mono && doins -r ${S}/examples/csharp
-		use python && doins -r ${S}/examples/python
+		use nocxx || doins -r "${S}"/examples/cpp
+		use nojava || doins -r "${S}"/examples/java
+		use mono && doins -r "${S}"/examples/csharp
+		use python && doins -r "${S}"/examples/python
 	fi
 
-	newdoc ${S}/README.txt README
+	newdoc "${S}"/README.txt README
 }