Remove symlinks and postinst, the two projects diverged enough application wise

Package-Manager: portage-2.2.0_alpha165/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

5 files changed, 21 insertions, 49 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index fa6b3dbb39b4..1fa325c60bbb 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.144 2013/03/02 14:31:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.145 2013/03/08 11:15:02 lu_zero Exp $
+
+  08 Mar 2013; Luca Barbato <lu_zero@gentoo.org> libav-9.3.ebuild,
+  libav-9.9999.ebuild, libav-9999.ebuild:
+  Remove symlinks and postinst, the two projects diverged enough application
+  wise
 
 *libav-9.3 (02 Mar 2013)
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index a66daa20d0b9..c0763f7f2830 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -12,15 +12,15 @@ EBUILD libav-0.8.4.ebuild 9093 SHA256 392473a04603b5f3f71a016fd142a92b4c773c83a7
 EBUILD libav-0.8.5.ebuild 9150 SHA256 9da77bb30ebd50fef110b3c3024a09c81a28ced9daaf6576e02d0d3741451674 SHA512 10b04e57ad78906773e98748b78b12643167655fd6d81069ed9c93c9d4164a2979b9007922f1e54fbe442f1f6d0525194aa18128da63f396a7e5103670ba5c8f WHIRLPOOL f554fcd8653ad28dfeffed25a3525e4f776061d42dccec61a6b49055451f107a6651a1c13daee1101f97565c9796b2ce3b5767ca59131a011372fbd496b58a0b
 EBUILD libav-0.8.9999.ebuild 9110 SHA256 596fc2c01d57af2f3af6af4b45139eb766b9d43503f8874ed82bbff6a099d0e1 SHA512 1717f9cf91ab218e302c685e7f3ab0231ce731fc79c45fb5b797ce7243125317d51fd788d151742407164b49f54528408382f9672e053a09438de44132bc7ef0 WHIRLPOOL a1c93c43997b327982e24dea09a4c64189133e270528a499e8cfb9ce64dd7c86598ef212264d6f52e30dcaa1ee3ce8f60725e225aaa8f9eedc0f34832f3a4d1b
 EBUILD libav-9.2.ebuild 9209 SHA256 2de366b1be468d37fdf1aba55daa4c601c974fe071887ce10e848fb4951b3cca SHA512 20082081a4c66fc6442953dc276e9fafdf137b868b63383bab5d105ecccaf27582b8fc3fcd67f4c232c4f0323757ceca4b1aabeff080ab84b56d3ccc76fe7ed1 WHIRLPOOL 33baa32b5670c75d361cd33900a4f85de27849c60321885be1f86007e168bd68466afa4f2c1f864976f0fb5212432152058cc31526d007d6e4bdb051d5bca56e
-EBUILD libav-9.3.ebuild 9209 SHA256 ef874395ca979bfa191c7183b7e14d675ba23675cb7b4e2aed18b1df0bef48e8 SHA512 1698e7b05049df28c92084c27e5157ed6ddf7e83b128c04ad3f795f1c4b717ad2ea513987d4ed6535182ff959598fa5c70e8cb007dcea9fb8ac5cc3039a6874e WHIRLPOOL c485a1e6295b6a6a5333a48d9ad0d39260a9fd19f18c62f55bd84d3d2019310587d078ce70f001127869b662fd503e06f8ecf060fdf32ff444f89c87eb96bdc0
-EBUILD libav-9.9999.ebuild 9221 SHA256 28622def870362de2b79f9f40d3b7c14457b2b54c3f474545847cc4bf48830a0 SHA512 aa9b5a136b133f9c435a394939e013d3f5fff9d8b7343ddef4e66abf14fa9c7dceb59821522ebaf391211a840cd79672fc58e159115761c0fbd3989b13f4deed WHIRLPOOL 165abbbc8c03560cec32dcbe715ad14cc1550bc576a3e0a2ccdab4db6069e0cc3071a7338395aba4791d2bdc800832c3c7b02c0aa98487975fcfbea714c5b9e6
-EBUILD libav-9999.ebuild 9098 SHA256 8b440cc6669897456f79d326b62d514ca694590c0d906807616a659dd81a5618 SHA512 fec355fe239b2bb88839487918f35ac3634fbe4ed7c48ea5c46995d767c711a74d35bc7414fe2f21b587a0d71fd269dfb1b29321fe51728d9935923321f233cc WHIRLPOOL b31b3b5e53cda3e403ec51d3a09e3f47a278eb136d32c0bfed04cf36f627e606d0ea9e7570a9739e1dee7ffa87f7ee0d58ef8441bf3cf5cdf85acb7d5ad87489
-MISC ChangeLog 21252 SHA256 b9bc1ced0260fe8d09190f0688d03a38849b187e1d07bf114fba0d51b9bd47e5 SHA512 216411be46b266f73ae229d47efeef9ed5aa9a894d0c2e07e625fe1e25369acdf2f02776e1b7721a7e4c2ffcaf4b3a7a93be6d8ef50bdbb25d4a0a30929a54d7 WHIRLPOOL 3cc179d2a97582a4e26c47985a1080cf00b2c100aedeb4a5cbe165772fa1b1860e14f3bb614da8b55d645e6f9524aa07b8070905d591e92489a246f702e74e75
+EBUILD libav-9.3.ebuild 8839 SHA256 93571cea695971202249329909449171b7c142f35fa443f70f9c66d14168e3ee SHA512 6e078964f95318b776dd623ec442075dfbc39b824099da515d9967647b14e4c2030074a8a9223af3528761b72e31202538a99a68f41f37748a9fc873fa9ba917 WHIRLPOOL af5e8557afc31a412c08167e3313ed332d657a259b7deab0d2015434559fbbd21af4bf75c68adf7a7f5d7b936610f8babf581eaddbafa7608816747a0eca2ea1
+EBUILD libav-9.9999.ebuild 8840 SHA256 3f7315077297c66831c3b46b3bf4a700e1d5727f541dafd11433aa5fc5c42f21 SHA512 5216b65c619138c7450cc19a84170c004703f7adb6152cfda95d81060530673a8120de9d5177bd034f11136397186e5985c89424e41dadaa4569dc1f8d26243b WHIRLPOOL b18da3b5337778f8a04834e922ef8c6c16a5c338a53db81c0861a6e19b9f59a861f436d9f33970708e6daeaad9789e376dd9a703946ef90dabe48774a30ef21d
+EBUILD libav-9999.ebuild 8717 SHA256 ccf0645aa7d1e2a433d2836e7f233fd8bea0d5f11bd65fa35beb94cf0571a1bf SHA512 0f0cf48641e8e5a963fe2772930570560a564b15a335501a5ec2df6489042661ee7eed03da045a29d7ba33dec8da9dee5e0c34695a1a4ec53892bcc4167b09bc WHIRLPOOL 67896d85adbcf09762787b245b642135bae884a7ea53cb8a82dfe9b088bb47b53e54c40ab0e5ed3dbdef9d590e22b8faeefa4d6af93c75d5602f5e0da290f944
+MISC ChangeLog 21446 SHA256 9364d98a00f8704d0c19c528ed443bcd9d280941823d26fb52c47820cd6a6a81 SHA512 c9634a41b081bbde95b1fee33e09f2f33d159c1978755d36ae8be1705c1c22bdc6115ae5d77e2bdd24dc056996120bde1043035197f2835ccb305e0b3dd3f88c WHIRLPOOL e39ad02a4b15eacd4e0fffceba9c6a1b392d91082a4ad37991245d6e697a4c76e55ccc326db582ab9dc472ca8c3cf4928f94ad59348ae6f99e699e69aa8f4629
 MISC metadata.xml 3023 SHA256 26380d1657785b484265cc5ce3112dfef63231857cd64f81300b30b806a2f8e8 SHA512 7eb1ea995315cf8caed89296b5fe1cdb9ebaceb8e0cb8e2e1bef22f59f0a518ce128d4e43d18550bdc711df9237790cdf91c775d28e016ea752a3abfa6faa533 WHIRLPOOL 45f87adcebdea041818809051ad67dbb3b880f46971dbab594b4b7dfe4d31a84d97dc5b6e45bb0c51b50b21142074490bd8d268d9b73bfb5ee839ee78e428b0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAlEyDWgACgkQcXOrnRGRc47QsgEAhlXLfYwCxiN8A2najGAVZejm
-A8rx79iwjCSuJ/CMA/oA/jxNPxF0KIqQ8BySxDNGMp5IgJ/P5xbRpIR0Sd6s50ZX
-=ayug
+iF4EAREIAAYFAlE5yFEACgkQcXOrnRGRc47ihwD/SktGm9TkasHYaWGqOEoF9oEz
+hzNd5aQUHnVijQawS7MBAKYkbsI+EEpDSCTL1XDDq0XmCXhYm3HI7ktFe8xA5d9R
+=Sftb
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9.3.ebuild b/media-video/libav/libav-9.3.ebuild
index 3db215c0f90d..7267185ab077 100644
--- a/media-video/libav/libav-9.3.ebuild
+++ b/media-video/libav/libav-9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.3.ebuild,v 1.1 2013/03/02 14:31:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.3.ebuild,v 1.2 2013/03/08 11:15:02 lu_zero Exp $
 
 EAPI=5
 
@@ -195,7 +195,7 @@ src_configure() {
 	use frei0r && myconf+=" --enable-frei0r"
 	use truetype &&  myconf+=" --enable-libfreetype"
 
-	# Threads; we only support pthread for now but ffmpeg supports more
+	# Threads; we only support pthread for now
 	use threads && myconf+=" --enable-pthreads"
 
 	# Decoders
@@ -313,17 +313,6 @@ src_install() {
 			dobin tools/${i}
 		done
 	fi
-
-	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
-		dosym  ${i} /usr/bin/${i/av/ff}
-	done
-}
-
-pkg_postinst() {
-	elog "Please note that the programs formerly known as ffplay, ffserver"
-	elog "and ffprobe are now called avplay, avserver and avprobe."
-	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv"
 }
 
 src_test() {
diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild
index 3ac5c6bf8060..2cc372ad36e9 100644
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.3 2013/01/17 11:29:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.4 2013/03/08 11:15:02 lu_zero Exp $
 
 EAPI=5
 
@@ -199,7 +199,7 @@ src_configure() {
 	use frei0r && myconf+=" --enable-frei0r"
 	use truetype &&  myconf+=" --enable-libfreetype"
 
-	# Threads; we only support pthread for now but ffmpeg supports more
+	# Threads; we only support pthread for now
 	use threads && myconf+=" --enable-pthreads"
 
 	# Decoders
@@ -230,7 +230,7 @@ src_configure() {
 	# Try to get cpu type based on CFLAGS.
 	# Bug #172723
 	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# If they contain an unknown CPU it will not hurt since configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
 		[[ "${i}" == "native" ]] && i="host" # bug #273421
@@ -317,17 +317,6 @@ src_install() {
 			dobin tools/${i}
 		done
 	fi
-
-	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
-		dosym  ${i} /usr/bin/${i/av/ff}
-	done
-}
-
-pkg_postinst() {
-	elog "Please note that the programs formerly known as ffplay, ffserver"
-	elog "and ffprobe are now called avplay, avserver and avprobe."
-	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv"
 }
 
 src_test() {
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 5e1db8e77580..07cf2548cc1d 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.56 2013/01/17 11:29:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.57 2013/03/08 11:15:02 lu_zero Exp $
 
 EAPI=5
 
@@ -198,7 +198,7 @@ src_configure() {
 	use frei0r && myconf+=" --enable-frei0r"
 	use truetype &&  myconf+=" --enable-libfreetype"
 
-	# Threads; we only support pthread for now but ffmpeg supports more
+	# Threads; we only support pthread for now
 	use threads && myconf+=" --enable-pthreads"
 
 	# Decoders
@@ -229,7 +229,7 @@ src_configure() {
 	# Try to get cpu type based on CFLAGS.
 	# Bug #172723
 	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# If they contain an unknown CPU it will not hurt since configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
 		[[ "${i}" == "native" ]] && i="host" # bug #273421
@@ -316,17 +316,6 @@ src_install() {
 			dobin tools/${i}
 		done
 	fi
-
-	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
-		dosym  ${i} /usr/bin/${i/av/ff}
-	done
-}
-
-pkg_postinst() {
-	elog "Please note that the programs formerly known as ffplay, ffserver"
-	elog "and ffprobe are now called avplay, avserver and avprobe."
-	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv"
 }
 
 src_test() {