Update gnome-panel dependency, bug #348188, thank Pacho Ramos for report.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 25 insertions, 21 deletions

diff --git a/net-analyzer/sussen/ChangeLog b/net-analyzer/sussen/ChangeLog
index 8541ee38ed25..f7c17d508f9f 100644
--- a/net-analyzer/sussen/ChangeLog
+++ b/net-analyzer/sussen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sussen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.58 2010/01/09 16:50:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.59 2010/12/20 17:57:46 pva Exp $
+
+  20 Dec 2010; Peter Volkov <pva@gentoo.org> sussen-0.35.ebuild,
+  sussen-0.90.ebuild:
+  Update gnome-panel dependency, bug #348188, thank Pacho Ramos for report.
 
   09 Jan 2010; Peter Volkov <pva@gentoo.org> sussen-0.35.ebuild,
   sussen-0.90.ebuild:
diff --git a/net-analyzer/sussen/sussen-0.35.ebuild b/net-analyzer/sussen/sussen-0.35.ebuild
index 4fa840d7618c..908701069e75 100644
--- a/net-analyzer/sussen/sussen-0.35.ebuild
+++ b/net-analyzer/sussen/sussen-0.35.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.35.ebuild,v 1.10 2010/01/09 16:50:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.35.ebuild,v 1.11 2010/12/20 17:57:46 pva Exp $
 
 #WANT_AUTOCONF="latest"
 #WANT_AUTOMAKE="1.8"
 #inherit eutils gnome2 mono autotools
 
+EAPI="2"
 inherit gnome2 mono eutils
 
 DESCRIPTION="Sussen is a tool that checks for vulnerabilities and configuration issues on computer systems"
@@ -21,7 +22,7 @@ RDEPEND="dev-lang/mono
 			 >=dev-dotnet/gnome-sharp-2.4
 			 >=dev-dotnet/gconf-sharp-2.4
 			 >=dev-dotnet/glade-sharp-2.4
-			 gnome-base/gnome-panel )"
+			 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )"
 
 DEPEND="${RDEPEND}
 	doc? ( virtual/monodoc )
@@ -38,24 +39,23 @@ pkg_setup() {
 # src_unpack, pkg_postinst, pkg_postrm are exported in gnome2.eclass. But since
 # we have gnome2 support depends on USE let's call gnome2.eclass internal
 # functions only when USE="gnome".
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	use gnome && gnome2_omf_fix
-}
 
-src_compile () {
 	# Put all asp pages in /usr/share/$PF dir instead of /usr/share/sussen
 	sed -i -e \
 	"s:wwwdir = \$(datadir)/doc/sussen/www/asp:wwwdir = \$(datadir)/doc/${PF}/www/asp:" \
 	www/asp/Makefile.in || die "sed failed."
+}
 
+src_configure () {
 	# $(use_enable web yes)
 	econf ${myconf} \
 		--enable-web=no \
-		$(use_enable gnome) || die "./configure failed."
+		$(use_enable gnome)
+}
 
+src_compile() {
 	emake -j1 || die "Compilation failed"
 }
 
diff --git a/net-analyzer/sussen/sussen-0.90.ebuild b/net-analyzer/sussen/sussen-0.90.ebuild
index b9018d29f818..83e93577e836 100644
--- a/net-analyzer/sussen/sussen-0.90.ebuild
+++ b/net-analyzer/sussen/sussen-0.90.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.90.ebuild,v 1.8 2010/01/09 16:50:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.90.ebuild,v 1.9 2010/12/20 17:57:46 pva Exp $
 
 #WANT_AUTOCONF="latest"
 #WANT_AUTOMAKE="1.8"
 #inherit eutils gnome2 mono autotools
 
+EAPI="2"
 inherit gnome2 mono eutils
 
 DESCRIPTION="Sussen is a tool that checks for vulnerabilities and configuration issues on computer systems"
@@ -21,10 +22,10 @@ RDEPEND="dev-lang/mono
 			 >=dev-dotnet/gnome-sharp-2.4
 			 >=dev-dotnet/gconf-sharp-2.4
 			 >=dev-dotnet/glade-sharp-2.4
-			 gnome-base/gnome-panel )"
+			 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )"
 
 DEPEND="${RDEPEND}
-	doc? ( virtual/monodoc	)
+	doc? ( virtual/monodoc )
 	dev-util/pkgconfig
 	app-arch/rpm
 	>=dev-util/intltool-0.34.2"
@@ -38,24 +39,23 @@ pkg_setup() {
 # src_unpack, pkg_postinst, pkg_postrm are exported in gnome2.eclass. But since
 # we have gnome2 support depends on USE let's call gnome2.eclass internal
 # functions only when USE="gnome".
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	use gnome && gnome2_omf_fix
-}
-
-src_compile () {
 	# Put all asp pages in /usr/share/$PF dir instead of /usr/share/sussen
+
 	sed -i -e \
 	"s:wwwdir = \$(datadir)/doc/sussen/www/asp:wwwdir = \$(datadir)/doc/${PF}/www/asp:" \
 	www/asp/Makefile.in || die "sed failed."
+}
 
+src_configure() {
 	# $(use_enable web yes)
 	econf ${myconf} \
 		--enable-web=no \
-		$(use_enable gnome) || die "./configure failed."
+		$(use_enable gnome)
+}
 
+src_compile() {
 	emake -j1 || die "Compilation failed"
 }