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

(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 1191738E)

4 files changed, 14 insertions, 42 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/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() {