version bump; ebuild cleanup wrt #208584; fix metadata

Package-Manager: portage-2.1.4.4

6 files changed, 48 insertions, 74 deletions

diff --git a/www-apps/gitweb/ChangeLog b/www-apps/gitweb/ChangeLog
index 360014cd38ba..74579166b8a4 100644
--- a/www-apps/gitweb/ChangeLog
+++ b/www-apps/gitweb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/gitweb
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/ChangeLog,v 1.25 2007/10/14 19:05:45 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/ChangeLog,v 1.26 2008/02/23 22:40:38 hollow Exp $
+
+*gitweb-1.5.4.2 (23 Feb 2008)
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  -gitweb-1.5.0.7.ebuild, -gitweb-1.5.1.6.ebuild, gitweb-1.5.2.ebuild,
+  +gitweb-1.5.4.2.ebuild:
+  version bump; ebuild cleanup wrt #208584; fix metadata
 
   14 Oct 2007; Markus Ullmann <jokey@gentoo.org> gitweb-1.5.2.ebuild:
   Keyword ~sparc for bug #195881
diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest
index de06119363da..2af5b2afd713 100644
--- a/www-apps/gitweb/Manifest
+++ b/www-apps/gitweb/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.gentoo 1048 RMD160 53cfd6bd278853286f317633f647ff693e5e91b3 SHA1 2f999be7da508d29a7986fb6d08035d8837ef02e SHA256 9dd2c4b9e1e2525146a7a137873e6019af2ec4bc4b47515b4d91d33c361a7c4d
 AUX apache.htaccess 106 RMD160 b66940fec0b99f8395b4171840cb816af2b28278 SHA1 76b173662032c93ad08adcd980b179b577600f90 SHA256 1c1f8b267ff5a0e56e86809551bc3a2bdab0895527063fbc25b4608c5d4ca74a
 AUX postinstall-en.txt 93 RMD160 91466849854c4ce3ce224fdb71dc8dfeecf53452 SHA1 31d5f07f53638c0c0d16b8073fc77c029bf8c619 SHA256 7d9b3ae9af9fae6bd76162660cf1f9600eef995a7bd1f4a167e66d89e553f13a
-DIST git-1.5.0.7.tar.bz2 1053367 RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 SHA1 1e0d09f27cd8eb3ac96590ed4c1baba459d5359e SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada
-DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.2.tar.bz2 1180424 RMD160 5e9064bdceadcac779112e8c677a6236de75ed7d SHA1 f60d8dbf0926a3c12a1658bac177b383939d8e54 SHA256 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
-EBUILD gitweb-1.5.0.7.ebuild 1194 RMD160 619614bd5eeda0cbf279c445e256cc4e62127817 SHA1 839debb6e5acebd114393a56aa812ddbfa190384 SHA256 abc1b406101a0aa301a068f2b79d42e368e1bba6e209240bdec3e03875bfc7ab
-EBUILD gitweb-1.5.1.6.ebuild 1194 RMD160 0160c3c439d245641f212a2802739fc0c7ba0dec SHA1 a32b80296a964ddafad5778bb3074ff652ff144c SHA256 9eeca4e7375f83c305c5426178156045c4efcd0a8c2cf540c637145ca3bae3aa
-EBUILD gitweb-1.5.2.ebuild 1199 RMD160 a1052ea67eaf070b4846ab1ea00a444635e5ffbf SHA1 309e1dc1802a7c5c3864cc3461d9ce4f25f302d5 SHA256 3cc6564b63e5ec6f44656edde9a4c1f7d13cf5e11fbf5a72f14a2df49f4606f2
-MISC ChangeLog 3923 RMD160 6b506be1621a2e9774037720a9058af4dac0d310 SHA1 25f23855b88847c404645cd4ff05484d89cedb18 SHA256 5f96b63607fcd284e01fcfef0a0150fa2e4b686a9dc637d8688f809a860fbfe0
-MISC metadata.xml 259 RMD160 b137bd5e523bc5e09ad7969c3013260327fd731e SHA1 2795fa96027e7293735f3f041a9e15ec57215b98 SHA256 b0892c824c698ba753c5c05f431e326eb598e229b9759fbc0089e68d48ea76b0
+DIST git-1.5.4.2.tar.bz2 1586823 RMD160 0cacc873033c953659b9971ec8b2dfbe11b040e3 SHA1 40e9ef9a4b6d144e41b2e01e03ae8a3c6bbe98e7 SHA256 56a3232b21fc206d845164890c4a2e1e96feaa520f6ba6e07f294c03541b3621
+EBUILD gitweb-1.5.2.ebuild 1153 RMD160 0c5cd333c2d0745ad60c2c745d81f777151d47e2 SHA1 9f8f57f60bbbe0fa87b7f9f77d91bce92374d3aa SHA256 da150de0a4e4ebc021ff1a58047eaaa21b71f48cb018999eed429a65f9101d61
+EBUILD gitweb-1.5.4.2.ebuild 1155 RMD160 7878f88f6a4fb4dbb59faba3d4f68208b9310862 SHA1 0848f658bdf8db4baa4c86e150f3aac26b73791b SHA256 0b44c59fdda77894889929581d8bd25457d786423f048efde1d35a05113fef6b
+MISC ChangeLog 4174 RMD160 db264febcc2974b0f8316971373b7c1bcc3101ac SHA1 77a9199cfc8ffc2f486bc61892bceb7e386a889e SHA256 da01f4f2b1e1551b6e575b52e32cf4fc13d89fbd2f8b3727d8bc0b31854f8d62
+MISC metadata.xml 259 RMD160 d1a8920e6e1842d0ff8096af59eefe1baff93752 SHA1 87cbf897b7b7739e30d8d45577344d8e31c610d8 SHA256 221df3c5caa21943ff967fba6b4e34a375e7d0355c5f742f56295b50dfd422ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfAoO8ACgkQmPFBzbX68WHR3wCgms/zBbazDN3s7vHZrJejB69G
+xXcAn016Yo08Kk35NztNpseWLAaCvGbw
+=6Wmu
+-----END PGP SIGNATURE-----
diff --git a/www-apps/gitweb/gitweb-1.5.1.6.ebuild b/www-apps/gitweb/gitweb-1.5.1.6.ebuild
deleted file mode 100644
index a1afc67572be..000000000000
--- a/www-apps/gitweb/gitweb-1.5.1.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-1.5.1.6.ebuild,v 1.1 2007/05/20 17:11:45 ferdy Exp $
-
-inherit webapp
-
-GIT_VERSION="${PV}"
-
-DESCRIPTION="Web interface to GIT repositories"
-HOMEPAGE="http://git.or.cz/"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
->=dev-util/git-${PV}"
-
-S="${WORKDIR}"/git-${GIT_VERSION}/gitweb
-
-src_compile() {
-	sed -i \
-		-e 's~^\(GITWEB_PROJECTROOT =\).*$~\1 /var/git~g' \
-		-e 's~^\(GITWEB_SITE_HEADER =\).*$~\1 header.html~g' \
-		-e 's~^\(GITWEB_SITE_FOOTER =\).*$~\1 footer.html~g' \
-		../Makefile || die "failed to sed Makefile"
-	emake -C .. prefix=/usr gitweb/gitweb.cgi || die "emake failed"
-}
-
-src_install() {
-	webapp_src_preinst
-	dodoc README "${FILESDIR}"/README.gentoo
-	rm -f README
-
-	cp gitweb.{cgi,css} git-{favicon,logo}.png "${D}/${MY_HTDOCSDIR}"
-	cp "${FILESDIR}"/apache.htaccess "${D}/${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/gitweb/gitweb-1.5.2.ebuild b/www-apps/gitweb/gitweb-1.5.2.ebuild
index e25854b3500d..caa97c68c88c 100644
--- a/www-apps/gitweb/gitweb-1.5.2.ebuild
+++ b/www-apps/gitweb/gitweb-1.5.2.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-1.5.2.ebuild,v 1.2 2007/10/14 19:05:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-1.5.2.ebuild,v 1.3 2008/02/23 22:40:38 hollow Exp $
 
 inherit webapp
 
-GIT_VERSION="${PV}"
-
 DESCRIPTION="Web interface to GIT repositories"
 HOMEPAGE="http://git.or.cz/"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_VERSION}.tar.bz2"
+SRC_URI="mirror://kernel/software/scm/git/git-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -16,9 +14,11 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
->=dev-util/git-${PV}"
+	>=dev-util/git-${PV}"
+
+need_httpd_cgi
 
-S="${WORKDIR}"/git-${GIT_VERSION}/gitweb
+S="${WORKDIR}"/git-${PV}/gitweb
 
 src_compile() {
 	sed -i \
@@ -31,11 +31,12 @@ src_compile() {
 
 src_install() {
 	webapp_src_preinst
+
 	dodoc README "${FILESDIR}"/README.gentoo
-	rm -f README
 
-	cp gitweb.{cgi,css} git-{favicon,logo}.png "${D}/${MY_HTDOCSDIR}"
-	cp "${FILESDIR}"/apache.htaccess "${D}/${MY_HTDOCSDIR}"/.htaccess
+	insinto "${MY_HTDOCSDIR}"
+	doins gitweb.{cgi,css} git-{favicon,logo}.png
+	newins "${FILESDIR}"/apache.htaccess .htaccess
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
diff --git a/www-apps/gitweb/gitweb-1.5.0.7.ebuild b/www-apps/gitweb/gitweb-1.5.4.2.ebuild
index b7d308418892..4150847be687 100644
--- a/www-apps/gitweb/gitweb-1.5.0.7.ebuild
+++ b/www-apps/gitweb/gitweb-1.5.4.2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-1.5.0.7.ebuild,v 1.1 2007/04/04 11:09:55 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitweb/gitweb-1.5.4.2.ebuild,v 1.1 2008/02/23 22:40:38 hollow Exp $
 
 inherit webapp
 
-GIT_VERSION="${PV}"
-
 DESCRIPTION="Web interface to GIT repositories"
 HOMEPAGE="http://git.or.cz/"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_VERSION}.tar.bz2"
+SRC_URI="mirror://kernel/software/scm/git/git-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
->=dev-util/git-${PV}"
+	>=dev-util/git-${PV}"
+
+need_httpd_cgi
 
-S="${WORKDIR}"/git-${GIT_VERSION}/gitweb
+S="${WORKDIR}"/git-${PV}/gitweb
 
 src_compile() {
 	sed -i \
@@ -31,11 +31,12 @@ src_compile() {
 
 src_install() {
 	webapp_src_preinst
+
 	dodoc README "${FILESDIR}"/README.gentoo
-	rm -f README
 
-	cp gitweb.{cgi,css} git-{favicon,logo}.png "${D}/${MY_HTDOCSDIR}"
-	cp "${FILESDIR}"/apache.htaccess "${D}/${MY_HTDOCSDIR}"/.htaccess
+	insinto "${MY_HTDOCSDIR}"
+	doins gitweb.{cgi,css} git-{favicon,logo}.png
+	newins "${FILESDIR}"/apache.htaccess .htaccess
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
diff --git a/www-apps/gitweb/metadata.xml b/www-apps/gitweb/metadata.xml
index 7ab656a092d3..ae7a51831c28 100644
--- a/www-apps/gitweb/metadata.xml
+++ b/www-apps/gitweb/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>web-apps</herd>
 	<maintainer>
 		<email>ferdy@gentoo.org</email>
 		<name>Fernando J. Pereda</name>
 	</maintainer>
 </pkgmetadata>
-