diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-11-29 12:08:22 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-11-29 12:08:22 +0000 |
| commit | 53195bf7e25fea5053ef61f07c3698a59b977b9a (patch) | |
| tree | ed0c70ecc7128c918597d255551cd2f3ab28a96a | |
| parent | initial commit (diff) | |
| download | historical-53195bf7e25fea5053ef61f07c3698a59b977b9a.tar.gz historical-53195bf7e25fea5053ef61f07c3698a59b977b9a.tar.bz2 historical-53195bf7e25fea5053ef61f07c3698a59b977b9a.zip | |
Die if skins are requested but freetype is not enabled. Don't remove the default skin when using skins. Thanks to Gergan Penkov in bug #113860.
Package-Manager: portage-2.0.53_rc7
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 10 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.8.4-r1.ebuild | 11 |
3 files changed, 19 insertions, 8 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index a84b14deab12..0239cc0e0b77 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.121 2005/11/28 12:11:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.122 2005/11/29 12:08:22 flameeyes Exp $ + + 29 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4-r1.ebuild: + Die if skins are requested but freetype is not enabled. Don't remove the + default skin when using skins. Thanks to Gergan Penkov in bug #113860. 28 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml: Take over maintainership directly. diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 3156e1f4fe82..8193688d6965 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0c7dda6a633cc44467755e18d9a63691 ChangeLog 24421 +MD5 31c434de847a00af9e98d17fb17399c5 ChangeLog 24644 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127 @@ -11,12 +11,12 @@ MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249 MD5 b591b42c362967ecb4666f426314c737 vlc-0.8.1-r1.ebuild 6701 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458 -MD5 53d31638607ad4bdb22ccefb6ffd21a1 vlc-0.8.4-r1.ebuild 6923 +MD5 265366ae8cea8a25583309c9b89e420f vlc-0.8.4-r1.ebuild 7106 MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDivQUAiZjviIA2XgRAgvxAJ0U1SZqACe9Qz25cAg5hCYh1yM8VQCcCa52 -j/5fTEaXLHQagtbWFOVIDsY= -=58Et +iD8DBQFDjETEAiZjviIA2XgRAuLpAKDNosltZpuZ818QgJFXegFI7zOuswCg6VxG +rIxzpUZ2+ZUnVlob5+iZLXY= +=1dYf -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-0.8.4-r1.ebuild b/media-video/vlc/vlc-0.8.4-r1.ebuild index 242eda74e613..8f273e29dd3c 100644 --- a/media-video/vlc/vlc-0.8.4-r1.ebuild +++ b/media-video/vlc/vlc-0.8.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4-r1.ebuild,v 1.1 2005/11/27 21:43:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4-r1.ebuild,v 1.2 2005/11/29 12:08:22 flameeyes Exp $ inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs @@ -106,6 +106,11 @@ pkg_setup() { need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support." fi fi + + if use skins && ! use freetype; then + eerror "Trying to build with skins support but without freetype." + die "You have to use 'freetype' to use 'skins'" + fi } src_unpack() { @@ -219,9 +224,11 @@ src_install() { dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \ doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt - rm -rf ${D}/usr/share/vlc/skins2 ${D}/usr/share/doc/vlc \ + rm -rf ${D}/usr/share/doc/vlc \ ${D}/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + use skins || rm -rf ${D}/usr/share/vlc/skins2 + for res in 16 32 48; do insinto /usr/share/icons/hicolor/${res}x${res}/apps/ newins ${S}/share/vlc${res}x${res}.png vlc.png |