Install v4lctl also when the X USE flag is disabled.

Package-Manager: portage-2.0.54

4 files changed, 170 insertions, 30 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 180067f6ffce..65c5496b7864 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.30 2006/02/04 17:23:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.31 2006/02/04 23:58:04 hansmi Exp $
+
+*xawtv-3.95-r1 (05 Feb 2006)
+
+  04 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> +xawtv-3.95-r1.ebuild:
+  Install v4lctl also when the X USE flag is disabled.
 
   04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/tv-fonts-1.0-gentoo.diff, -files/tv-fonts-1.1-nox.patch,
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index d6141fb46b21..5cf74069c11a 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,37 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2bf13a6bfd8c2a1d02adb74f2eb038bd ChangeLog 10465
-RMD160 dd07b5c7988f1eed9fcb0135849a68e28621925e ChangeLog 10465
-SHA256 91dd1a14fcf7b5297e6b6c2ad9ce4b948e17b7c952342c9e9b2fe5dfa116c445 ChangeLog 10465
+MD5 f29e46bb928ca8cce5575a8db2567fad ChangeLog 10625
 MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r1 205
-RMD160 316ae590608e7cef1608e81e71fbf573ff01325c files/digest-xawtv-3.94-r1 205
-SHA256 87c18e89f921d4b819cac23058f96621a37019235678a822ea25639f79cb8aa7 files/digest-xawtv-3.94-r1 205
 MD5 574b3e5a0bf3441afda6d974b838f411 files/digest-xawtv-3.95 540
-RMD160 6122f90c534a0b44fcd631d7108194e515aa37db files/digest-xawtv-3.95 540
-SHA256 9737e9f26040e1114931dbb5191b2809e3dca75621a149b4e73bf055f21ee597 files/digest-xawtv-3.95 540
+MD5 1d806b0fed7943b8f62c6a4575a71944 files/digest-xawtv-3.95-r1 192
 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
-RMD160 54897fefd31711f402da3e39cb97d4ef63bb200b files/webcamrc 597
-SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e files/webcamrc 597
 MD5 a4a5b193c0bb1d65b4c7137257e2403e files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396
-RMD160 4fa77953a65d9685da2c6593e78670a848ae647b files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396
-SHA256 bd6a36d1c8a5954f8191765e0798f0359bfdbe1f34c51fbbce447845173fbb2c files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch 396
 MD5 eeb0da894fddca794ffc60f0033ce58c files/xawtv-3.94-no-x11.patch 577
-RMD160 03246cd3a593e169d2607250c5137fb7b368e6a5 files/xawtv-3.94-no-x11.patch 577
-SHA256 f93d032e9d48db8b3e470c07b77de8520d7deb110ab4d86d5fff3253958cd01b files/xawtv-3.94-no-x11.patch 577
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161
-SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd metadata.xml 161
 MD5 ddaee2d76f650fa8b2839b5c103c68ec xawtv-3.94-r1.ebuild 2347
-RMD160 3e763a9820922a173383d31a73d01f6d42116785 xawtv-3.94-r1.ebuild 2347
-SHA256 bda8ce4856719beedbf5a10f468b58746c71aaf2386032e60e9d1af3d0e3d1a2 xawtv-3.94-r1.ebuild 2347
+MD5 52acef2ed96999ac9ef5dc422bb9c7d3 xawtv-3.95-r1.ebuild 3650
 MD5 5ede2fe2c5a3b2437c190481df423acd xawtv-3.95.ebuild 3554
-RMD160 5c1085f0e7af99d269d5db652f489c2f2e8c202a xawtv-3.95.ebuild 3554
-SHA256 d236dacd64c07e23afeb32b4ea27ba15519598bab8dc8406e5cde99fe5961bbe xawtv-3.95.ebuild 3554
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5OM7AiZjviIA2XgRAtPkAKC9viKsmAzvFw5gPlr7oLvtWp0SsACdG9IK
-OgEYF2NGsusmORrGtlmKfKU=
-=AfNe
------END PGP SIGNATURE-----
diff --git a/media-tv/xawtv/files/digest-xawtv-3.95-r1 b/media-tv/xawtv/files/digest-xawtv-3.95-r1
new file mode 100644
index 000000000000..12c29bbb1cf9
--- /dev/null
+++ b/media-tv/xawtv/files/digest-xawtv-3.95-r1
@@ -0,0 +1,3 @@
+MD5 ae73fc0efd53e53dca7077383cc22b5a tv-fonts-1.1.tar.bz2 80177
+MD5 ad25e03f7e128b318e392cb09f52207d xawtv-3.95.tar.gz 555731
+MD5 4a12f205633f2a0958c225cfc6e8d731 xawtv-patches-1.tar.bz2 2330
diff --git a/media-tv/xawtv/xawtv-3.95-r1.ebuild b/media-tv/xawtv/xawtv-3.95-r1.ebuild
new file mode 100644
index 000000000000..663d2de3b52e
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.95-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.1 2006/02/04 23:58:04 hansmi Exp $
+
+inherit eutils font autotools flag-o-matic
+
+PATCHLEVEL="1"
+
+IUSE="aalib alsa dv lirc mmx motif nls opengl quicktime X xv zvbi xext"
+
+MY_FONT=tv-fonts-1.1
+DESCRIPTION="TV application for the bttv driver"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
+	X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	X? ( || ( (
+			media-libs/fontconfig
+			x11-libs/libFS
+			x11-libs/libICE
+			x11-libs/libXpm
+			x11-libs/libXmu
+			x11-libs/libX11
+			x11-libs/libXaw
+			x11-libs/libXt
+			x11-libs/libSM
+			x11-libs/libXft
+			x11-libs/libXext
+			x11-libs/libXrender
+		) virtual/x11 )
+		xext? ( || ( (
+				x11-libs/libXinerama
+				x11-libs/libXxf86dga
+				x11-libs/libXrandr
+				x11-libs/libXxf86vm
+			) virtual/x11 ) )
+		xv? ( || ( x11-libs/libXv virtual/x11 ) )
+	)
+	motif? ( x11-libs/openmotif
+		app-text/recode )
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	dv? ( media-libs/libdv )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl )
+	quicktime? ( virtual/quicktime )
+	zvbi? ( media-libs/zvbi )"
+
+DEPEND="${RDEPEND}
+	X? ( || ( (
+				x11-proto/videoproto
+				x11-proto/xproto
+				x11-proto/xextproto
+			) virtual/x11 )
+			xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+		)"
+
+pkg_setup() {
+	if use X; then
+		font_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch"
+	fi
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with X x) \
+		$(use_enable xext xfree-ext) \
+		$(use_enable xv xvideo) \
+		$(use_enable dv)  \
+		$(use_enable mmx) \
+		$(use_enable motif) \
+		$(use_enable quicktime) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable opengl gl) \
+		$(use_enable zvbi) \
+		$(use_enable aalib aa) \
+		|| die " xawtv configure failed"
+
+	emake BINDNOW_FLAGS=$(bindnow-flags) verbose=yes || die "Make failed"
+
+	if use X; then
+		cd ${WORKDIR}/${MY_FONT}
+		emake DISPLAY= || die "tvfonts failed"
+	fi
+}
+
+src_install() {
+	cd ${S}
+	make install DESTDIR=${D} resdir=${D}/etc/X11 || die "make install failed"
+
+	# v4lctl is only installed automatically if the X USE flag is enabled
+	use X || \
+		dobin x11/v4lctl
+
+	dodoc Changes README* TODO ${FILESDIR}/webcamrc
+	docinto cgi-bin
+	dodoc scripts/webcam.cgi
+
+	use X || \
+		rm -f ${D}/usr/share/man/man1/{pia,propwatch}.1 \
+			${D}/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \
+			${D}/usr/share/{man,man/es}/man1/{rootv,xawtv-remote}.1
+
+	use motif || \
+		rm -f ${D}/usr/share/man/man1/{motv,mtt}.1
+
+	use zvbi || \
+		rm -f ${D}/usr/share/man/man1/{alevtd,mtt}.1 \
+			${D}/usr/share/{man,man/es}/man1/scantv.1
+
+	use nls || \
+		rm -f ${D}/usr/share/man/fr \
+			${D}/usr/share/man/es
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv ${D}/usr/share/*.list ${D}/usr/share/${PN}
+	mv ${D}/usr/share/Index* ${D}/usr/share/${PN}
+
+	if use X; then
+		cd ${WORKDIR}/${MY_FONT}
+		insinto /usr/share/fonts/xawtv
+		doins *.gz fonts.alias
+
+		font_xfont_config
+		font_xft_config
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
+		cd /usr/share/fonts/xawtv
+		mkfontdir
+		eend
+	fi
+}