Use webapp slots to avoid collisions, fix bug 256230

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 12 insertions, 47 deletions

diff --git a/app-admin/rackview/ChangeLog b/app-admin/rackview/ChangeLog
index bdd3ce03cace..b4f34fdaacbe 100644
--- a/app-admin/rackview/ChangeLog
+++ b/app-admin/rackview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/rackview
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/ChangeLog,v 1.13 2009/01/15 21:04:17 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/ChangeLog,v 1.14 2009/12/07 13:46:22 weaver Exp $
+
+  07 Dec 2009; Andrey Kislyuk <weaver@gentoo.org> rackview-0.09.ebuild,
+  rackview-0.09-r1.ebuild:
+  Use webapp slots and block to avoid collisions, fix bug 256230
 
 *rackview-0.09-r1 (15 Jan 2009)
 
diff --git a/app-admin/rackview/rackview-0.09-r1.ebuild b/app-admin/rackview/rackview-0.09-r2.ebuild
index a7d882827243..e895e249e05f 100644
--- a/app-admin/rackview/rackview-0.09-r1.ebuild
+++ b/app-admin/rackview/rackview-0.09-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.09-r1.ebuild,v 1.1 2009/01/15 21:04:17 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.09-r2.ebuild,v 1.1 2009/12/07 13:46:22 weaver Exp $
+
+EAPI="2"
 
 inherit perl-module webapp
 
@@ -11,6 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
 
 DEPEND="dev-lang/perl
 		>=dev-perl/Config-Simple-4.1
@@ -18,7 +22,8 @@ DEPEND="dev-lang/perl
 		>=dev-perl/Eidetic-2
 		>=virtual/perl-File-Spec-0.83
 		>=virtual/perl-File-Temp-0.12
-		>=www-apache/mod_auth_mysql-3.0.0-r2"
+		>=www-apache/mod_auth_mysql-3.0.0-r2
+		!<=app-admin/rackview-0.09-r1"
 
 RDEPEND=""
 
diff --git a/app-admin/rackview/rackview-0.09.ebuild b/app-admin/rackview/rackview-0.09.ebuild
deleted file mode 100644
index 9926ea9c1480..000000000000
--- a/app-admin/rackview/rackview-0.09.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.09.ebuild,v 1.5 2006/10/22 20:09:19 vivo Exp $
-
-inherit perl-module webapp
-
-DESCRIPTION="Generate HTML page displaying computer rack layout"
-HOMEPAGE="http://rackview.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/Config-Simple-4.1
-		>=dev-perl/GD-1.41
-		>=dev-perl/Eidetic-2
-		>=virtual/perl-File-Spec-0.83
-		>=virtual/perl-File-Temp-0.12"
-RDEPEND=""
-
-src_install() {
-	webapp_src_preinst
-	myinst="${myinst} DESTDIR=${D} INSTBINDIR=${D}/usr/bin"
-	perl-module_src_install
-
-	insinto ${MY_HTDOCSDIR}
-	doins example/index.html example/top_view.png example/top_view.svg
-	doins images
-
-	insinto ${MY_CGIBINDIR}
-	doins cgi-bin/*
-
-	insinto /etc/eidetic
-	doins example/example.dat
-
-	insinto /etc/rackview
-	doins etc/*
-
-	dodoc doc/*
-
-	webapp_src_install
-}