Fix up variable quoting on the older 2.3.1 ebuild so repoman will shut up.

Package-Manager: portage-2.1.4.4

3 files changed, 32 insertions, 18 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index fbd9ea59f347..24823028d58b 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.368 2008/02/04 15:24:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.369 2008/02/14 21:22:49 wolf31o2 Exp $
+
+  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  openoffice-2.3.1.ebuild:
+  Fix up variable quoting on the older 2.3.1 ebuild so repoman will shut up.
 
   04 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   openoffice-2.3.1-r1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index b81298fcc873..5c341f54fc77 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/config_office-fix-system-icu-check.diff 740 RMD160 96fb3ddce67ff9a377cc57d29307eb69d396da18 SHA1 c2ef5dd0d90e2e78e07ee2b0b68d9fe792258836 SHA256 f2b3020bc3e2032ea3ffb9b96fe70c21e305c4db58ab85944b0b32e0a8f83df7
 AUX 2.3.1/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
 AUX 2.3.1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
@@ -21,6 +24,13 @@ DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.3.1-r1.ebuild 12391 RMD160 84e0243f2dda79b15ec512f153fca150eb856639 SHA1 0b983c81a2d0eff15a1b5bac26cc7a165b0d045c SHA256 cfa3d9baf7a15ae5c36542e6c917a74078ad75993d52c6401a792432dcc7ffcf
-EBUILD openoffice-2.3.1.ebuild 12325 RMD160 280affb4f271cb4fc46292247e082cdc79532459 SHA1 4e1375dee062b78fd537559cf8d1cacc7a32df2e SHA256 e0aa4c67c47950da2c56595e4919934d400d52ccf7925cae2670348f26aa4a38
-MISC ChangeLog 77083 RMD160 17692e0009f82520d8650364a0490a7a9c6b256f SHA1 5496247645650d36b26e5afda5bf0c5bd77cab6f SHA256 69279acaf14f6be0e9fece6399e36babbbc8abee5658c889549724fbf01f7a54
+EBUILD openoffice-2.3.1.ebuild 12365 RMD160 1cbba82e16ef713e6d9580d5217347a205223393 SHA1 16d12d50cde13db1af5b37f7d937c4982d4e9574 SHA256 24e38624b655f0fb1ef2a87bd1c09313ef45dfb2f288f1052815d3193ec45c79
+MISC ChangeLog 77240 RMD160 cf78faf09fcdfe5c53a0cedb88f13d1ab0819085 SHA1 40b2613c8fce199d4d88b51b6e74bcaecd1585d9 SHA256 e3fa417c82fd41abb97f5e71468547195dcd9a548cae1d338e0eb974ce103f0d
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHtLEtkT4lNIS36YERAnxIAKCJKfDcuo7Dl8cjRAlAuxl1a+XfwwCfZ6cD
+ZNtkVUocVJ5rd6+m467GAtU=
+=2zym
+-----END PGP SIGNATURE-----
diff --git a/app-office/openoffice/openoffice-2.3.1.ebuild b/app-office/openoffice/openoffice-2.3.1.ebuild
index 0dd3c1bef7e5..e2c73af541db 100644
--- a/app-office/openoffice/openoffice-2.3.1.ebuild
+++ b/app-office/openoffice/openoffice-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1.ebuild,v 1.8 2008/01/19 03:16:46 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1.ebuild,v 1.9 2008/02/14 21:22:49 wolf31o2 Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -196,20 +196,20 @@ src_unpack() {
 	unpack ooo-build-${MY_PV}.tar.gz
 
 	# Hackish workaround for overlong path problem, see bug #130837
-	mv ${S_OLD} ${S} || die
+	mv "${S_OLD}" "${S}" || die
 
 	#Some fixes for our patchset
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
-	epatch ${FILESDIR}/${PV}/ooo-env_log.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}/gentoo-${PV}-r1.diff"
+	epatch "${FILESDIR}/${PV}/ooo-env_log.diff"
 
 	if use ppc ; then
-		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
-		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die
-		epatch ${FILESDIR}/${PV}/regcompapply.diff
+		cp -f "${FILESDIR}/${PV}/disable-regcomp-java.diff" "${S}/patches/src680" || die
+		cp -f "${FILESDIR}/${PV}/disable-regcomp-python.diff" "${S}/patches/src680" || die
+		epatch "${FILESDIR}/${PV}/regcompapply.diff"
 		#Fix for internal STLport
-		cp -f ${FILESDIR}/${PV}/stlport-ppc-buildfix.diff ${S}/patches/src680 || die
-		epatch ${FILESDIR}/${PV}/stlport-ppc-buildfix-apply.diff
+		cp -f "${FILESDIR}/${PV}/stlport-ppc-buildfix.diff" "${S}/patches/src680" || die
+		epatch "${FILESDIR}/${PV}/stlport-ppc-buildfix-apply.diff"
 	fi
 
 	#Use flag checks
@@ -301,8 +301,8 @@ src_compile() {
 	# Make sure gnome-users get gtk-support
 	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
 
-	cd ${S}
-	./configure ${MYCONF} \
+	cd "${S}"
+	./configure "${MYCONF}" \
 		--with-distro="Gentoo" \
 		--with-arch="${ARCH}" \
 		--host="${CHOST}" \
@@ -344,13 +344,13 @@ src_install() {
 	export PYTHONPATH=""
 
 	einfo "Preparing Installation"
-	make DESTDIR=${D} install || die "Installation failed!"
+	make DESTDIR="${D}" install || die "Installation failed!"
 
 	# Fix the permissions for security reasons
-	chown -R root:0 ${D}
+	chown -R root:0 "${D}"
 
 	# record java libraries
-	use java && java-pkg_regjar ${D}/usr/$(get_libdir)/openoffice/program/classes/*.jar
+	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
 
 }