Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-08-23 20:18:14 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-08-23 20:18:14 +0000
commite6eeccc755652904a7d88525b94aeedc5a73dab7 (patch)
tree68b63b91088ae4aea37e35e04157fba73950b965
parentVersion bump, bug #431492. (diff)
downloadgentoo-2-e6eeccc755652904a7d88525b94aeedc5a73dab7.tar.gz
gentoo-2-e6eeccc755652904a7d88525b94aeedc5a73dab7.tar.bz2
gentoo-2-e6eeccc755652904a7d88525b94aeedc5a73dab7.zip
Bug #432388: Make app-text/highlight optional as has heavy dependencies and is disabled by default in gitweb.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64, RepoMan options: --force)
Diffstat
-rw-r--r--dev-vcs/git/ChangeLog12
-rw-r--r--dev-vcs/git/git-1.6.4.5.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.10.2.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.10.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.11.1.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.12-r1.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.12-r2.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.12.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.2.5.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.3.4-r1.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9.1.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9.2.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9.3.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9.4.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9.7.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9.ebuild4
-rw-r--r--dev-vcs/git/git-1.7.9_rc2.ebuild4
-rw-r--r--dev-vcs/git/git-9999.ebuild4
-rw-r--r--dev-vcs/git/metadata.xml1
19 files changed, 46 insertions, 35 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 5056a65b8f06..a583d27d741b 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.151 2012/08/23 05:38:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.152 2012/08/23 20:18:14 robbat2 Exp $
+
+ 23 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.10.2.ebuild, git-1.7.10.ebuild, git-1.7.11.1.ebuild,
+ git-1.7.12-r1.ebuild, git-1.7.12-r2.ebuild, git-1.7.12.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.8.6.ebuild,
+ git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
+ git-1.7.9.4.ebuild, git-1.7.9.7.ebuild, git-1.7.9.ebuild,
+ git-1.7.9_rc2.ebuild, git-9999.ebuild, metadata.xml:
+ Bug #432388: Make app-text/highlight optional as has heavy dependencies and is
+ disabled by default in gitweb.
*git-1.7.12-r2 (23 Aug 2012)
diff --git a/dev-vcs/git/git-1.6.4.5.ebuild b/dev-vcs/git/git-1.6.4.5.ebuild
index 63ce7fa65293..6c5b6d55aac5 100644
--- a/dev-vcs/git/git-1.6.4.5.ebuild
+++ b/dev-vcs/git/git-1.6.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.10 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.11 2012/08/23 20:18:14 robbat2 Exp $
EAPI=2
diff --git a/dev-vcs/git/git-1.7.10.2.ebuild b/dev-vcs/git/git-1.7.10.2.ebuild
index 9cc604d18ff6..c2d85b1b31e4 100644
--- a/dev-vcs/git/git-1.7.10.2.ebuild
+++ b/dev-vcs/git/git-1.7.10.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.2.ebuild,v 1.4 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.2.ebuild,v 1.5 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.10.ebuild b/dev-vcs/git/git-1.7.10.ebuild
index e3888be3c603..450959e65528 100644
--- a/dev-vcs/git/git-1.7.10.ebuild
+++ b/dev-vcs/git/git-1.7.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.11.1.ebuild b/dev-vcs/git/git-1.7.11.1.ebuild
index 1f2570bdd64e..6e419f921e42 100644
--- a/dev-vcs/git/git-1.7.11.1.ebuild
+++ b/dev-vcs/git/git-1.7.11.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.11.1.ebuild,v 1.1 2012/07/07 05:29:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.11.1.ebuild,v 1.2 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.12-r1.ebuild b/dev-vcs/git/git-1.7.12-r1.ebuild
index be77f1ddffcc..528e67bc3bf4 100644
--- a/dev-vcs/git/git-1.7.12-r1.ebuild
+++ b/dev-vcs/git/git-1.7.12-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.3 2012/08/22 05:14:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.4 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.12-r2.ebuild b/dev-vcs/git/git-1.7.12-r2.ebuild
index 04e294cec4eb..55944517437e 100644
--- a/dev-vcs/git/git-1.7.12-r2.ebuild
+++ b/dev-vcs/git/git-1.7.12-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r2.ebuild,v 1.1 2012/08/23 05:38:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r2.ebuild,v 1.2 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.12.ebuild b/dev-vcs/git/git-1.7.12.ebuild
index 96c07596c9db..ba1cd92a76a1 100644
--- a/dev-vcs/git/git-1.7.12.ebuild
+++ b/dev-vcs/git/git-1.7.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.3 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.2.5.ebuild b/dev-vcs/git/git-1.7.2.5.ebuild
index 1e7fa9b29936..bc47b7628bd9 100644
--- a/dev-vcs/git/git-1.7.2.5.ebuild
+++ b/dev-vcs/git/git-1.7.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.5.ebuild,v 1.13 2011/08/19 18:43:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.5.ebuild,v 1.14 2012/08/23 20:18:14 robbat2 Exp $
EAPI=3
diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild
index 048177f5682a..0755dcb94197 100644
--- a/dev-vcs/git/git-1.7.3.4-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.17 2011/08/19 18:43:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.18 2012/08/23 20:18:14 robbat2 Exp $
EAPI=3
diff --git a/dev-vcs/git/git-1.7.9.1.ebuild b/dev-vcs/git/git-1.7.9.1.ebuild
index bc9b81b9ee40..6198438b30d6 100644
--- a/dev-vcs/git/git-1.7.9.1.ebuild
+++ b/dev-vcs/git/git-1.7.9.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.1.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.1.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.9.2.ebuild b/dev-vcs/git/git-1.7.9.2.ebuild
index 885567f37872..ce66c4754a58 100644
--- a/dev-vcs/git/git-1.7.9.2.ebuild
+++ b/dev-vcs/git/git-1.7.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.9.3.ebuild b/dev-vcs/git/git-1.7.9.3.ebuild
index 53e5fcf28ab5..a5c09312a197 100644
--- a/dev-vcs/git/git-1.7.9.3.ebuild
+++ b/dev-vcs/git/git-1.7.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.3.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.3.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.9.4.ebuild b/dev-vcs/git/git-1.7.9.4.ebuild
index 1bca4749c6dd..5ae18aad25e2 100644
--- a/dev-vcs/git/git-1.7.9.4.ebuild
+++ b/dev-vcs/git/git-1.7.9.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.4.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.4.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild
index 4125cc4d4cf1..18bc8b373224 100644
--- a/dev-vcs/git/git-1.7.9.7.ebuild
+++ b/dev-vcs/git/git-1.7.9.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.5 2012/07/27 17:14:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.9.ebuild b/dev-vcs/git/git-1.7.9.ebuild
index e53a31588356..100041fa07de 100644
--- a/dev-vcs/git/git-1.7.9.ebuild
+++ b/dev-vcs/git/git-1.7.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-1.7.9_rc2.ebuild b/dev-vcs/git/git-1.7.9_rc2.ebuild
index b69df564bc23..67b64f3ef1dd 100644
--- a/dev-vcs/git/git-1.7.9_rc2.ebuild
+++ b/dev-vcs/git/git-1.7.9_rc2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.5 2012/06/14 04:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.6 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 93b358bb4240..29501a88378e 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.35 2012/08/22 05:10:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.36 2012/08/23 20:18:14 robbat2 Exp $
EAPI=4
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
perl? ( dev-perl/Error
dev-perl/Net-SMTP-SSL
dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI app-text/highlight )
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
)
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 52b84f64d19d..41c2e4977b96 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -28,5 +28,6 @@
<flag name="webdav">Adds support for push'ing to HTTP repositories via DAV.</flag>
<flag name="gtk">Include the gitview contrib tool.</flag>
<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support.</flag>
+ <flag name="highlight">GitWeb support for app-text/highlight.</flag>
</use>
</pkgmetadata>