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

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 28 insertions, 24 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/Manifest b/net-analyzer/sussen/Manifest
index d5fd6ae5f248..50850211ec46 100644
--- a/net-analyzer/sussen/Manifest
+++ b/net-analyzer/sussen/Manifest
@@ -1,6 +1,6 @@
 DIST sussen-0.35.tar.gz 1161686 RMD160 91f3e1e632a18df2df215345a3a1f13c42bcb982 SHA1 2fd4dfbf204067dde96376ff77af0afe316dbf22 SHA256 50c9e0da4a2463570b453800a6cc8e18092c3d83eb9998f96d7eb1c3c696d736
 DIST sussen-0.90.tar.gz 1253529 RMD160 13ea42ce11058831837ae858c7b45794efdf85b0 SHA1 d60646f3914a87ef6ef9e8c978271e13888fe3d6 SHA256 c360e6e924053a13186968645e087400fa691bb4e1ab52f2ec74939044de19ac
-EBUILD sussen-0.35.ebuild 2532 RMD160 fc1c2341d205ecf81b33347494f60c7e6dc2f79e SHA1 9b89e9ff652bd86790bc5fe1bdf22fa21f77409a SHA256 81c8fce64b1d2aad963b33852366a55f32af0775af00dccc6d994a99c9c69aad
-EBUILD sussen-0.90.ebuild 2465 RMD160 0bd3b88949673b1682e4b8f62d1040bddedb0880 SHA1 e5ca3c3e2945a680f2d78916f6cca67e27b5639c SHA256 70bc26b9a6b8615414fc61bdbff06f8ed6507e25cee754eeb787e9a58e5453da
-MISC ChangeLog 10180 RMD160 0606ca4b259e7f947e1568c6236c5b92e66868d2 SHA1 3a67d73568c596ea811c662727f9d18356eb9e13 SHA256 02a447fcf686914a69cbf7a159eb0ff55334fb4dba910f624c333418672c5029
+EBUILD sussen-0.35.ebuild 2552 RMD160 0e500d1dbf03e06ab1feafcf03b1dc4edd91a23c SHA1 bc209ed968c635fe490949e115dcb37d2a45933b SHA256 33aff942dc11730f6d5d60052970dece97dd62b7165c60546d3f783e07726859
+EBUILD sussen-0.90.ebuild 2484 RMD160 88edccc1874f182b70847c7bc3456295cf484641 SHA1 2036f90ce58808035f1862f215aaf0114e60e6ed SHA256 3003c6c4d5271d267728b84706fd1046a35d7c26a8bfffbdcbbd61b718cb250b
+MISC ChangeLog 10344 RMD160 08edbdbeae01a5e4806399ab905251cb0b1500fd SHA1 fb6dc47ce42b48770842d9e69de2a8767f99618a SHA256 93511818ca3fe88bc06f7490d5044748f0ff4a3eb4449bad6f9cbce395934240
 MISC metadata.xml 487 RMD160 aa7573eebec5a073b725077408e43f102259ea96 SHA1 28b2576377930e4784835f7e67fd32595c39043c SHA256 d67396febccb978ddf4dcb7b73616ef8c1650f22b8c2781f6e40615e7a873666
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"
 }