version bump; ebuild cleanup wrt #208584; fix metadata

(Portage version: 2.1.4.4)

5 files changed, 33 insertions, 67 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/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>
-