really fix the sandbox problem with 0.23, add fixes to gtkhtml2 detection via virtualmake (#47879)

4 files changed, 24 insertions, 13 deletions

diff --git a/net-www/straw/ChangeLog b/net-www/straw/ChangeLog
index f93e25296a48..462f9f99841a 100644
--- a/net-www/straw/ChangeLog
+++ b/net-www/straw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/straw
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.28 2004/06/25 01:13:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/ChangeLog,v 1.29 2004/06/26 22:27:53 liquidx Exp $
+
+  26 Jun 2004; Alastair Tse <liquidx@gentoo.org> straw-0.22.1.ebuild,
+  straw-0.23.ebuild:
+  really fix the sandbox problem with 0.23, add fixes to gtkhtml2 detection via
+  virtualmake (#47879)
 
 *straw-0.23 (08 Jun 2004)
 
diff --git a/net-www/straw/Manifest b/net-www/straw/Manifest
index 8ae338e0cc41..59521bb6520f 100644
--- a/net-www/straw/Manifest
+++ b/net-www/straw/Manifest
@@ -1,8 +1,8 @@
 MD5 35a5f47a47683a75b5cb8053c433dbc4 straw-0.19.2.ebuild 1374
 MD5 12f746cd941ebf88f9ea374a8c4c463d straw-0.22.ebuild 1248
-MD5 a1ca86e74d74f4dbaa67d4afce5245d3 straw-0.22.1.ebuild 1525
-MD5 be30b7078a5020c1100253c64140b5c0 straw-0.23.ebuild 1523
-MD5 792b596eb9add1dd83a8986ffb374baf ChangeLog 3414
+MD5 bc6b9d67f02e00bd511da0aabf5381ba straw-0.22.1.ebuild 1556
+MD5 1c4f911cbdf969f553b82e96f4b2b0ce straw-0.23.ebuild 1629
+MD5 88e0d2ed89995cb4a9ef2db5038d238f ChangeLog 3608
 MD5 f7653644adcb8aac56753e12ab304f51 metadata.xml 235
 MD5 0189d23a99cb2df437749926fb32eba9 straw-0.21.2.ebuild 2157
 MD5 62022aa3104ffda5eefb9d703602acb1 files/digest-straw-0.22 63
diff --git a/net-www/straw/straw-0.22.1.ebuild b/net-www/straw/straw-0.22.1.ebuild
index 20bb5300fb01..5afa9b7aeb55 100644
--- a/net-www/straw/straw-0.22.1.ebuild
+++ b/net-www/straw/straw-0.22.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.22.1.ebuild,v 1.6 2004/06/25 01:13:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.22.1.ebuild,v 1.7 2004/06/26 22:27:53 liquidx Exp $
 
-inherit gnome2 python distutils
+inherit gnome2 python distutils virtualx
 
 DESCRIPTION="RSS/RDF News Aggregator"
 HOMEPAGE="http://www.nongnu.org/straw/"
@@ -28,7 +28,8 @@ RDEPEND="${DEPEND}
 # foser <foser@gentoo.org> 18 Feb 2004
 
 pkg_setup() {
-	if ! python -c 'import gtk; import gtkhtml2'; then
+	export maketype="python"
+	if ! echo "import gtkhtml2" | virtualmake; then
 		eerror "The gnome-python gtkhtml2 module was not found."
 		eerror "Rebuild gnome-python using:"
 		eerror "  USE=\"gtkhtml\" emerge gnome-python"
diff --git a/net-www/straw/straw-0.23.ebuild b/net-www/straw/straw-0.23.ebuild
index 3c40dd2e331a..a9fddae16f21 100644
--- a/net-www/straw/straw-0.23.ebuild
+++ b/net-www/straw/straw-0.23.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.23.ebuild,v 1.3 2004/06/25 01:13:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/straw/straw-0.23.ebuild,v 1.4 2004/06/26 22:27:53 liquidx Exp $
 
-inherit gnome2 python distutils
+inherit gnome2 python distutils virtualx
 
 DESCRIPTION="RSS/RDF News Aggregator"
 HOMEPAGE="http://www.nongnu.org/straw/"
@@ -23,12 +23,14 @@ RDEPEND="${DEPEND}
 	>=dev-python/bsddb3-3.4.0
 	>=dev-python/egenix-mx-base-2
 	!ppc? ( >=dev-python/adns-python-1.0.0 )"
+
 # REMIND : egenix-mx-base is only needed for the conversion of
 # pre 0.22 straw databases. It should be removed at some point.
 # foser <foser@gentoo.org> 18 Feb 2004
 
 pkg_setup() {
-	if ! python -c 'import gtk; import gtkhtml2'; then
+	export maketype="python"
+	if ! echo "import gtkhtml2" | virtualmake; then
 		eerror "The gnome-python gtkhtml2 module was not found."
 		eerror "Rebuild gnome-python using:"
 		eerror "  USE=\"gtkhtml\" emerge gnome-python"
@@ -36,13 +38,16 @@ pkg_setup() {
 	fi
 }
 
-src_install() {
+src_compile() {
+	return
+}
 
+src_install() {
+	# work around bug in straw's install script
 	distutils_src_install \
 		--prefix=/usr \
-		--sysconfdir=/etc \
+		--sysconfdir=${D}/etc \
 		--disable-schemas-install
-
 }
 
 pkg_postinst() {