Dont let users upgrade from 0.9.x to >=1.0.x without removing the old version fist; otherwise some plugins are relinked to the old libvlc's and will not work, thanks libtool...

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 35 insertions, 11 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 4a6c9b493be4..8d3dcd0c0bac 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.445 2009/06/18 08:16:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.446 2009/06/18 16:53:58 aballier Exp $
+
+  18 Jun 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.0_rc4.ebuild,
+  vlc-1.0.9999.ebuild, vlc-9999.ebuild:
+  Dont let users upgrade from 0.9.x to >=1.0.x without removing the old
+  version fist; otherwise some plugins are relinked to the old libvlc's and
+  will not work, thanks libtool...
 
 *vlc-1.0.0_rc4 (18 Jun 2009)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7b7c62726cba..15a9c21d42fd 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,15 +10,15 @@ DIST vlc-patches-62.tar.bz2 5860 RMD160 1fda0b8308a8452581ba8c2516f11e413d396871
 EBUILD vlc-0.9.8a.ebuild 11400 RMD160 f7400c549356e47dc52b5e5aefe7b900221528aa SHA1 5326f487a415499f0ef49f0253004eaee90fd168 SHA256 2f0be5cfd037a66d8f7bade0128fa4c27f1eefc755fe55f9a8e7a86ea31ec155
 EBUILD vlc-0.9.9999.ebuild 11088 RMD160 859547b92b4abb1288200a6e78c619ba1f67dd7e SHA1 c1fee157532b4a044e72538d160807330a59421f SHA256 a6f944b1612fd871a27241801f61a9d5a2925319d5afd4cd28f3937289ee8cf3
 EBUILD vlc-0.9.9a-r1.ebuild 11148 RMD160 5797a8de8959f179d8c19061c9da0ba38f2ac89b SHA1 3dc88a73c3ed96aa96eb50996abf6bf67e8347f8 SHA256 d1bb064bb9785fed6f7e7a7324ecadc5d20a3bd1d9ab2ebf81033d3b3e8c264b
-EBUILD vlc-1.0.0_rc4.ebuild 11245 RMD160 8c3f05b5a26ef3f266bb673010d2f1378ece1590 SHA1 b216cde73a446a69db80607d087fd750c95504cb SHA256 457fe4fece657d55145fe7b45e345c25cf79bbc8d0564632fe5f5fc4bf862b01
-EBUILD vlc-1.0.9999.ebuild 11192 RMD160 2b7ea8b834f8e81ef53075390ee5464ff96e6e10 SHA1 141b464ee5101a470a6848504f9c8dd9e1aef996 SHA256 baf68aaed909e8f95e092640d2c86d84982b70d8cbe51574ab2ee447b3fb0bb8
-EBUILD vlc-9999.ebuild 11189 RMD160 20db11a7227a3eedb86cd600497248c0cfcb5221 SHA1 139ac366e8fea3cbc699d9e466bcbcac4ea70802 SHA256 885d41739ad0216a6c1922220a050888721a606b78d6c606696877f7954aaab1
-MISC ChangeLog 71707 RMD160 f11a8ff540c7a4f4f12959a83446dac8b59fea19 SHA1 84c8b4d552ce56ea40b56df3f6076f8b6b422d1d SHA256 2cc4334f2b099e3da1489a636ad5346a3c94b7d13e85c27b12c519393cf3a4fc
+EBUILD vlc-1.0.0_rc4.ebuild 11519 RMD160 15caaa59d945a81311d2f03888ae1a58a2e08e12 SHA1 e66ab09c373e8c3ece56f3a13484aaaf20d7d239 SHA256 7a5a76dea94acc1569a5c9a89c1c1a718ff914ed483e954f5e982a6701d23e70
+EBUILD vlc-1.0.9999.ebuild 11466 RMD160 ca7bed4c9d4ea9e20b8490ccd96054fa6c1b8965 SHA1 2616d1972d8f9c977f48fa64a8b057912d8bc2e6 SHA256 0b2d6ca3b90faaf740595e0ac4d33fed8072e3abb7a5150611da7dcc20ef15ac
+EBUILD vlc-9999.ebuild 11463 RMD160 28c5ceed7ae0388d715b946607ed4603dc141769 SHA1 341b18f5218db4b7a0b1a18bd70b501fa89d0a29 SHA256 8fd930b759cbb1257aeb25c8eb8a3620edda9978974d75d375f4e2c0e8cddfd4
+MISC ChangeLog 72005 RMD160 0632265eab5bedbb5f5639f629e0763009d7ef42 SHA1 2b785f7f2cd7a6351048d9370aa390c1840158e8 SHA256 892de90f4997d09c9e79cd5216d49aec6b6e09d01f01f33eedd8c7f563992c09
 MISC metadata.xml 3794 RMD160 5e53cb33ee6b76fe1ab66571e15737549d68ddb7 SHA1 1465365af0998965b10dd164ed5fcdf8a7cb12fe SHA256 4cf2be37ea96e4d4f12f4517574c68a30e4799acd9621281a99d65adee871fac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko599YACgkQvFcC4BYPU0qmTQCggwtObQ63ObglzquLou42jUkr
-eC8AoMINM4mKje2sHty6yAgSxjvOPDFU
-=cbfH
+iEYEARECAAYFAko6cS4ACgkQvFcC4BYPU0rKNQCgoP4BmwdwXpUU+GjkfEWZZ/eu
+rikAn3P5jIz7cm1KBOIG4HxJY9Hadiku
+=iHPK
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.0_rc4.ebuild b/media-video/vlc/vlc-1.0.0_rc4.ebuild
index 480db3a70003..6fb4c4ff6c52 100644
--- a/media-video/vlc/vlc-1.0.0_rc4.ebuild
+++ b/media-video/vlc/vlc-1.0.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_rc4.ebuild,v 1.1 2009/06/18 08:16:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_rc4.ebuild,v 1.2 2009/06/18 16:53:58 aballier Exp $
 
 EAPI="1"
 
@@ -184,6 +184,12 @@ vlc_use_enable_force() {
 }
 
 pkg_setup() {
+	if has_version '<=media-video/vlc-0.9.9999'; then
+		eerror "Please unmerge vlc-0.9.x first before installing ${P}"
+		eerror "If you don't do that, some plugins will get linked against"
+		eerror "the old ${PN} version and will not work."
+		die "Unmerge vlc 0.9.x first"
+	fi
 	vlc_use_needs skins truetype
 	vlc_use_force skins qt4
 	vlc_use_needs cddax cdio
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index 9c6e6c813ce1..feb0a22093ce 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.3 2009/06/05 10:04:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.4 2009/06/18 16:53:58 aballier Exp $
 
 EAPI="1"
 
@@ -184,6 +184,12 @@ vlc_use_enable_force() {
 }
 
 pkg_setup() {
+	if has_version '<=media-video/vlc-0.9.9999'; then
+		eerror "Please unmerge vlc-0.9.x first before installing ${P}"
+		eerror "If you don't do that, some plugins will get linked against"
+		eerror "the old ${PN} version and will not work."
+		die "Unmerge vlc 0.9.x first"
+	fi
 	vlc_use_needs skins truetype
 	vlc_use_force skins qt4
 	vlc_use_needs cddax cdio
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 0dbc931dd86a..72354b7b5cf9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.10 2009/06/05 10:04:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.11 2009/06/18 16:53:58 aballier Exp $
 
 EAPI="1"
 
@@ -184,6 +184,12 @@ vlc_use_enable_force() {
 }
 
 pkg_setup() {
+	if has_version '<=media-video/vlc-0.9.9999'; then
+		eerror "Please unmerge vlc-0.9.x first before installing ${P}"
+		eerror "If you don't do that, some plugins will get linked against"
+		eerror "the old ${PN} version and will not work."
+		die "Unmerge vlc 0.9.x first"
+	fi
 	vlc_use_needs skins truetype
 	vlc_use_force skins qt4
 	vlc_use_needs cddax cdio