bump to rc

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

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 24710c92fc3fbf29895e1bf089953ab12f8b8f7e..970ed0fd022a0565bc3f4e2770a7e89f01788c75 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.586 2010/05/25 07:02:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.587 2010/05/25 12:22:41 aballier Exp $
+
+*vlc-1.1.0_rc (25 May 2010)
+
+  25 May 2010; Alexis Ballier <aballier@gentoo.org> -vlc-1.1.0_pre4.ebuild,
+  +vlc-1.1.0_rc.ebuild:
+  bump to rc
 
   25 May 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.9999.ebuild,
   vlc-9999.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 4d3b2e4d6ab069dd553caca924e5b6cca72a89eb..ba1cd9e894a8726d3ca1f91b4bbee94dfeb2669f 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA1
 
 DIST vlc-1.0.6.tar.bz2 22149704 RMD160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 SHA1 834346a84a71d915440b7741e04b6e02de451786 SHA256 f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842
-DIST vlc-1.1.0-pre4.tar.bz2 22790722 RMD160 475fdd211101b26d3457ea8f4d1717f2e4893f3b SHA1 af35261019105342868d52c9d7b6e73ee7139003 SHA256 0191928f819def349c00f06b61075a1c5da85224edab964e035865a89daac17a
+DIST vlc-1.1.0-rc.tar.bz2 23094772 RMD160 19fb22c5bd2087d646b7ff063076ca8fdd852954 SHA1 48ed0fc70c628daffc5143d73ceae79125219c15 SHA256 23e125721ca7cced16b3c60331d7d58064d2c1f8dc3c384639a78ae4c6fc0806
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
 EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c
 EBUILD vlc-1.0.9999.ebuild 12274 RMD160 907353609dd74ed3feae7521b68bd935b1c41314 SHA1 052cf8cf27b9e8719c8807a1561b8b10d3d48adc SHA256 7fbeecfc14a13c0e315e9a85e6b2389497fbc5f88abc4ad83953fa477d42102d
-EBUILD vlc-1.1.0_pre4.ebuild 11999 RMD160 03dfb7b6eb8c979695b81e2eff24b1bacc49974d SHA1 f2f83a772cac9dc35bc0fd9ddeb30d605401fe45 SHA256 a5d875101dcae067c9f7f633280ddc26e61d549dd812c332ea0b1941d11177d8
+EBUILD vlc-1.1.0_rc.ebuild 12076 RMD160 077c304d4640c23c1f2468a72dde9a92d0cb74d9 SHA1 6b317a4a696f240599fd42c3b24968f8d6155676 SHA256 d3498a31e6bb3cb60a39d7ae0b2d645960e6eb963d14bab94436a5eca144e525
 EBUILD vlc-1.1.9999.ebuild 12024 RMD160 4b465629ba058b97840df849d21d0edfb4ab6b1f SHA1 063e77dd5a6a19110f3120930438b115b8c56c2e SHA256 16538ade0953e9e46c82f13f69f4a6aef97b71431f6122c377f0c53067d5a3ef
 EBUILD vlc-9999.ebuild 12021 RMD160 ece397d7ff4b265cec4e5d71b28c6af2ab588043 SHA1 1588c1a347827baf7fe76b8ddb746b886e96635f SHA256 eb44fd663c1974c64368ca8b901e89161d2c6f8f8e1bb6ef374b429f66a5b785
-MISC ChangeLog 90901 RMD160 02901217544871c63df0e411e4a0ed6a8094a6f9 SHA1 313966ff872dc2de5f03f39c4eb3c6c0ff16e47b SHA256 b0c8f75cbca26627c7c7e8b4262e0f6a47efbf46843d0380c7f43a48ab2c5895
+MISC ChangeLog 91044 RMD160 8f0bc7346390eff11b88dedd7f8d85138e42c394 SHA1 6202b1d907934d04c49a8039db0b420d2391fab6 SHA256 ab9b8cd360ec47b263b884f443065dbcafe7b23e23fca0a0c9eb2d0509013bef
 MISC metadata.xml 4240 RMD160 548096f0459b43b103c315e07db92e50563ea1e7 SHA1 8a12510531e256c4fad1fc6dd6c28e56c0ab46eb SHA256 fdf69f66df99eb7339d0d12d2baddb8b8d338c839ae7d12051375e38621006a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv7dg8ACgkQvFcC4BYPU0rajgCdH8qMhUIajZGIO/nZOciNyIPM
-DOAAoJwkpCt2hVgSjcVbDjyAE1tSLUdj
-=DBZZ
+iEYEARECAAYFAkv7wRcACgkQvFcC4BYPU0ry7gCgieWJfq6d04OFwcFtTWdAy99/
+HYYAnRYovP+HeikrV59byPozUGoh2pLN
+=culx
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-1.1.0_pre4.ebuild b/media-video/vlc/vlc-1.1.0_rc.ebuild
similarity index 97%
rename from media-video/vlc/vlc-1.1.0_pre4.ebuild
rename to media-video/vlc/vlc-1.1.0_rc.ebuild
index 8ae6b26363e6de8c4c3ac18b974daa82d33870b5..e464aaa1018b272963ab6ec9a4f30c4996e599d9 100644 (file)
--- a/media-video/vlc/vlc-1.1.0_pre4.ebuild
+++ b/media-video/vlc/vlc-1.1.0_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre4.ebuild,v 1.5 2010/05/19 07:36:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_rc.ebuild,v 1.1 2010/05/25 12:22:41 aballier Exp $
 
 EAPI="2"
 
@@ -53,7 +53,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
        png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
        schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
        svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
-       vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
+       vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
                !!<=media-video/vlc-1.0.99999
@@ -109,7 +109,8 @@ RDEPEND="
                opengl? ( virtual/opengl )
                png? ( media-libs/libpng sys-libs/zlib )
                projectm? ( media-libs/libprojectm )
-               pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 )
+               pulseaudio? ( >=media-sound/pulseaudio-0.9.11
+                       !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
                qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
                remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
                samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
@@ -140,6 +141,7 @@ RDEPEND="
                vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
                vorbis? ( media-libs/libvorbis )
                win32codecs? ( media-libs/win32codecs )
+               X? ( x11-libs/libX11 )
                x264? ( >=media-libs/x264-0.0.20090923 )
                xcb? ( x11-libs/libxcb x11-libs/xcb-util )
                xml? ( dev-libs/libxml2 )
@@ -323,6 +325,7 @@ src_configure() {
                $(use_enable vorbis) \
                $(use_enable win32codecs loader) \
                $(use_enable wma-fixed) \
+               $(use_with X x) \
                $(use_enable x264) \
                $(use_enable xcb) \
                $(use_enable xml libxml2) \