summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-03 22:16:37 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-03 22:16:37 +0000
commit438018acf688018043ca7574beca2d548d6d51d8 (patch)
treee47022a9fa69894dc18e0259ffc0682360743195 /media-video
parentCreate /var/run/munin if it's missing, otherwise munin-node will not start (a... (diff)
downloadgentoo-2-438018acf688018043ca7574beca2d548d6d51d8.tar.gz
gentoo-2-438018acf688018043ca7574beca2d548d6d51d8.tar.bz2
gentoo-2-438018acf688018043ca7574beca2d548d6d51d8.zip
Drop local setting of version and rely on buildscript :)
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer2/ChangeLog6
-rw-r--r--media-video/mplayer2/mplayer2-2.0.ebuild9
-rw-r--r--media-video/mplayer2/mplayer2-9999.ebuild9
3 files changed, 7 insertions, 17 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 1dc3d4a74783..432af9768a66 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.11 2011/04/03 20:46:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.12 2011/04/03 22:16:37 scarabeus Exp $
+
+ 03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Drop local setting of version and rely on buildscript :)
03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild
index 5dfd5748d916..9fe7aaa3907e 100644
--- a/media-video/mplayer2/mplayer2-2.0.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.8 2011/04/03 20:46:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.9 2011/04/03 22:16:37 scarabeus Exp $
EAPI=4
@@ -223,13 +223,6 @@ src_unpack() {
}
src_prepare() {
- if [[ ${PV} = *9999* ]]; then
- git_src_prepare
- # Set GIT version manually
- echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \
- > VERSION || die
- fi
-
# fix path to bash executable in configure scripts
local bash_scripts="configure version.sh"
sed -i \
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 12fe5f7b302b..1d09d634c7dd 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.9 2011/04/03 20:46:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.10 2011/04/03 22:16:37 scarabeus Exp $
EAPI=4
@@ -223,13 +223,6 @@ src_unpack() {
}
src_prepare() {
- if [[ ${PV} = *9999* ]]; then
- git_src_prepare
- # Set GIT version manually
- echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \
- > VERSION || die
- fi
-
# fix path to bash executable in configure scripts
local bash_scripts="configure version.sh"
sed -i \