Fixes bug #217780 and added patch to fix catalog warnings and errors. Quote variables.

Package-Manager: portage-2.1.5_rc4

5 files changed, 37 insertions, 11 deletions

diff --git a/dev-python/4suite/4suite-1.0.2.ebuild b/dev-python/4suite/4suite-1.0.2-r1.ebuild
index 75d4afd92bdb..5c56767dd3aa 100644
--- a/dev-python/4suite/4suite-1.0.2.ebuild
+++ b/dev-python/4suite/4suite-1.0.2-r1.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/dev-python/4suite/4suite-1.0.2.ebuild,v 1.2 2008/02/23 17:10:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0.2-r1.ebuild,v 1.1 2008/04/17 20:52:20 pythonhead Exp $
 
 inherit distutils eutils multilib
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-amd64_python2.5.patch"
+	epatch "${FILESDIR}/${P}-config.patch"
 }
 
 src_compile() {
@@ -37,13 +38,15 @@ src_compile() {
 	"${python}" setup.py config \
 		--prefix=/usr \
 		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir)/4Suite || die "setup.py config failed"
+		--datadir=/usr/share/${PN} \
+		--libdir=/usr/$(get_libdir)/python${PYVER}/site-packages || die "setup.py config failed"
 
 	distutils_src_compile
 }
 
 src_install() {
+	rm -r test profile
 	distutils_src_install \
 		$(use_with doc docs) \
-		--install-lib="/usr/$(get_libdir)/4Suite"
+		--install-lib="/usr/$(get_libdir)/python${PYVER}/site-packages"
 }
diff --git a/dev-python/4suite/4suite-1.0_beta3.ebuild b/dev-python/4suite/4suite-1.0_beta3.ebuild
index 1b66f4d86fe7..f708673e8567 100644
--- a/dev-python/4suite/4suite-1.0_beta3.ebuild
+++ b/dev-python/4suite/4suite-1.0_beta3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0_beta3.ebuild,v 1.10 2006/10/20 20:33:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0_beta3.ebuild,v 1.11 2008/04/17 20:52:20 pythonhead Exp $
 
 inherit distutils eutils python multilib
 
@@ -23,9 +23,9 @@ DOCS="docs/*.txt"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/1.0_b3-add_root_opt.diff
+	epatch "${FILESDIR}/1.0_b3-add_root_opt.diff"
 	python_version
 	python setup.py config --prefix=/usr --docdir=/usr/share/doc/${P} --pythonlibbdir=/usr/$(get_libdir)/python${PYVER}/site-packages --libdir=/usr/$(get_libdir)/4Suite
 }
diff --git a/dev-python/4suite/ChangeLog b/dev-python/4suite/ChangeLog
index 0d422c7040ba..c8b9499c7b84 100644
--- a/dev-python/4suite/ChangeLog
+++ b/dev-python/4suite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/4suite
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/ChangeLog,v 1.33 2008/02/23 17:10:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/ChangeLog,v 1.34 2008/04/17 20:52:20 pythonhead Exp $
+
+*4suite-1.0.2-r1 (17 Apr 2008)
+
+  17 Apr 2008; Rob Cakebread <pythonhead@gentoo.org>
+  +files/4suite-1.0.2-config.patch, 4suite-1.0_beta3.ebuild,
+  -4suite-1.0.2.ebuild, +4suite-1.0.2-r1.ebuild:
+  Fixes bug #217780 and added patch to fix catalog warnings and errors.
+  Quote variables.
 
   23 Feb 2008; Tiziano Müller <dev-zero@gentoo.org> 4suite-1.0.2.ebuild:
   Fixed strict-multilib problem (bug #209337, thanks to Tomas A.)
diff --git a/dev-python/4suite/Manifest b/dev-python/4suite/Manifest
index 36c826949baa..b64d558ef8df 100644
--- a/dev-python/4suite/Manifest
+++ b/dev-python/4suite/Manifest
@@ -1,8 +1,9 @@
 AUX 1.0_b3-add_root_opt.diff 497 RMD160 83a815333df7d490a90570d509c12b0f08b2a3bc SHA1 0b6ff0ef23281843ddc2012243ea9300f2c30e30 SHA256 ac423244b41bf1b28309cc17e764edea6d5ce91ef9225b7b379b670e69785928
 AUX 4suite-1.0.2-amd64_python2.5.patch 659 RMD160 0edb4506c5152b6c13c24885bc9a5f0a8e0c68bb SHA1 3d1bf97de8986f405fa4059c9439b239929c9815 SHA256 a6b5120f36cd3d533e29f3460a9809f2d9cdf97b8b03bdad99c53ee936e9eb64
+AUX 4suite-1.0.2-config.patch 653 RMD160 e90ab21bbcdd208250a69e1fc36f04d2c58f5c30 SHA1 390a883802c16e431890b767ec16b1351308d8c7 SHA256 8969a49f94f961f0692f33d49d432c03ac8351fa46cd7bb8c98adb252069c349
 DIST 4Suite-XML-1.0.2.tar.bz2 1286713 RMD160 710de215ac110745a36ab4fec7d718cbcab45bd6 SHA1 d8799b093c4853860c8d7cb9ffccd28adf17b928 SHA256 5a4546dc1fad9b240a46c1b967fae317857cd2d2689e4226de1647083bf6ac3c
 DIST 4Suite-XML-1.0b3.tar.gz 1349918 RMD160 557324c3b53b9995034232bf7d53cfe1b3028608 SHA1 1459155a00945d1f1232147ecbded6f913185c4d SHA256 d4ba824fc3bd20efcbd68fef94b7a88c12521a6db184230e368e23cf3f25fe5d
-EBUILD 4suite-1.0.2.ebuild 1180 RMD160 fdf5c2467053ab95d9c4e0d1bcc00fddc5215ea1 SHA1 5e629a18dce18d574a8f51ebc1e8589eebf72ce4 SHA256 b80f31a2db806c3d0e748a38121037ae689507ed81e15e44cb79f03ba6d6d89b
-EBUILD 4suite-1.0_beta3.ebuild 1050 RMD160 83c7a158f8180615f6539224525a85ff386017aa SHA1 77ff0f7d4d84180b7b95799d6d64905b73aebf20 SHA256 07361038516b6ffccb30b017ca8d30c2dac56195da05a358d35ea64179a200e4
-MISC ChangeLog 5380 RMD160 1deec70156a977e5dc9559b2e9681e5e86aab6e0 SHA1 ab4d831f63d390e2b0bacad68cbcc610d9e9d5a6 SHA256 b6134f24882f4dfd019480e23099cadfcd1ad7873140c322c65c5a58823a9e4c
+EBUILD 4suite-1.0.2-r1.ebuild 1320 RMD160 af8061127fcc981e6d4d33ef881a79503e501c82 SHA1 bb9da76bab1b6f82ff0047cdf81de90a37a3d8ee SHA256 b68626abd3f265896eec33e6ded710e48c68a4db3673746c89924365e85e064c
+EBUILD 4suite-1.0_beta3.ebuild 1058 RMD160 e0293923367bbc7837a568aa15e564f238d95b77 SHA1 5de1e66e9b3609ea40613df89acb8b3a5676899c SHA256 44d2c15df6ff027a2beda9f7dd6bd4aca94ff9ab0b4dd44d4f8ed803447a6639
+MISC ChangeLog 5669 RMD160 08cdef3f4f8035ef3dc2058830d577ea06074a2c SHA1 c902d4e0860f03d70594312ceece36c630af0400 SHA256 17001863574d008869435002d0e0edfcd237921e777da476ac7ac588c1d76a81
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/4suite/files/4suite-1.0.2-config.patch b/dev-python/4suite/files/4suite-1.0.2-config.patch
new file mode 100644
index 000000000000..e6fe137f34fe
--- /dev/null
+++ b/dev-python/4suite/files/4suite-1.0.2-config.patch
@@ -0,0 +1,14 @@
+--- Ft/Lib/DistExt/InstallConfig.py.orig	2008-04-17 13:09:50.000000000 -0700
++++ Ft/Lib/DistExt/InstallConfig.py	2008-04-17 13:12:01.000000000 -0700
+@@ -106,7 +106,10 @@
+         lines = []
+         for name in CONFIG_KEYS:
+             value = install_config[CONFIG_MAPPING.get(name, name)]
+-            lines.append('%-*s = %r' % (maxlen, name.upper(), value))
++            value = '%r' % value
++            if not value.startswith("'/") and name != 'resourcebundle': 
++                value = "'/" + value[1:]
++            lines.append('%-*s = %s' % (maxlen, name.upper(), value))
+         install_config = '\n    '.join(lines)
+ 
+         lines = []