Fixup version settings in snapshot. Remove useless quoting. Handle branching magically.

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

5 files changed, 35 insertions, 18 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index b9c36f6dc3ba..17825590c180 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.5 2011/03/27 14:32:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.6 2011/03/27 14:42:22 scarabeus Exp $
+
+  27 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.9999.ebuild,
+  libav-0.7_pre20110327.ebuild, libav-9999.ebuild:
+  Fixup version settings in snapshot. Remove useless quoting. Handle branching
+  magically.
 
 *libav-0.7_pre20110327 (27 Mar 2011)
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index a2c0d5c06e49..2d4ad735cf32 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.6.2-fix_enable_hardcoded_tables.patch 1387 RMD160 3ccd0be1f6612ad45dcd78dee17817cf03bcda87 SHA1 13d1e51c17c25ba9adfb9d878334343746f917e0 SHA256 2e72e53be9df93128fc75ad4adfa9208d31f496c7bb9924c8a2e14ee2cb8d9f6
 AUX 0.6.2-float_arrays.patch 1611 RMD160 960188d97261729526187c53a281a03c31a6a95a SHA1 92bb3062933cd9540eb8b05efc6cbebb38e94a0c SHA256 311e255309dfd6a045e38303d80b534aec9444cfe314d0b4d585688075c7dd7d
 DIST libav-0.6.2.tar.bz2 3639862 RMD160 fbdee25614940253e018e42a633da579704146fd SHA1 b79dc56a08f4ef07b41d1a78b2251f21fde8b81d SHA256 eb13f20bfa09664559e81ff9691cebcb77a763320ddf63c47a402351409697af
 DIST libav-0.7_pre20110327.tar.xz 3496216 RMD160 3c7d6e3c05eb18575520d287615229ff415b5c22 SHA1 935a7afce252ba465f70f0122562c2c9d4928ff3 SHA256 46ac44e84c67c32f33d438f61e508c7f5683dcdbc5eefb4ad3eeed09c7c8e22f
 EBUILD libav-0.6.2.ebuild 7522 RMD160 f86d1636ad93fa5362eaff5936be611da6008ad6 SHA1 d4c1c4453f6262e75644f13a6d83091fa45e6f8d SHA256 f1da1a3d5c6f1645641b129ea2650953a352a2fd79d4cbfacc8241c90b6a4ea0
-EBUILD libav-0.6.9999.ebuild 7441 RMD160 6064d1c999e1ffef45efa5cc120f6b41f948135f SHA1 f469486c1d1bb390d47a9290a6b380069ba0f760 SHA256 1660b49e0e7e0a5e2ef360f6a899bee1c8f7a3c6c3ffc6f151427f603c67d97a
-EBUILD libav-0.7_pre20110327.ebuild 7421 RMD160 1571f21317530921603dfe069c55d6333346f4a5 SHA1 faafb548302002470bdd536d141fb9eb49414380 SHA256 b30c53f4de3c2c16b9eaec63ba6f7fcdb5461bc1a3b7b0d7fb38385efe5049b2
-EBUILD libav-9999.ebuild 7410 RMD160 15f380353a13f03fdfa94e3b7b796dd63ade6a72 SHA1 19b7b938e591a3ba3e5e240edfad7a825e310390 SHA256 5da6f8c7cbac04119ab85f2ad9485b3929f4328d9ff806db6372d6a757491ea0
-MISC ChangeLog 1349 RMD160 b7ce8714fad0d96b8a4288adac2458008c62f99d SHA1 66b7d5f878d977ca3ed8ac1b02bd60e486b8533a SHA256 879f964158ec821168f9fcdd840fdfcee2bfd302979d02b7223ed9f8f41f9a6c
+EBUILD libav-0.6.9999.ebuild 7471 RMD160 c5269d1ce1c6f31a34642b45e81bca0f212c6ad2 SHA1 d9f806c82cacde5e98ff66ad26da6ff7f1032011 SHA256 4adec6f5b80ca9b699198fe960d87f881808d176cf4a5c006aff8abfe882194a
+EBUILD libav-0.7_pre20110327.ebuild 7478 RMD160 b959410ee6a8d922a9801da51bcbea20204b57c3 SHA1 7237ec86ad31311b0047ba5d2e4f217e20917fbe SHA256 99b9c5be6aa36f3bcd1a1b1316e99b49d57811b49fddeda1e86c2e786edd14f2
+EBUILD libav-9999.ebuild 7467 RMD160 db84be7a63a2450d704d7c76ecdf7548ff18f7f8 SHA1 a9a6e7707f658144270494ec35723c9847653fea SHA256 b24afc27538c5b12b3c77077a1386d669cbd42fe58f78436bc20a3f119abfa50
+MISC ChangeLog 1573 RMD160 aa284189efda297ff6b6d71b93cc8f9e921b4227 SHA1 f4254ae2f737804ab6acbc52f480e1e664c90fa5 SHA256 69b7456110b0da77a0528e24b38fa7e49b004c0c2fa9522f690249e6c7aadc98
 MISC metadata.xml 2094 RMD160 fc07c148e4d18b78f882239ad572f8eff414435f SHA1 06bbcec71e7fe3bd9150d4dd8fbae1fb625f0650 SHA256 fe816de8e89cf3879641d66316f4a17991bc22a9745c71330a51993a70548d7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2PS4UACgkQHB6c3gNBRYeqhwCgiEKutCULoTa+v4TfNznAX6SC
+d48An0CZo1sZG4sKO+Yar/Ne/iWj1ujn
+=45zS
+-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.6.9999.ebuild b/media-video/libav/libav-0.6.9999.ebuild
index d852b03da1a8..9e66c9058492 100644
--- a/media-video/libav/libav-0.6.9999.ebuild
+++ b/media-video/libav/libav-0.6.9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild,v 1.3 2011/03/27 14:11:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild,v 1.4 2011/03/27 14:42:22 scarabeus Exp $
 
 EAPI=4
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git"
 	EGIT_REPO_URI="git://git.libav.org/libav.git"
-	EGIT_BRANCH="release/0.6"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -16,7 +16,7 @@ DESCRIPTION="Complete solution to record, convert and stream audio and video."
 HOMEPAGE="http://libav.org/"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-elif [[ "${PV%_p*}" != "${PV}" ]] ; then # Gentoo snapshot
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.bz2"
@@ -79,8 +79,8 @@ REQUIRED_USE="bindist? ( !faac )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
-	if [[ "${PV%_p*}" != "${PV}" ]]; then
-		sed -i -e "s/UNKNOWN/GIT-r${PV#*_p}/" "${S}/version.sh" || die
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
 }
 
diff --git a/media-video/libav/libav-0.7_pre20110327.ebuild b/media-video/libav/libav-0.7_pre20110327.ebuild
index 6eb2d7304b93..2c1c10a4cbad 100644
--- a/media-video/libav/libav-0.7_pre20110327.ebuild
+++ b/media-video/libav/libav-0.7_pre20110327.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7_pre20110327.ebuild,v 1.1 2011/03/27 14:32:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7_pre20110327.ebuild,v 1.2 2011/03/27 14:42:22 scarabeus Exp $
 
 EAPI=4
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git"
 	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -15,7 +16,7 @@ DESCRIPTION="Complete solution to record, convert and stream audio and video."
 HOMEPAGE="http://libav.org/"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-elif [[ "${PV%_p*}" != "${PV}" ]] ; then # Gentoo snapshot
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.bz2"
@@ -78,8 +79,8 @@ REQUIRED_USE="bindist? ( !faac )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
-	if [[ "${PV%_p*}" != "${PV}" ]]; then
-		sed -i -e "s/UNKNOWN/GIT-r${PV#*_p}/" "${S}/version.sh" || die
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
 }
 
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 9d3bda189244..cc9e44df52f3 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.3 2011/03/27 14:11:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.4 2011/03/27 14:42:22 scarabeus Exp $
 
 EAPI=4
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git"
 	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -15,7 +16,7 @@ DESCRIPTION="Complete solution to record, convert and stream audio and video."
 HOMEPAGE="http://libav.org/"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-elif [[ "${PV%_p*}" != "${PV}" ]] ; then # Gentoo snapshot
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.bz2"
@@ -78,8 +79,8 @@ REQUIRED_USE="bindist? ( !faac )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
-	if [[ "${PV%_p*}" != "${PV}" ]]; then
-		sed -i -e "s/UNKNOWN/GIT-r${PV#*_p}/" "${S}/version.sh" || die
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
 }