summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-02-17 12:37:48 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-02-17 12:37:48 +0000
commitf3f00d22973293616e8dac155810be58a0457e86 (patch)
treed4525ce228293999e5bc2e2db99f43e9a2f6670d /dev-vcs
parentPass correct blas path to configure, pass {tk,tcl}-config scripts to configur... (diff)
downloadgentoo-2-f3f00d22973293616e8dac155810be58a0457e86.tar.gz
gentoo-2-f3f00d22973293616e8dac155810be58a0457e86.tar.bz2
gentoo-2-f3f00d22973293616e8dac155810be58a0457e86.zip
Version bump. Removed old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog8
-rw-r--r--dev-vcs/git/git-1.9.0.ebuild (renamed from dev-vcs/git/git-1.8.5.3.ebuild)9
-rw-r--r--dev-vcs/git/git-1.9.0_rc3.ebuild4
3 files changed, 12 insertions, 9 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 1670ea7b04d6..f8bca20743e9 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.248 2014/02/13 23:20:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.249 2014/02/17 12:37:48 polynomial-c Exp $
+
+*git-1.9.0 (17 Feb 2014)
+
+ 17 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -git-1.8.5.3.ebuild,
+ git-1.9.0_rc3.ebuild, +git-1.9.0.ebuild:
+ Version bump. Removed old.
*git-1.8.5.5 (13 Feb 2014)
diff --git a/dev-vcs/git/git-1.8.5.3.ebuild b/dev-vcs/git/git-1.9.0.ebuild
index 9c41d97d2c9b..546c302ac13c 100644
--- a/dev-vcs/git/git-1.8.5.3.ebuild
+++ b/dev-vcs/git/git-1.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.3.ebuild,v 1.3 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.0.ebuild,v 1.1 2014/02/17 12:37:48 polynomial-c Exp $
EAPI=5
@@ -89,7 +89,7 @@ DEPEND="${CDEPEND}
app-text/xmlto
)
nls? ( sys-devel/gettext )
- test? ( app-crypt/gnupg )"
+ test? ( app-crypt/gnupg )"
# Live ebuild builds man pages and HTML docs, additionally
if [[ ${PV} == *9999 ]]; then
@@ -224,10 +224,7 @@ src_unpack() {
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
-
- # honor and correctly quote DISTDIR (from upstream git master)
- epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
+ epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
diff --git a/dev-vcs/git/git-1.9.0_rc3.ebuild b/dev-vcs/git/git-1.9.0_rc3.ebuild
index 2b4b4d647694..aded71922943 100644
--- a/dev-vcs/git/git-1.9.0_rc3.ebuild
+++ b/dev-vcs/git/git-1.9.0_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.0_rc3.ebuild,v 1.1 2014/02/08 20:14:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.0_rc3.ebuild,v 1.2 2014/02/17 12:37:48 polynomial-c Exp $
EAPI=5
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- KEYWORDS="-*" # This isn't ready for main tree yet, but here so we can work on reducing patches still.
+ KEYWORDS="" # This isn't ready for main tree yet, but here so we can work on reducing patches still.
else
SRC_URI=""
KEYWORDS=""