Use webapp slots to avoid collisions, fix bug 256230

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 14 insertions, 60 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/Manifest b/app-admin/rackview/Manifest
index 574e389948c5..7612ded9b3b8 100644
--- a/app-admin/rackview/Manifest
+++ b/app-admin/rackview/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST rackview-0.09.tar.gz 1023175 RMD160 b73301052a225b2456bad57f86cdef58e82af807 SHA1 b2ac1caddd5e7bd096df595849207f5c6f6f37f0 SHA256 49f7f1220f56eaf90f85a12c65d345c516832d13bd26b26dd0893c346d7bbd79
-EBUILD rackview-0.09-r1.ebuild 1067 RMD160 1cf3f196cd193f67aaa2396f92d0f8138a210de7 SHA1 ae284e8dac7d52d2fd9e9098e14cc9f83e7f1991 SHA256 19144ee2046f0d474786abb96eb18769e22b4738dfc6bd6144db2fd9a554e62e
-EBUILD rackview-0.09.ebuild 1019 RMD160 9e0f11622a76f635687e39e5846e7f457cc141e8 SHA1 909fe1156978e897ee199caabe6b1ff88f303901 SHA256 b56ea83ab3ddecfdd729a61a5847bd4e1c01f542f435922a106a20bfd62d0e2a
-MISC ChangeLog 1673 RMD160 dfbf562818cf55041a44e75b8166f702f7594ac1 SHA1 17ad10a9cd8094793c22b65e1d3b4ee4a47f688f SHA256 1643bb09fb12b7e4dbda278ac1a6968a469b15c23c6bb23e451972f3f4826e9f
+EBUILD rackview-0.09-r2.ebuild 1142 RMD160 2f58ac04736f9415f7cd3de38af729ec4a535eb1 SHA1 a48a679ccdf873a67bf27a5cb3e6d16be70de27e SHA256 187b8f38065c1d6cb26d8a3dcbacba347ddebfd28892a7e9824da975c90cd5c1
+MISC ChangeLog 1837 RMD160 2581a9adce360a8efaf1704c7d1de668bc48d684 SHA1 b5afe5e46552b3898f4be41400094e9df93d7657 SHA256 4818b06fb7a13d44f8604bb9bbd5d0782b3c97ed5f463eab429c2948ded009ba
 MISC metadata.xml 306 RMD160 86a358f58414ea9819d156011795f19360efc2ad SHA1 f7fab30c1776d64283e8af72e6f5c9d25f2dd20b SHA256 0147b4caa9293eb54ea831a8a2a95575200e5c20ae4fa003064974193d01423f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklvpXQACgkQKtJO8LeSoosDtQCfQVdxQXJI1I8gY1R2Ujm//6xb
-UboAoKY96l1BNFVZ6LuQ8bY9CICMkULU
-=hn/d
------END PGP SIGNATURE-----
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
-}