Fix quoting and nocxx use under the examples use flag. Fixes bug #212703. Thanks...

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 9f345f2c99952f5cda9aa189ac10ba93f7ce6078..b607612418acf647d838963ccb861b874e5b4471 100644 (file)
--- 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 5ed6389a1c81bbf06053a4e87115a73ddfacdc74..a44de49b43ecf737fed2133a42f97fac0d4347d3 100644 (file)
--- 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
 }

diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index 9f13f844dd734eae55a4324beae5ac3769792c74..e67189a7b6f3de4a8edbe23900bbffa2ada766be 100644 (file)
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jcalendar-1.3.2.zip 667065 RMD160 4ebc0f9782601fe2b9d7e824085ce3453ad1b0f0 SHA1 c4751710234d8fbdeaec859ffe99499d64fa3d55 SHA256 57d7d6f79b6fad665c47ba4018e5de91013795e610c45937aadd1a843118e779
-EBUILD jcalendar-1.3.2-r1.ebuild 1091 RMD160 651bb6f8f4ff03f86c67bf67c41bed49feb20df3 SHA1 d703ec9fcc7e2178edf2050d7e05cd39513d4c1f SHA256 8ff0b5e8c2a9a1b77f8e01ccd4dfa73dd856f91ce1a864112680b3d589ae99f8
+EBUILD jcalendar-1.3.2-r1.ebuild 1088 RMD160 0222d44471e9f293e8a859c97d30f1c4f94122a0 SHA1 28f7ffd77fe8203636a7c4f2a3b7cb867fb3844a SHA256 bc780fe2201bc8558b838d4cf50efdc58b30a0ca49760ded7d578c81cab86bc9
 EBUILD jcalendar-1.3.2.ebuild 1276 RMD160 fabce1ccee69316f347ab9200364c96dd3d21e5a SHA1 ac5f61214d56185fc5561ca846fe5ab8fccb6fc1 SHA256 7c83fa699d779f9dfd9231df965a2f1062a317904387a362e2457ea44fc0e14b
-MISC ChangeLog 2296 RMD160 78c51a531e5dbe84f323cd288a43187abd503563 SHA1 b40e2d7c6ccba0900c34bad04f37850b3c0e01ed SHA256 1775ba6ffc873be616f65d94584703f1e32dd83353342bdf8b289e7c85a170fe
+MISC ChangeLog 2411 RMD160 28e0a3cbeafa42074f398a8412311a251ae9ac8b SHA1 d716bb7ff8b9eb86b770b5e07a5d7ebf7784b9b0 SHA256 802419d589beeb4b6c9ca634b466175042bb3f14cc3a696ecb9d9f80478174af
 MISC metadata.xml 568 RMD160 ff328933816d06034086613f256ae79d5ace5c03 SHA1 eddfaf9cdaeada2afda3e97fe7388aaace73281b SHA256 d64b1a1a2ea768be32d5e97966558993b46facea8796ff29d986689e918350e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH0pUcgo/w9rxVVVERAhnSAJwNFELJI9NkFC/xKELHkj3qYswBigCfZr6N
+BgycNDZQnZiDFsc2/ZPtQNg=
+=Q6rj
+-----END PGP SIGNATURE-----