Install static gitweb files into correct location.

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

5 files changed, 43 insertions, 38 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 9c7b7899db9e..4145db9f4d90 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.24 2010/08/23 19:05:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.25 2010/08/29 11:19:53 swegener Exp $
+
+  29 Aug 2010; Sven Wegener <swegener@gentoo.org> git-1.7.2.ebuild,
+  git-1.7.2-r2.ebuild, git-1.7.2.2.ebuild:
+  Install static gitweb files into correct location.
 
 *git-1.7.2.2 (23 Aug 2010)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index fbd035208214..d5383ca17c39 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2
 AUX git-1.6.6.1-interix6.patch 457 RMD160 27bdfe9ab248791f628420cc45751fae2643b3d5 SHA1 6c80a5cb63cbcf89b61b8f5e2c16736cb0be09bc SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849
 AUX git-1.7.0-always-install-js.patch 1304 RMD160 e4d110d7bd86a50f928cdf5fa1e3513aebbb0dab SHA1 9324fe19cb85709b2a198ba853866a99d6088f64 SHA256 5cb12dd43e114d07ea4ab6cd04f386cdc0c6e9a998529943be2da3308e1d1509
@@ -30,9 +33,16 @@ EBUILD git-1.6.4.4.ebuild 10107 RMD160 6c578f841de8ae887a23b29584f554b5394f1eb1
 EBUILD git-1.7.0.ebuild 11306 RMD160 a7ef58dd15c8d92e3d83e4cbe58b354cf13a6e5d SHA1 834c8f0202d643422f191192963b0c9d88f059af SHA256 5dd18d47daf59386d54fa7eb06e23baf6a5260124e347c3eabf13e35b5b35b4e
 EBUILD git-1.7.1-r1.ebuild 11503 RMD160 ce25fdc24d33165bee62fbe59b69ab843c76e837 SHA1 116eb4b1c3d6479316eb89aa07b05eb5bd672469 SHA256 8b60472e049b67f542df4c3d233ed35b35c2ad6f49f5251313fc95ebb52979ce
 EBUILD git-1.7.1.1.ebuild 11512 RMD160 2e626668640440cfc0a895a25ca6fd9ad5478841 SHA1 e2abbff7fd28a9f0d3d4fbc612956e1ddcafbca7 SHA256 e3e032e224a71926e4af32f2af20713be4e69b20ae20c25aa97de98ffe2269db
-EBUILD git-1.7.2-r2.ebuild 13385 RMD160 580609d9c9b6074c4857fd47125867fa63136958 SHA1 9fe9d80c913e7e67e69611e83c643d74ea6163d4 SHA256 a2e503b7ca9f874b373b3a82b13782e2f9578b07f1e8bc38268e8e0f40ecaee7
-EBUILD git-1.7.2.2.ebuild 13384 RMD160 8c927512158778974b5250856a9b45cdc0fea5c9 SHA1 dd809e67068123d579a19316ab84172eb4b8bf48 SHA256 95a109608c9bfa3b5aa8f648d546dbd8f4948843fddab4c97c3d8d40181a80c7
-EBUILD git-1.7.2.ebuild 11510 RMD160 fbd24cadd8ad7301137308aa29a75320533e6156 SHA1 60febcbb0fdc78c9e74a1203d9192b21c3138e9b SHA256 4fcf848157a8e2726edaec5567ff8814e6d96dddbe17dcc3baf9893b55d2a395
+EBUILD git-1.7.2-r2.ebuild 13348 RMD160 615c2952c2dafed8c7bae58dd0ee63439ff07e74 SHA1 15e902b0cd14da3ad275a775c7dcdbec29e1eb4a SHA256 7d23371f9cd13c2a138acc4b8af7d5340c5434131f6412f748443a0931b5d4e4
+EBUILD git-1.7.2.2.ebuild 13347 RMD160 a6f140a46fbba959be2a5a2e78befb4173bf4ede SHA1 d6d578ac223cb85e541fffbaf95afa9e187a45d9 SHA256 cda0820f8c301c3e9747a312bab9be0f92a6457d1d42d979f58d190c16e393c5
+EBUILD git-1.7.2.ebuild 11473 RMD160 4a1bdd7d0ffbc8f677fe41216fb7b5e87f70ea3b SHA1 f5c98b2bb8e2240d9dbb43d6f6c4592916dcf5bd SHA256 7748e46b9b8cc17dd4028a4414f9fc578c4e479d85b07a957fff3ddf508bbb0f
 EBUILD git-9999.ebuild 11299 RMD160 9d2b7b795c198a8dd1563fc4ee20b9302b8f899d SHA1 f748425d15ef0338f55309538fb4cd15077eb662 SHA256 5bb9372b428fcbfd7573e232d835aca4bb23d1f8dfc21e6b94fb0bf6ef992be2
-MISC ChangeLog 69141 RMD160 1ae0e78ded94cf6a41c9bdf79e15130baf871877 SHA1 bd69c205c186a982a2e5658af35fd1f35ce325ab SHA256 539920db7ff47dde897b87e12cd1bb372ba9a2e38583dd60f25d2b7a4a926aa3
+MISC ChangeLog 69307 RMD160 ec4a0f6135c6b74bd9b15f04745bca984cb3aad6 SHA1 0fe335a681fe9a7b63ac0a3dfcc5559f1028a8a4 SHA256 e0c7dada3b5c2045e2ca73604b304a84817c330900a6cba22ad910a18e2c77ce
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx6QmEACgkQI1lqEGTUzySpqACfaVSgBat3uMx62pJ36TaWPz00
+f7UAmwaCkttz63G/5/w5EX6XFvbCyNH8
+=unWr
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-1.7.2-r2.ebuild b/dev-vcs/git/git-1.7.2-r2.ebuild
index e33f3f89be80..ce428c12e599 100644
--- a/dev-vcs/git/git-1.7.2-r2.ebuild
+++ b/dev-vcs/git/git-1.7.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r2.ebuild,v 1.2 2010/08/16 05:47:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r2.ebuild,v 1.3 2010/08/29 11:19:53 swegener Exp $
 
 EAPI=3
 
@@ -333,17 +333,14 @@ src_install() {
 	done
 
 	if use perl && use cgi ; then
-		dodir /usr/share/${PN}/gitweb
-		insinto /usr/share/${PN}/gitweb
-		doins "${S}"/gitweb/gitweb.cgi
-		doins "${S}"/gitweb/gitweb.css
+		exeinto /usr/share/${PN}/gitweb
+		doexe "${S}"/gitweb/gitweb.cgi
+		insinto /usr/share/${PN}/gitweb/static
+		doins "${S}"/gitweb/static/gitweb.css
 		js=gitweb.js
-		[ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-		doins "${S}"/gitweb/${js}
-		doins "${S}"/gitweb/git-{favicon,logo}.png
-
-		# Make sure it can run
-		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+		[ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
+		doins "${S}"/gitweb/static/${js}
+		doins "${S}"/gitweb/static/git-{favicon,logo}.png
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-1.7.2.2.ebuild b/dev-vcs/git/git-1.7.2.2.ebuild
index 0ef2e0536b64..bd9dd29494c4 100644
--- a/dev-vcs/git/git-1.7.2.2.ebuild
+++ b/dev-vcs/git/git-1.7.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.2.ebuild,v 1.1 2010/08/23 19:05:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.2.ebuild,v 1.2 2010/08/29 11:19:53 swegener Exp $
 
 EAPI=3
 
@@ -333,17 +333,14 @@ src_install() {
 	done
 
 	if use perl && use cgi ; then
-		dodir /usr/share/${PN}/gitweb
-		insinto /usr/share/${PN}/gitweb
-		doins "${S}"/gitweb/gitweb.cgi
-		doins "${S}"/gitweb/gitweb.css
+		exeinto /usr/share/${PN}/gitweb
+		doexe "${S}"/gitweb/gitweb.cgi
+		insinto /usr/share/${PN}/gitweb/static
+		doins "${S}"/gitweb/static/gitweb.css
 		js=gitweb.js
-		[ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-		doins "${S}"/gitweb/${js}
-		doins "${S}"/gitweb/git-{favicon,logo}.png
-
-		# Make sure it can run
-		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+		[ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
+		doins "${S}"/gitweb/static/${js}
+		doins "${S}"/gitweb/static/git-{favicon,logo}.png
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
diff --git a/dev-vcs/git/git-1.7.2.ebuild b/dev-vcs/git/git-1.7.2.ebuild
index bf805226e19d..599e908b4cbc 100644
--- a/dev-vcs/git/git-1.7.2.ebuild
+++ b/dev-vcs/git/git-1.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.ebuild,v 1.2 2010/08/16 05:47:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.ebuild,v 1.3 2010/08/29 11:19:53 swegener Exp $
 
 EAPI=2
 
@@ -290,17 +290,14 @@ src_install() {
 	done
 
 	if use perl && use cgi ; then
-		dodir /usr/share/${PN}/gitweb
-		insinto /usr/share/${PN}/gitweb
-		doins "${S}"/gitweb/gitweb.cgi
-		doins "${S}"/gitweb/gitweb.css
+		exeinto /usr/share/${PN}/gitweb
+		doexe "${S}"/gitweb/gitweb.cgi
+		insinto /usr/share/${PN}/gitweb/static
+		doins "${S}"/gitweb/static/gitweb.css
 		js=gitweb.js
-		[ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-		doins "${S}"/gitweb/${js}
-		doins "${S}"/gitweb/git-{favicon,logo}.png
-
-		# Make sure it can run
-		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+		[ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
+		doins "${S}"/gitweb/static/${js}
+		doins "${S}"/gitweb/static/git-{favicon,logo}.png
 
 		# INSTALL discusses configuration issues, not just installation
 		docinto /