Drop local setting of version and rely on buildscript :)

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 13 insertions, 23 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/Manifest b/media-video/mplayer2/Manifest
index add59f072b9e..09295b59460f 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -5,14 +5,14 @@ DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0.tar.xz 3675080 RMD160 7dc37f0071a9a8bc348a40b26b480a365a904d62 SHA1 0df8d4e5484128b7b28029273b7704ab5d5419bc SHA256 f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910
-EBUILD mplayer2-2.0.ebuild 17205 RMD160 3ab0df115457a551e71cab11186c5e551cf742f0 SHA1 4180a2169e8e6c3a1b09523f15a352a58c8656c6 SHA256 e6bd4a8221a3a15121cfa5878a0c5306018e13e881540b9c74ddc00438428672
-EBUILD mplayer2-9999.ebuild 17155 RMD160 5a1b34a24229fec91b35f29fb54748af0337efc3 SHA1 706e1de538dff29fb4beb3afd9c50f7214f4f3ba SHA256 1e2e05e0545d68b944a0cf62a2b57eb54745d6e2dff251ece12b200415cb83f5
-MISC ChangeLog 5232 RMD160 35ab22ce5de57798c631ea9e40d70282954613d7 SHA1 8667906bc340ffc7d4ae08c997b8de2b0da02627 SHA256 898bd533aeea281f94b159d7ee3fcf4572c1695daadcb1af53705ae903a9caa7
+EBUILD mplayer2-2.0.ebuild 17034 RMD160 df8b12252dff11c0c4b9c933f2348179a49318b9 SHA1 069a6bb78303c6262550ed9b0373c9005096a894 SHA256 f64df963bd6ed483c3dde917903ba3c8d21f13f936f7fdb0a8376e6ca1280ca6
+EBUILD mplayer2-9999.ebuild 16985 RMD160 2dba8f2306f88bb402dba8d73dae6b08eeda7460 SHA1 19b85d83fca627143ee0fb4eaccc188a91eaa67d SHA256 0b7f325729e85ec706c07c72afff2a3f56b79231daba7a0fb73e261887b4eca0
+MISC ChangeLog 5392 RMD160 97fe45fa04734fa704b32b588405be9e71542e72 SHA1 c170a60c63c6710667b28653272944858d7397fe SHA256 47605ad1285d77474719dcdfbd3d1242ecd353535d272b2f91cb9d5516b8afce
 MISC metadata.xml 3362 RMD160 92db76b2da1919db7ba1293c9ca665db2a2230dd SHA1 a5c3ca0b0dc0c1765a96f250e3ba4471926bec21 SHA256 3e1e3815b292a52c6215a97e38341460ce3d054d0b55dbd880a059c6b60f70de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2Y22kACgkQHB6c3gNBRYdP4wCgwPlXAKptfSmk9MAPl6dRxz3s
-unUAnRsHEOR8Uogm0P+5HOrqypZCsAb5
-=iBGW
+iEYEARECAAYFAk2Y8HIACgkQHB6c3gNBRYfidwCgv6EZ9FqsN+pSvBqPhYgbQy5E
+bb0An1G4R82pvwsp5y3iiCMBum7qHhPC
+=Qen7
 -----END PGP SIGNATURE-----
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 \