From 8f1e5a1fad6450725e8f787240d7513c40d175b1 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sun, 18 Dec 2005 18:03:13 +0000 Subject: Disable pvm support as per bug #93003. Package-Manager: portage-2.1_pre1 --- media-video/transcode/ChangeLog | 6 +++++- media-video/transcode/Manifest | 12 ++++++------ media-video/transcode/transcode-0.6.14-r3.ebuild | 24 +++--------------------- media-video/transcode/transcode-1.0.2-r1.ebuild | 21 ++------------------- 4 files changed, 16 insertions(+), 47 deletions(-) diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index 43d672c25f38..62601809f23a 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/transcode # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.125 2005/12/18 02:03:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.126 2005/12/18 18:03:13 flameeyes Exp $ + + 18 Dec 2005; Diego Pettenò + transcode-0.6.14-r3.ebuild, transcode-1.0.2-r1.ebuild: + Disable pvm support as per bug #93003. 18 Dec 2005; Diego Pettenò transcode-0.6.14-r2.ebuild: diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index 13cd3d8b51c3..3a2d9367e628 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 e5decadac6aa0cb6890cec3e2748d685 ChangeLog 23656 +MD5 4461380064b6de1a55947fec27bafd25 ChangeLog 23808 MD5 8e1251c76b508dfdfe0e4f0c0b166540 files/digest-transcode-0.6.14-r2 144 MD5 03b7d892f34025e0c5854e0977b5fb49 files/digest-transcode-0.6.14-r3 144 MD5 2ee1936ab9b228cc4350881352426bd8 files/digest-transcode-1.0.2-r1 68 @@ -9,12 +9,12 @@ MD5 09d908064da685a17f52adb57e0c8075 files/transcode-1.0.2-bigdir.patch 10634 MD5 07f7315638c5e4058ed39d914aed0d0f files/transcode-1.0.2-lzo2.patch 2922 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 MD5 8f2e58b7a1f808d28b91aeb751a70305 transcode-0.6.14-r2.ebuild 3970 -MD5 d30085d1ee4daa7cf2cd3f966e57a767 transcode-0.6.14-r3.ebuild 4043 -MD5 30294c9385beb4233bad0590a823838c transcode-1.0.2-r1.ebuild 4197 +MD5 2ae5387d83a12472c40745ad1fd7e110 transcode-0.6.14-r3.ebuild 3546 +MD5 d162bf1b4592e631f5574f208dd48a20 transcode-1.0.2-r1.ebuild 3718 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDpMOGAiZjviIA2XgRAsDuAKCaWASDsGzf8vODl+TerxYJLDoRLwCfWi73 -06+FAZk3PkLC5Rse22z48k4= -=RyN+ +iD8DBQFDpaRuAiZjviIA2XgRAkCzAKDcAeXr0C9W0RB20Wr74rh5rI3W1QCffSpS +3tAG1SrZ/EtsMVh1hOBfPKI= +=SCfG -----END PGP SIGNATURE----- diff --git a/media-video/transcode/transcode-0.6.14-r3.ebuild b/media-video/transcode/transcode-0.6.14-r3.ebuild index 88814bae8f21..9d75a3058bd9 100644 --- a/media-video/transcode/transcode-0.6.14-r3.ebuild +++ b/media-video/transcode/transcode-0.6.14-r3.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/transcode/transcode-0.6.14-r3.ebuild,v 1.3 2005/12/14 05:15:53 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r3.ebuild,v 1.4 2005/12/18 18:03:13 flameeyes Exp $ inherit libtool flag-o-matic eutils multilib autotools @@ -19,7 +19,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="X 3dnow a52 altivec dv dvdread encode fame truetype gtk imagemagick jpeg -lzo mjpeg mpeg mmx network ogg vorbis pvm quicktime sdl sse sse2 theora v4l +lzo mjpeg mpeg mmx network ogg vorbis quicktime sdl sse sse2 theora v4l xvid xml2" RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 ) @@ -49,8 +49,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 ) theora? ( media-libs/libtheora ) jpeg? ( media-libs/jpeg ) gtk? ( =x11-libs/gtk+-1.2* ) - truetype? ( >=media-libs/freetype-2 ) - pvm? ( >=sys-cluster/pvm-3.4 )" + truetype? ( >=media-libs/freetype-2 )" DEPEND="${RDEPEND} X? ( || ( x11-proto/xextproto virtual/x11 ) ) @@ -77,18 +76,6 @@ src_compile() { filter-flags -maltivec -mabi=altivec -momit-leaf-frame-pointer use ppc && append-flags -U__ALTIVEC__ - if use pvm; then - if use sparc; then - myconf="${myconf} --enable-pvm3 \ - --with-pvm3-lib=${PVM_ROOT}/lib/LINUXSPARC \ - --with-pvm3-include=${PVM_ROOT}/include" - else - myconf="${myconf} --enable-pvm3 \ - --with-pvm3-lib=${PVM_ROOT}/lib/LINUX \ - --with-pvm3-include=${PVM_ROOT}/include" - fi - fi - use xvid \ && myconf="${myconf} --with-default-xvid=xvid4" @@ -131,11 +118,6 @@ src_compile() { || die "econf failed" emake -j1 all || die "emake failed" - - if use pvm; then - sed -i -e "s:\${exec_prefix}/bin/pvmgs:\$(DESTDIR)/\${exec_prefix}/bin/pvmgs:" \ - ${S}/pvm3/Makefile || die "sed failed" - fi } src_install () { diff --git a/media-video/transcode/transcode-1.0.2-r1.ebuild b/media-video/transcode/transcode-1.0.2-r1.ebuild index 118d069cf261..ab66c2146e04 100644 --- a/media-video/transcode/transcode-1.0.2-r1.ebuild +++ b/media-video/transcode/transcode-1.0.2-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/transcode/transcode-1.0.2-r1.ebuild,v 1.3 2005/12/18 01:59:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r1.ebuild,v 1.4 2005/12/18 18:03:13 flameeyes Exp $ inherit libtool flag-o-matic eutils multilib autotools @@ -14,7 +14,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="X 3dnow a52 altivec dv dvdread mp3 fame truetype gtk imagemagick jpeg -lzo mjpeg mpeg mmx network ogg vorbis pvm quicktime sdl sse sse2 theora v4l +lzo mjpeg mpeg mmx network ogg vorbis quicktime sdl sse sse2 theora v4l xvid xml2 ffmpeg" RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 ) @@ -36,7 +36,6 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 ) jpeg? ( media-libs/jpeg ) gtk? ( =x11-libs/gtk+-1.2* ) truetype? ( >=media-libs/freetype-2 ) - pvm? ( >=sys-cluster/pvm-3.4 ) ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r3 ) || ( sys-libs/glibc dev-libs/libiconv ) >=media-libs/libmpeg2-0.4.0b @@ -82,18 +81,6 @@ src_compile() { filter-flags -maltivec -mabi=altivec -momit-leaf-frame-pointer use ppc && append-flags -U__ALTIVEC__ - if use pvm; then - if use sparc; then - myconf="${myconf} --enable-pvm3 \ - --with-pvm3-lib=${PVM_ROOT}/lib/LINUXSPARC \ - --with-pvm3-include=${PVM_ROOT}/include" - else - myconf="${myconf} --enable-pvm3 \ - --with-pvm3-lib=${PVM_ROOT}/lib/LINUX \ - --with-pvm3-include=${PVM_ROOT}/include" - fi - fi - use xvid \ && myconf="${myconf} --with-default-xvid=xvid4" @@ -140,10 +127,6 @@ src_compile() { || die emake all || die - - if use pvm; then - sed -i -e "s:\${exec_prefix}/bin/pvmgs:\$(DESTDIR)/\${exec_prefix}/bin/pvmgs:" ${S}/pvm3/Makefile || die - fi } src_install () { -- cgit v1.2.3-65-gdbad