diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-01-03 19:42:42 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-01-03 19:42:42 +0000 |
| commit | 25682d306669120d57795033d8985710883a982f (patch) | |
| tree | 993c52b1053a386b2e56662d743cbc4bbe687227 /media-video | |
| parent | Add base_src_make call and make games eclass use it (In preparation for new b... (diff) | |
| download | gentoo-2-25682d306669120d57795033d8985710883a982f.tar.gz gentoo-2-25682d306669120d57795033d8985710883a982f.tar.bz2 gentoo-2-25682d306669120d57795033d8985710883a982f.zip | |
Fix fetching of git repositories, by Paul Mulders <info@mld.demon.nl>, bug #299139, plus some modifications by me to allow switching branches easily.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/vlc/vlc-1.0.9999.ebuild | 11 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 11 |
3 files changed, 19 insertions, 12 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 89c9db52b16f..3009154c0506 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.539 2009/12/26 22:55:41 ranger Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.540 2010/01/03 19:42:42 aballier Exp $ + + 03 Jan 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.9999.ebuild, + vlc-9999.ebuild: + Fix fetching of git repositories, by Paul Mulders <info@mld.demon.nl>, bug + #299139, plus some modifications by me to allow switching branches easily. 26 Dec 2009; Brent Baude <ranger@gentoo.org> vlc-1.0.4.ebuild: Marking vlc-1.0.4 ppc64 for bug 297849 diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild index 0b80de9c5688..3cd125a9da27 100644 --- a/media-video/vlc/vlc-1.0.9999.ebuild +++ b/media-video/vlc/vlc-1.0.9999.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.32 2009/10/18 21:12:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.33 2010/01/03 19:42:42 aballier Exp $ EAPI="2" SCM="" if [ "${PV%9999}" != "${PV}" ] ; then SCM=git - EGIT_REPO_URI="git://git.videolan.org/vlc.git" EGIT_BOOTSTRAP="bootstrap" + EGIT_BRANCH=master + EGIT_PROJECT=${P} if [ "${PV%.9999}" != "${PV}" ] ; then - EGIT_BRANCH=${PV%.9999}-bugfix + EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git" else - EGIT_BRANCH=master + EGIT_REPO_URI="git://git.videolan.org/vlc.git" fi fi diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 623780daa0f0..a555e1535bc0 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.51 2009/12/12 18:19:23 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.52 2010/01/03 19:42:42 aballier Exp $ EAPI="2" SCM="" if [ "${PV%9999}" != "${PV}" ] ; then SCM=git - EGIT_REPO_URI="git://git.videolan.org/vlc.git" EGIT_BOOTSTRAP="bootstrap" + EGIT_BRANCH=master + EGIT_PROJECT=${P} if [ "${PV%.9999}" != "${PV}" ] ; then - EGIT_BRANCH=${PV%.9999}-bugfix + EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git" else - EGIT_BRANCH=master + EGIT_REPO_URI="git://git.videolan.org/vlc.git" fi fi |