Cleanup ebuild, fix man page installation, bug 255887

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

3 files changed, 14 insertions, 9 deletions

diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index f2c36f2b6f57..1a1c37105def 100644
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg2theora
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.31 2009/03/01 13:00:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.32 2009/03/10 19:40:59 beandog Exp $
+
+*ffmpeg2theora-0.23-r1 (10 Mar 2009)
+
+  10 Mar 2009; Steve Dibb <beandog@gentoo.org> -ffmpeg2theora-0.23.ebuild,
+  +ffmpeg2theora-0.23-r1.ebuild:
+  Cleanup ebuild, fix man page installation, bug 255887
 
 *ffmpeg2theora-0.23 (01 Mar 2009)
 
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index f0bdf1731778..656077b13f1d 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,4 +1,4 @@
 DIST ffmpeg2theora-0.23.tar.bz2 62783 RMD160 94c71f426dff3f7ffdc10ed3fe40ef572397c3be SHA1 4e520e43eddea373669f609624861125c08af164 SHA256 dafa92d426df031bf41c745da2d1c50a6d1f3a6f7c4d2395be1e1b3032edeb9c
-EBUILD ffmpeg2theora-0.23.ebuild 1120 RMD160 62ea40dcefe79f24469da23efec356415de6afd8 SHA1 39802cf213b8b3afe64b8462a8bfe4233692d8bc SHA256 dce70c302f0b778a4331c9c55faa7ec2981ae0f3c364b6021eb8177cb6d2d7b4
-MISC ChangeLog 4993 RMD160 edcd8d14a598b142104b5148b60ee4a702dce1b0 SHA1 cf70bbadf5fb4f8b7c52b8816b0cb075f257bb3e SHA256 dd56d78935c6d4ef938f0911e78eaa0a3dd89ef943ca6156cf00093f8e03c55b
+EBUILD ffmpeg2theora-0.23-r1.ebuild 1042 RMD160 9930ec2c3fb485b6807c3cedc7c4f5bf28d641e7 SHA1 168080ed2189375b2f7201a18662038bf6429b1a SHA256 c544245eb521b69b01e1e3971effa4c0492d9fecbcf1d31997c9a2cb95b483fb
+MISC ChangeLog 5196 RMD160 5562937c15a7e4502a5f7fb6b470c1e06292210a SHA1 83edc4969d3548bbf40b3b5123fc3e84936bbf9f SHA256 598badbdadf2d176d7cbae3b457e18a5c23eb0353b942257f91ce8ff966a3724
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.23.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.23-r1.ebuild
index 2ca2c0920d44..ddd8fb32a236 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.23.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.23-r1.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/ffmpeg2theora/ffmpeg2theora-0.23.ebuild,v 1.1 2009/03/01 13:00:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.23-r1.ebuild,v 1.1 2009/03/10 19:40:59 beandog Exp $
 
 EAPI="2"
 
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r20[vhook]
+RDEPEND="
+	|| ( <media-video/ffmpeg-9999[vhook]
+		>=media-video/ffmpeg-9999 )
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_beta1[encode]
@@ -29,9 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	scons destdir="${D}" prefix=/usr install || die "install failed"
+	scons destdir="${D}" prefix=/usr mandir=PREFIX/share/man install || die "install failed"
 	dodoc AUTHORS ChangeLog README TODO || die
-#	newdoc kino_export/README README.kino_export
-#	exeinto /usr/share/kino/scripts/exports
-#	doexe kino_export/ffmpeg2theora.sh
 }