From 3eca2553e02f94903c344d9da09b35ffa6d4b9d9 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 10 Feb 2007 23:39:23 +0000 Subject: [PATCH] Die if skins are wanted but not wxwindows, dont install vlc.desktop if not using wxwindows, bug #158095, remove inexistant docs from dodoc Package-Manager: portage-2.1.2-r9 --- media-video/vlc/ChangeLog | 7 +++++- media-video/vlc/Manifest | 30 ++++++++++++------------- media-video/vlc/vlc-0.8.6-r1.ebuild | 10 ++++++--- media-video/vlc/vlc-0.8.6_p18636.ebuild | 10 ++++++--- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index a3419d4e74ff..bc70afbbf1e8 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.219 2007/02/10 19:05:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.220 2007/02/10 23:39:23 aballier Exp $ + + 10 Feb 2007; Alexis Ballier vlc-0.8.6-r1.ebuild, + vlc-0.8.6_p18636.ebuild: + Die if skins are wanted but not wxwindows, dont install vlc.desktop if not + using wxwindows, bug #158095, remove inexistant docs from dodoc 10 Feb 2007; Alexis Ballier vlc-0.8.6-r1.ebuild, vlc-0.8.6_p18636.ebuild: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index ecbc2144e6bc..c53b64bdf4bb 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -4,18 +4,18 @@ Hash: SHA1 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 DIST vlc-0.8.6_p18636.tar.bz2 10732448 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 SHA1 fff2d45fc24f6782ce3fd90ac7a3a9ec4d905d7d SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe DIST vlc-patches-35.tar.bz2 11019 RMD160 a79a774e94be36824745d415a7743d4b74abc76e SHA1 43a69371056b3c7b35871971c5e1938a76a903c4 SHA256 3b74d69405b107569b47b33342e78d7c7ef8ac10cdc486bef6803975853405fa -EBUILD vlc-0.8.6-r1.ebuild 8225 RMD160 40e9d945d823bd404d07f6633177858ec3da512d SHA1 71a9b2255a9db72e4a45fa258820716ba78240b0 SHA256 12e24fba2c5cfa03ab7820aad0afc3fad4704acc40051247fa05cdd29c762acc -MD5 99980ad30d6422493fa6c2ed3ff4867f vlc-0.8.6-r1.ebuild 8225 -RMD160 40e9d945d823bd404d07f6633177858ec3da512d vlc-0.8.6-r1.ebuild 8225 -SHA256 12e24fba2c5cfa03ab7820aad0afc3fad4704acc40051247fa05cdd29c762acc vlc-0.8.6-r1.ebuild 8225 -EBUILD vlc-0.8.6_p18636.ebuild 8447 RMD160 eeff0a2e625ef41380780d7c2b2a245d1d9747f9 SHA1 a7a3954b05bb0b4a0c5fe177afffb4478a5eea6c SHA256 f7ad29bdea65c12ef9f2c29d12ed90feb24526d0fd0b5eac2bbd537ced0bff51 -MD5 f24ec9028410f6c46d8cb16357e0badf vlc-0.8.6_p18636.ebuild 8447 -RMD160 eeff0a2e625ef41380780d7c2b2a245d1d9747f9 vlc-0.8.6_p18636.ebuild 8447 -SHA256 f7ad29bdea65c12ef9f2c29d12ed90feb24526d0fd0b5eac2bbd537ced0bff51 vlc-0.8.6_p18636.ebuild 8447 -MISC ChangeLog 40078 RMD160 19d729b318522a04315b0775ab91e9eb3a662cf4 SHA1 82238472a40e77b0001584b5bcef8819dda3bcc5 SHA256 b9071176b2fd9fa9822f01d1fc89b57f66f46cde9034b23bd2d4fe0ebad6a90e -MD5 1ca6cab292c45485ded8ca70b09701a2 ChangeLog 40078 -RMD160 19d729b318522a04315b0775ab91e9eb3a662cf4 ChangeLog 40078 -SHA256 b9071176b2fd9fa9822f01d1fc89b57f66f46cde9034b23bd2d4fe0ebad6a90e ChangeLog 40078 +EBUILD vlc-0.8.6-r1.ebuild 8395 RMD160 3ca4ab7a68d519525f346ca97e940668ac07658f SHA1 8e75fd1019c1cd0c3bd4b7f81f09dda3417a8c0d SHA256 43f59211125d478936bb7a10b613664a881fdd0b79eec2fb8fd89a4f1df6d875 +MD5 aa10b30c9d26351f2edf921774caebb5 vlc-0.8.6-r1.ebuild 8395 +RMD160 3ca4ab7a68d519525f346ca97e940668ac07658f vlc-0.8.6-r1.ebuild 8395 +SHA256 43f59211125d478936bb7a10b613664a881fdd0b79eec2fb8fd89a4f1df6d875 vlc-0.8.6-r1.ebuild 8395 +EBUILD vlc-0.8.6_p18636.ebuild 8617 RMD160 c5490b8fece2363fe87b27b8e8813a7421e47463 SHA1 a81aa98ae56018388649c1ca4acb6c47b838b0fa SHA256 af35deeb0975557c16c415a3b5adc7f6b483a389c947952d1d66b083e6fe10a8 +MD5 781e84e9d27ab278ce745292752a2978 vlc-0.8.6_p18636.ebuild 8617 +RMD160 c5490b8fece2363fe87b27b8e8813a7421e47463 vlc-0.8.6_p18636.ebuild 8617 +SHA256 af35deeb0975557c16c415a3b5adc7f6b483a389c947952d1d66b083e6fe10a8 vlc-0.8.6_p18636.ebuild 8617 +MISC ChangeLog 40322 RMD160 68b159f5ee560d4e237378767255202fcdf62509 SHA1 5ea8f99a7caa594d71a4d76b6d9560ab985a1439 SHA256 3a1255ed74357c0e511224a725d3df0693e0bf3c601e12e5f604b8d34f151ef7 +MD5 bc8fa214491a49bfc3e8a67961f959b1 ChangeLog 40322 +RMD160 68b159f5ee560d4e237378767255202fcdf62509 ChangeLog 40322 +SHA256 3a1255ed74357c0e511224a725d3df0693e0bf3c601e12e5f604b8d34f151ef7 ChangeLog 40322 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -29,7 +29,7 @@ SHA256 59e6acba8cd278a6390780d4a4b3c488df47b82a64fefaed11764e048e9e1016 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFzheXvFcC4BYPU0oRAjk0AJ0T5BDqF9Kp3AYGjU/QNkS399GjJQCgkBD2 -mk2Y9zencE5u/TOcPTFhL9I= -=cI8l +iD8DBQFFzlezvFcC4BYPU0oRAgxgAJ9r1GRI3PbnASLxVHH2PL1gIhTeDACgivjE +EQJDRdwSiyHcUMW7JVwHJUM= +=ZlZZ -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild index 301ea566ccee..4b445472738a 100644 --- a/media-video/vlc/vlc-0.8.6-r1.ebuild +++ b/media-video/vlc/vlc-0.8.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.12 2007/02/10 19:05:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.13 2007/02/10 23:39:23 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -125,6 +125,10 @@ pkg_setup() { eerror "Trying to build with skins support but without truetype." die "You have to use 'truetype' to use 'skins'" fi + if use skins && ! use wxwindows; then + eerror "Trying to build with skins support but without wxwindows." + die "You have to use 'wxwindows' to use 'skins'" + fi } src_unpack() { @@ -261,7 +265,7 @@ src_install() { # First install the library, to avoid screwups during relinking.select emake -j1 DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \ + dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \ doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt if use nsplugin; then @@ -280,5 +284,5 @@ src_install() { newins "${S}"/share/vlc${res}x${res}.png vlc.png done - use wxwindows && domenu "${S}/debian/vlc.desktop" + use wxwindows || rm "${D}/usr/share/applications/vlc.desktop" } diff --git a/media-video/vlc/vlc-0.8.6_p18636.ebuild b/media-video/vlc/vlc-0.8.6_p18636.ebuild index 75531dba7e69..88cb0eaffc74 100644 --- a/media-video/vlc/vlc-0.8.6_p18636.ebuild +++ b/media-video/vlc/vlc-0.8.6_p18636.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.6 2007/02/10 19:05:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.7 2007/02/10 23:39:23 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -131,6 +131,10 @@ pkg_setup() { eerror "Trying to build with skins support but without truetype." die "You have to use 'truetype' to use 'skins'" fi + if use skins && ! use wxwindows; then + eerror "Trying to build with skins support but without wxwindows." + die "You have to use 'wxwindows' to use 'skins'" + fi } src_unpack() { @@ -268,7 +272,7 @@ src_install() { # First install the library, to avoid screwups during relinking.select emake -j1 DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \ + dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \ doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt if use nsplugin; then @@ -287,5 +291,5 @@ src_install() { newins "${S}"/share/vlc${res}x${res}.png vlc.png done - use wxwindows && domenu "${S}/debian/vlc.desktop" + use wxwindows || rm "${D}/usr/share/applications/vlc.desktop" } -- 2.26.2