generate on the fly a snapshot version for live ebuilds and use that file for generat...

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2a106f37fcc98ba2b89fce948a975e4922f1d8c2..f04467924108441d0e54383e485a775bf2864b07 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.816 2011/12/16 13:24:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.817 2011/12/16 13:36:05 aballier Exp $
+
+  16 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  generate on the fly a snapshot version for live ebuilds and use that file for
+  generating a VERSION file that advertises it is a Gentoo build as suggested
+  by Reimar Döffinger in bug #328817
 
   16 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
   generate snapshot_version the same way as upstream version.sh and use printf

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 56bfd45afff2d99827ddd00eabb56c3a2f9181ce..7c6cb9a7aac379592f1422b6752c74bb3079c236 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -12,13 +12,13 @@ DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08
 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94
 EBUILD mplayer-1.0_rc4_p20111215.ebuild 19479 RMD160 6048ba695449c7b2459f30647ddf00d11a5db393 SHA1 64aeeabfe1718112aafeb132c184fa3377490ae9 SHA256 bd76e50de8cd87faaca63fe48622c9dafe88d7a6af67b693a07487ed091b6a73
-EBUILD mplayer-9999.ebuild 19510 RMD160 61850c78d92efb42dae7b4999924cde32ee6adb9 SHA1 76859f1c49651ba18b6ad7cf810e797608cc6202 SHA256 e5bfe8fc0214a9a8d30fb9603629b8cabc1152ff23fec26f549532761fed6d85
-MISC ChangeLog 142759 RMD160 d89dbab88b4bd7344fc419572d36bdcd3845270c SHA1 48e4d0b0cb5e1db760021aae43e96bddd800a264 SHA256 aa400b14609a0f5558ada8428cdc19404c1b42fe9b472a44b3da9ae80082414c
+EBUILD mplayer-9999.ebuild 19477 RMD160 5d090d0697a2306a41f642b678079c5b5ab77a0d SHA1 396cbece4146877bb62639264bc7cc975b78e8fe SHA256 b1de573802a09d5dd54257777f796c57d4125e0ebe6b0935b38f6957c16c4a56
+MISC ChangeLog 143029 RMD160 defb5bfa11070f3a89603a7c81d45262a3807ba3 SHA1 ab042640b40df156c706c52310c7114207288808 SHA256 be327d3ea807b563c26bbd256cc7e709d761de38ef260ae180dc15a4e5dfe116
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7rRn8ACgkQvFcC4BYPU0p5DwCgj4yzdaH5ICP6ufpV1gd5h5l2
-ghQAoLGqHo08lWtB9YD2KajUwqAAWUB6
-=o3+e
+iEYEARECAAYFAk7rSUoACgkQvFcC4BYPU0oMkwCfW9dOchsCiVWhRlf0V/qkgw7v
+/cEAnReDhRANuQNtQONmrUcbHCW9OdW5
+=r1Tj
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 6a3bdd18cce31bedfab883e63ca3abcd0b22e76d..4d694d9b3b23c21aea88e33803d2327c4304c895 100644 (file)
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.109 2011/12/16 12:19:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.110 2011/12/16 13:36:05 aballier Exp $
 
 EAPI=4
 
@@ -10,9 +10,6 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-# BUMP ME PLZ, NO COOKIES OTHERWISE
-[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r33094
-
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
@@ -252,14 +249,15 @@ src_unpack() {
 }
 
 src_prepare() {
+       local svf=snapshot_version
        if [[ ${PV} = *9999* ]]; then
                # Set SVN version manually
                subversion_wc_info
-               sed -i -e "s/UNKNOWN/${ESVN_WC_REVISION}/" "${S}/version.sh" || die
-       else
-               # Set version #
-               sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
+               printf "${ESVN_WC_REVISION}" > $svf
        fi
+       [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+       local sv=$(<$svf)
+       printf "SVN-r${sv} (Gentoo)" > VERSION
 
        # fix path to bash executable in configure scripts
        sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die